Spp
1ecc55272e
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/AI/CoreAI/GameObjectAI.h
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Conditions/ConditionMgr.h
src/server/game/Entities/Pet/Pet.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/LootHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Commands/cs_reload.cpp
src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
2012-11-20 16:01:31 +01:00
Spp
7bef4ce401
Core/Misc: Reduce header dependencies - Step III
2012-11-20 15:03:56 +01:00
Spp
b5c9ab8802
Core/Misc: Reduction of header dependencies - Step II
2012-11-20 12:30:30 +01:00
Spp
81606e5d1e
Core/Misc: Define some methods const
2012-11-20 09:29:52 +01:00
Spp
fff684ec78
Remove duplicate code after some old merge
2012-11-19 12:03:45 +01:00
Spp
bf8b642a47
Fix compile without PCH (Also added some minor changes to minimize differences with 4.3.4)
2012-11-19 12:02:33 +01:00
Spp
7f061fc57f
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/AI/EventAI/CreatureEventAIMgr.h
src/server/game/Battlegrounds/Battleground.h
src/server/game/Chat/Chat.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Globals/ObjectMgr.h
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/game/World/World.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Commands/cs_reload.cpp
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
src/server/shared/Database/Implementation/CharacterDatabase.cpp
2012-11-19 10:09:58 +01:00
Spp
e60d26f36b
Another crash fix after b99c347
2012-11-18 13:50:14 +01:00
Spp
db4a69f773
Crash Fix after b99c347
2012-11-17 14:34:25 +01:00
Spp
b99c347747
Core: Remove Player.h dependency from all the possible headers
2012-11-17 05:18:37 +01:00
Spp
339d2b1257
Fix compile
2012-11-17 03:18:37 +01:00
Spp
279b7f4c10
Core/Misc: Minor changes here and there
2012-11-16 09:51:44 +01:00
Spp
306d4d3ab1
Core/Battleground: Send bracket levels in SMSG_BATTLEFIELD_LIST
2012-11-16 09:47:36 +01:00
Spp
978fc4b7b9
Fix compile
2012-11-16 09:09:27 +01:00
Spp
a0c8193ee7
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Handlers/BattleGroundHandler.cpp
2012-11-16 08:51:15 +01:00
Spp
f13e57d9ed
Core/Player: Added skill step 525
2012-11-16 08:33:38 +01:00
Spp
d10ba397b6
Core/Warden: Remove warning
2012-11-15 14:13:58 +01:00
Spp
58c60c70cc
Core: Move a couple of log messages to debug
2012-11-15 13:42:24 +01:00
Spp
01a745d279
Core/Battleground: Crash fix after ba20aa809f
2012-11-15 13:38:12 +01:00
Spp
ba20aa809f
Core/Battleground: Fix arena battlemaster gossip (reverts 028b6e7)
...
Closes #8046
2012-11-14 19:33:56 +01:00
Spp
49c250f3c5
Core: Removed passing of integer types by const reference where possible
2012-11-12 15:27:01 +01:00
Spp
16d9d1e56d
Core/Achievements: multiple changes
...
- Fix crash when updating criteria with no reference player
- Update progress counter to uint64
- Remove hack introduced for achievement 318 (conditions are already checked in additionalConditions)
- Add extra parameter miscValue3 (needed for type "LOOT_TYPE" with additionalConditions "ITEM_SUBCLASS")
- Correct definition for Additional conditions: 11 (HAS_AURA_TYPE), 17 (SOURCE_AREA_OR_ZONE), 18 (TARGET_AREA_OR_ZONE), 41 (TARGET_ZONE)
2012-11-12 14:25:51 +01:00
Spp
5c6af8d1f3
Core: Added some attribute definitions
2012-11-12 12:07:16 +01:00
Spp
a3a667460a
Core/Achievement: Do not expose AchivementCriteriaData to ScriptMgr
2012-11-12 10:37:27 +01:00
Spp
f53a04add0
Core/Scripts: Added Worgen and Goblin races to .pinfo command.
2012-11-12 10:31:56 +01:00
Spp
5fd7d01bde
Core/Build: Remove some more unneeded code for OS X from cmake files
...
Core: Minor changes here and there
2012-11-12 10:29:52 +01:00
Spp
6bd90626ea
Core/Build: Fix compile using mysqllite included with core
...
Closes #8283
2012-11-10 14:49:28 +01:00
Spp
a91d59f37c
Core/Build: Restore FindOpenSSL, even when it's provided by cmake, this file also provides newbie-check (warns if you trying to use wrong libs)
...
- Also, apply the hack needed to make g3dlite compile in OS X
2012-11-10 13:15:09 +01:00
Spp
a57254d769
Core/Build: Fix problem with acelite
2012-11-09 16:09:27 +01:00
Spp
c51380690f
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/DataStores/DBCEnums.h
src/server/game/Handlers/PetHandler.cpp
src/server/game/Server/WorldSession.h
2012-11-09 14:26:27 +01:00
Spp
333b8e5159
Core/Build: Enable Clang PCH support and OS X specific features
...
Core: Fix warnings here and there
2012-11-09 13:13:45 +01:00
Spp
ccf593c673
Fix merge conflic and typos in worldserver config file and characters.sql
2012-11-09 09:03:29 +01:00
Spp
90c95806a7
Core/Guilds: Use correct variable type when saving guild bank tab rigths to DB
2012-11-09 08:22:03 +01:00
Spp
35d63a9799
Merge branch 'master' into 4.3.4
...
Conflicts:
sql/base/characters_database.sql
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/scripts/EasternKingdoms/silverpine_forest.cpp
2012-11-08 11:25:38 +01:00
Spp
fcc524d598
Core/Guilds: Send correct opcode when purchasing a new tab and fix data not being saved in db after purchasing the new tab
2012-11-08 11:13:46 +01:00
Spp
9659f0335f
Core/Guilds: Multiple changes
...
- Fix Delete Rank
- Fix Rank order after Rank is deleted
- Send correct event after Guild Tab purchase
- Better debug msgs
- Move news to Event Logs (internal struct is like Event Logs and Bank Event Logs). Max news configurable
2012-11-07 23:21:19 +01:00
Spp
bde6b76b2d
Core/Guild: Fix transaction not being properly closed and improve error message when fixing missing bank tabs
2012-11-07 09:49:31 +01:00
Spp
7bd86b6b83
Update characters_database.sql (Missing changes from 58ec4e5319)
2012-11-07 09:49:31 +01:00
Spp
06eff94506
Merge branch 'master' into 4.3.4
...
Note: Will need extra Guild-Related commit to make it work again (Added some extra data beside the merge)
Conflicts:
src/server/game/Battlefield/BattlefieldHandler.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Guilds/Guild.cpp
src/server/game/Guilds/Guild.h
src/server/game/Guilds/GuildMgr.cpp
src/server/game/Guilds/GuildMgr.h
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/GuildHandler.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Handlers/LootHandler.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Handlers/MovementHandler.cpp
src/server/game/Handlers/NPCHandler.cpp
src/server/game/Handlers/PetHandler.cpp
src/server/game/Handlers/PetitionsHandler.cpp
src/server/game/Handlers/QueryHandler.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Handlers/SkillHandler.cpp
src/server/game/Handlers/SpellHandler.cpp
src/server/game/Handlers/TaxiHandler.cpp
src/server/game/Handlers/VehicleHandler.cpp
src/server/game/Server/WorldSession.h
src/server/shared/Database/Implementation/CharacterDatabase.cpp
src/server/shared/Database/Implementation/CharacterDatabase.h
2012-11-04 20:17:37 +01:00
Spp
58ec4e5319
Core/Guild: Code Refactor
...
- Send correct events when modifiying Ranks (Add, modify, delete)
- Store money/slots withdraw, not remaining slots. This will update remaining slots/money properly.
- Reset daily slots/money withdraw for all members at same time, configurable
- Better debug messages
2012-11-02 22:26:10 +01:00
Spp
c97fc99e16
Merge branch 'master' into 4.3.4
...
Note: What a bad automatic merge!!! needed to fix a lot of stuff... grrr
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Creature/GossipDef.cpp
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Guilds/Guild.h
src/server/game/Guilds/GuildMgr.h
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/ChannelHandler.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/LFGHandler.cpp
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Handlers/TradeHandler.cpp
src/server/game/Quests/QuestDef.h
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Spells/Spell.cpp
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/Commands/cs_titles.cpp
src/server/scripts/Kalimdor/boss_azuregos.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
2012-10-30 10:30:05 +01:00
Spp
5ff16046b6
Core/Dungeon Finder: Remove lfg player data when a group is disbanded
...
Core/Dungeon Finder: Some codestyle changes
Note: Real change is in LFGMgr::RemoveGroupData, all other are cosmetic changes
2012-10-29 20:56:37 +01:00
Spp
9074c11a90
Core/Dungeon Finder: Update "Current group roles" according to people in queue.
...
Core/Dungeon Finder: Properly update internal lfg group structure at server load
2012-10-29 20:13:42 +01:00
Spp
14027262ee
Core/Dungeon Finder: Add some more debug msgs and restore LFG group structure at server load.
2012-10-29 13:58:48 +01:00
Spp
d2ba73d97f
Core/Misc: Proper fix for previous commit ( c5c8e38 - check race change before perfoming faction-change actions)
...
Core/Misc: tab to spaces and remove trailing whitespaces
2012-10-29 12:28:12 +01:00
Spp
c5c8e38789
Core/Misc: Check if race is changed before performing faction-change actions. (By tibbi)
2012-10-29 11:27:00 +01:00
Spp
1925027aec
Core/Logging: Add new log type for SOAP.
...
Closes #8201
2012-10-28 13:03:50 +01:00
Spp
876ad50dcd
Core/Misc: Tweaked ThreatContainer internals
...
(and many cosmetic changes here and there)
2012-10-26 14:31:19 +02:00
Spp
3120364aff
Core/Dungeon Finder: Prevent crash when Teleport opcode is received from client when is not supposed.
...
Note: In order to get teleported in/out you need to be in group
Closes #8183
2012-10-25 11:33:14 +02:00
Spp
9fbc4c0ae2
Core/Misc: reduced amount of string memory allocations (Step II)
2012-10-24 15:34:48 +02:00
Spp
013fb1f4d9
Core/Misc: reduced amount of string memory allocations (Step I)
2012-10-24 15:34:48 +02:00
Spp
ca85c3b475
Core/Dungeon Finder: Fix teleport to dungeon and add missing code from 1be638e731
2012-10-23 19:09:50 +02:00
Spp
60d4343d8e
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Spells/Spell.cpp
src/server/shared/Logging/Appender.h
2012-10-23 14:16:05 +02:00
Spp
663db1cee3
Core/Misc: Add default count param to HasItemCount
2012-10-23 13:11:57 +02:00
Spp
1be638e731
Core/Dungeon Finder: Add debugging commands
2012-10-23 11:44:02 +02:00
Spp
c1fada456b
Core/Dungeon Finder: Correct rolechecks ( 4e8fa52)
...
- Fix bad sql (36806bf )
- Add better teleport debug messages
2012-10-23 09:48:08 +02:00
Spp
316fc7c631
Core/Dungeon Finder: Corrections to 8622d49 (Fix teleport coors loading)
2012-10-22 13:48:07 +02:00
Spp
1e50a08604
Core/Logging: Fix PlayerDump logging
2012-10-22 10:37:39 +02:00
Spp
8622d495bb
Dungeon Finder: Fix teleport coords load
2012-10-21 13:18:56 +02:00
Spp
0c909b2aed
Fix crash on shutdown after last DF changes
2012-10-19 21:35:51 +02:00
Spp
67a03027ae
Proper naming of LfgDungeon structures
2012-10-19 17:47:51 +02:00
Spp
36806bf5b3
Move LFG string out of Custom patch range
2012-10-19 17:36:24 +02:00
Spp
2e55abcde4
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Handlers/LFGHandler.cpp
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Server/WorldSession.h
2012-10-19 14:24:11 +02:00
Spp
4e8fa520c8
Core/Dungeon Finder: Move queue related code to its own class.
...
- Use different queues for each team (or shared one if two-side interaction is enabled)
- Some optimizations in matching algorithm
2012-10-19 14:00:40 +02:00
Spp
479d34d2a0
Core/Dungeon Finder: Minor optimizations
...
- Internal changes in store types
- Remove of (Player *) and (Group *) From LFGMgr.cpp (step 2)
2012-10-18 14:31:28 +02:00
Spp
d0334bf948
Core/Dungeon Finder: Some optimizations.
...
- Store teleport coordinates to avoid recalculations each time someone has to be teleported
- Correct teleport error msg when player is charming or using vehicle
- Internal changes in storage types
- Proper code for missing achievement lock type
- Better debug msgs
- Trying to get rid of "Player*" and "Group*" inside LFGMgr as much as possible (Step 1)
2012-10-18 09:15:10 +02:00
Spp
67118c6999
Fix compile under windows
2012-10-16 18:43:21 +02:00
Spp
14dab1f893
Fix compile without pch
2012-10-16 09:35:15 +02:00
Spp
8f65bc00a7
Fix compile without PCH
2012-10-04 13:41:56 +02:00
Spp
f570383fba
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Transport/Transport.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/Spells/SpellInfo.cpp
2012-10-04 13:33:04 +02:00
Spp
e1bee86ee6
Core/Battlegrounds: Remove no longer needed files BattlegroundAA/BattlegroundRB
2012-10-04 12:58:52 +02:00
Spp
2c961814c1
Core/Battleground: Some minor optimizations here and there.
2012-10-04 12:49:58 +02:00
Spp
2a55f2d9e0
Core/Battlegrounds: Minor optimization when checking if player left start zone
2012-10-04 11:31:00 +02:00
Spp
ddf494d78b
Core/Battlegrounds: Optimize internal battleground data storage (from Array MAX_BATTLEGROUND_TYPE_ID to std::map)
2012-10-04 10:57:32 +02:00
Spp
58c01c140d
Core/Battleground: Make Battleground queues and Free slot queue structures private.
2012-10-04 10:39:37 +02:00
Spp
02d68e4610
Core: Fix build without PCH
2012-10-03 15:40:01 +02:00
Spp
7831ecdb18
Core: "Initial support for C++11 compilers"
2012-10-02 15:06:19 +02:00
Spp
380db44583
Core/Utilities: Use generic templates with AddPct, ApplyPct and CalculatePct
2012-10-02 12:17:42 +02:00
Spp
f8846cdeaf
Core/Utilities: Do not expose internal store structure in Tokens and rename it to Tokenizer
2012-10-02 11:54:41 +02:00
Spp
f0f97ab851
Core/Logging: Fix crash when trying to log a message while config is being reloaded
...
Closes #7878
2012-09-26 13:42:53 +02:00
Spp
2a89658e96
Battlegrounds: Better log message for unhandled area triggers in battlegrounds
2012-09-19 10:01:30 +02:00
Spp
69ad5e8c4b
Fix merge error
2012-09-18 14:54:56 +02:00
Spp
761060e1f1
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/LootHandler.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Spells/Spell.cpp
2012-09-18 14:38:44 +02:00
Spp
8c5f011e79
Core/Achievements: Force all calls to AchievementMgr be done through Player functions (Remove GetAchievementMgr)
...
Note: No real use in 3.3.5 but will be used in 4.3.4
2012-09-18 14:29:53 +02:00
Spp
c4d4beff3b
Warning fixes and some minor changes here and there
...
- Added GetAchievementPoints to AchievementMgr
2012-09-18 11:35:18 +02:00
Spp
25d2ab9172
Revert last change. Leaving UpdateField names "as is"
2012-09-17 12:04:35 +02:00
Spp
74aea5e055
Cosmetic: PLAYER__FIELD_KNOWN_TITLES --> PLAYER_FIELD_KNOWN_TITLES
2012-09-17 11:49:25 +02:00
Spp
358c6a26d6
Core: Warning fixes (Also some -pedantic under game folder)
2012-09-10 13:04:31 +02:00
Spp
a7dd289b04
Core/Config: Change default log level of "Chat Log" to fit old log system
2012-09-01 22:13:12 +02:00
Spp
b127610510
Config: Cosmetic changes to fit config guidelines
2012-09-01 21:24:09 +02:00
Spp
7811e9100c
Core/Logging: Delete player filename will now use guid_name format like old log system. (was set to account_name by error)
2012-09-01 21:18:01 +02:00
Spp
5cafe0ca01
Core/Logging: Fix delete player crash having logging player enabled.
...
closes #7437
2012-09-01 21:15:20 +02:00
Spp
2d7b1c8b90
Core/Achievements: Define some flags, cleanup and split Requirement Conditions and SetCriteriaProgress in different functions
2012-08-27 15:08:20 +02:00
Spp
5aee9433e1
Core/Logging: Minor optimization in ShouldLog
2012-08-27 12:56:45 +02:00
Spp
e2b61714ca
Core/Opcodes: Remove duplicate opcode CMSG_QUERY_COMPLETION_NPC_RESPONSE
2012-08-22 14:23:00 +02:00
Spp
80a64f37f9
Core/Opcodes: Enable all handlers and mark as UNHANDLED those that need to be implemented/reviewed (This change allows to see opcode name in logs when opcode is unhandled)
...
Note: STATUS_NEVER should only be used for SMSG opcodes (and CMSG Handled by EarlyProcess)
2012-08-22 13:57:00 +02:00
Spp
bb559072ee
Core/Opcodes: Remove some opcodes that no longer exist on cata and fix a couple of log messages
2012-08-22 13:38:55 +02:00
Spp
1f162fb7c0
Fix some merge problems
2012-08-22 10:42:05 +02:00
Spp
610a8609db
Core/Logging: Correct Log Level after merge
2012-08-22 03:15:38 +02:00
Spp
13ba61ab69
Core/Logging: Disable all LOG_FILTER_OPCODES related messages by default
2012-08-21 23:13:05 +02:00