ariel-
|
65aec5f8f7
|
Merge remote-tracking branch 'tc/3.3.5' into 4.3.4
Note: additional hand-picked ports from 6.x to fix build
Conflicts:
sql/updates/world/2016_02_22_00_world.sql
sql/updates/world/2016_02_22_01_world.sql
sql/updates/world/2016_02_22_02_world.sql
sql/updates/world/2016_03_07_00_world.sql
src/server/authserver/Realms/RealmList.cpp
src/server/authserver/Realms/RealmList.h
src/server/authserver/Server/AuthSession.cpp
src/server/game/Accounts/AccountMgr.cpp
src/server/game/AuctionHouse/AuctionHouseMgr.cpp
src/server/game/Chat/Chat.cpp
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/Conditions/ConditionMgr.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Scripting/ScriptLoader.cpp
src/server/game/Scripting/ScriptLoader.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/World/World.cpp
src/server/game/World/World.h
src/server/scripts/CMakeLists.txt
src/server/scripts/Commands/cs_gm.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Commands/cs_rbac.cpp
src/server/scripts/Commands/cs_ticket.cpp
src/server/scripts/Commands/cs_wp.cpp
src/server/scripts/EasternKingdoms/CMakeLists.txt
src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/Kalimdor/CMakeLists.txt
src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/OutdoorPvP/CMakeLists.txt
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_hunter.cpp
src/server/shared/CMakeLists.txt
src/server/worldserver/CMakeLists.txt
src/server/worldserver/Main.cpp
src/tools/mmaps_generator/CMakeLists.txt
|
2016-03-11 18:32:07 -03:00 |
|