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
|
b99c347747
|
Core: Remove Player.h dependency from all the possible headers
|
2012-11-17 05:18:37 +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
|
013fb1f4d9
|
Core/Misc: reduced amount of string memory allocations (Step I)
|
2012-10-24 15:34:48 +02:00 |
|
Subv
|
c843479a50
|
Core/PacketIO: Enabled more opcodes
|
2012-08-10 18:56:06 -05:00 |
|
Nay
|
274a54c152
|
Core: Cleanup whitespace, fix build and enable 1 opcode
|
2012-08-10 16:58:39 +01:00 |
|
Subv
|
59d32edf02
|
Core/PacketIO: Enabled more opcodes
|
2012-08-08 19:04:05 -05:00 |
|
Nay
|
16f47e8a4e
|
Core/Chat: Correct HandleChannelPassword and HandleChannelInvite
|
2012-08-08 15:41:32 +01:00 |
|
Subv
|
224cf663e2
|
Fixed a compile error
|
2012-08-07 11:25:30 -05:00 |
|
Subv
|
bffb35c54a
|
Core/PacketIO: Fixed some channel packet structures and enabled more opcodes
|
2012-08-07 10:59:36 -05:00 |
|
Shauren
|
790ef5add5
|
Core/Channels: Updated channel join structure
|
2012-07-28 19:11:47 +02:00 |
|
Spp
|
37b66384f3
|
Merge branch 'master' into 4.x
Conflicts:
src/server/authserver/Server/AuthSocket.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/MovementHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellEffects.cpp
|
2012-01-31 11:49:53 +01:00 |
|
Spp
|
c9762b0e38
|
Core: Change Handlers location
|
2012-01-26 10:54:53 +01:00 |
|