Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-17 08:00:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,472 Commits 4 Branches 146 Tags
ad99eb8dfed57b1ed8d3ddd4e2d07e545dcc730d
Commit Graph

26472 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carbenium
ad99eb8dfe server starts now successfully. login is possible 2015-07-24 22:15:10 +02:00
Carbenium
e0a660a7a4 Fix bnet server build 2015-07-24 01:54:59 +02:00
Carbenium
aaf3f090ea Fix build 2015-07-24 01:49:34 +02:00
Carbenium
293658fb13 Merge branch '3.3.5' into 4.3.4 
Conflicts:
	.gitattributes
	dep/PackageList.txt
	sql/base/characters_database.sql
	sql/updates/world/2015_06_26_01_world_2015_05_15_00.sql
	sql/updates/world/2015_07_01_03_world_335.sql
	src/server/game/DungeonFinding/LFGMgr.cpp
	src/server/game/Entities/GameObject/GameObject.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Miscellaneous/Language.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_rbac.cpp
	src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
	src/server/scripts/Spells/spell_quest.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/WorldDatabase.cpp
 2015-07-22 02:26:46 +02:00
Carbenium
86c34de614 Merge commit '718c238524e5d9bc4d43c56c4870c78af794f520' into 4.3.4 
Conflicts:
	dep/PackageList.txt
	dep/libmpq/AUTHORS
	dep/libmpq/FAQ
	dep/libmpq/README
	dep/libmpq/THANKS
	dep/libmpq/bindings/d/mpq.d
	dep/libmpq/bindings/python/mpq.py
	dep/libmpq/configure.ac
	dep/libmpq/debian/control
	dep/libmpq/debian/copyright
	dep/libmpq/doc/man1/libmpq-config.1
	dep/libmpq/doc/man3/Makefile.am
	dep/libmpq/doc/man3/libmpq.3
	dep/libmpq/doc/man3/libmpq__archive_close.3
	dep/libmpq/doc/man3/libmpq__archive_files.3
	dep/libmpq/doc/man3/libmpq__archive_offset.3
	dep/libmpq/doc/man3/libmpq__archive_open.3
	dep/libmpq/doc/man3/libmpq__archive_size_packed.3
	dep/libmpq/doc/man3/libmpq__archive_size_unpacked.3
	dep/libmpq/doc/man3/libmpq__archive_version.3
	dep/libmpq/doc/man3/libmpq__block_close_offset.3
	dep/libmpq/doc/man3/libmpq__block_open_offset.3
	dep/libmpq/doc/man3/libmpq__block_read.3
	dep/libmpq/doc/man3/libmpq__block_size_unpacked.3
	dep/libmpq/doc/man3/libmpq__file_blocks.3
	dep/libmpq/doc/man3/libmpq__file_compressed.3
	dep/libmpq/doc/man3/libmpq__file_encrypted.3
	dep/libmpq/doc/man3/libmpq__file_imploded.3
	dep/libmpq/doc/man3/libmpq__file_number.3
	dep/libmpq/doc/man3/libmpq__file_offset.3
	dep/libmpq/doc/man3/libmpq__file_read.3
	dep/libmpq/doc/man3/libmpq__file_size_packed.3
	dep/libmpq/doc/man3/libmpq__file_size_unpacked.3
	dep/libmpq/doc/man3/libmpq__strerror.3
	dep/libmpq/doc/man3/libmpq__version.3
	dep/libmpq/libmpq/Makefile.am
	dep/libmpq/libmpq/common.c
	dep/libmpq/libmpq/common.h
	dep/libmpq/libmpq/explode.c
	dep/libmpq/libmpq/explode.h
	dep/libmpq/libmpq/extract.c
	dep/libmpq/libmpq/extract.h
	dep/libmpq/libmpq/huffman.c
	dep/libmpq/libmpq/huffman.h
	dep/libmpq/libmpq/mpq-internal.h
	dep/libmpq/libmpq/mpq.c
	dep/libmpq/libmpq/mpq.h
	dep/libmpq/libmpq/pack_begin.h
	dep/libmpq/libmpq/pack_end.h
	dep/libmpq/libmpq/platform.h
	dep/libmpq/libmpq/wave.c
	dep/libmpq/libmpq/wave.h
	dep/libmpq/tools/crypt_buf_gen.c
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
 2015-07-22 02:13:10 +02:00
Carbenium
6dfaec3d97 Merge commit 'dbaf88566be7083408fb8324d7886dc3e0a45cc0' into 4.3.4 
Conflicts:
	.gitattributes
	CONTRIBUTING.md
	sql/updates/world/2015_05_11_04_world.sql
	sql/updates/world/2015_05_27_00_world.sql
	sql/updates/world/2015_05_27_01_world.sql
	sql/updates/world/2015_06_06_01_world_335.sql
	src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Object/ObjectGuid.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/scripts/Spells/spell_item.cpp
	src/server/scripts/Spells/spell_rogue.cpp
 2015-07-22 02:09:32 +02:00
Carbenium
ba5c1753a9 Fix merge 2015-07-22 01:46:01 +02:00
Carbenium
82ea8da720 Merge commit '44959aeedddb552c50bf9ff06a2685d216844f24' into 4.3.4 
Conflicts:
	.travis.yml
	README.md
	sql/updates/world/2015_04_18_00_world.sql
	sql/updates/world/2015_04_18_05_world_335.sql
	sql/updates/world/2015_04_26_03_world_335.sql
	sql/updates/world/2015_05_09_00_world_335.sql
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/GameObject/GameObject.cpp
	src/server/game/Entities/GameObject/GameObject.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/SpellInfo.cpp
 2015-07-22 01:33:48 +02:00
Carbenium
153818e24e Fix merge 2015-07-22 01:30:23 +02:00
Carbenium
224c7dc6ae Merge commit '6c1e4bc20d68d9fb548eb4896bd8b84a4c3ec4ff' into 4.3.4 
Conflicts:
	README.md
	sql/updates/world/2015_04_04_00_world.sql
	sql/updates/world/2015_04_04_01_world.sql
	sql/updates/world/2015_04_05_06_world_335.sql
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_account.cpp
	src/tools/map_extractor/System.cpp
	src/tools/vmap4_extractor/adtfile.cpp
 2015-07-22 00:54:34 +02:00
Carbenium
963150dc8e Merge commit 'c61fac843b86f584f913dd21c256a626668df756' into 4.3.4 
Conflicts:
	sql/base/dev/world_database.sql
	sql/updates/world/2015_03_22_00_world.sql
	sql/updates/world/2015_03_23_00_world.sql
	sql/updates/world/2015_03_23_01_world.sql
	sql/updates/world/2015_03_23_02_world.sql
	sql/updates/world/2015_03_23_03_world.sql
	sql/updates/world/2015_03_23_07_world.sql
	sql/updates/world/2015_03_24_00_world.sql
	sql/updates/world/2015_03_25_00_world.sql
	sql/updates/world/2015_03_25_01_world.sql
	sql/updates/world/2015_03_26_00_world.sql
	sql/updates/world/2015_03_26_01_world.sql
	sql/updates/world/2015_03_26_02_world.sql
	sql/updates/world/2015_03_28_00_world.sql
	sql/updates/world/2015_03_28_01_world.sql
 2015-07-22 00:37:27 +02:00
Carbenium
5a0d9f97bc Fix merge 2015-07-22 00:35:28 +02:00
Carbenium
fd0ef7bfab Merge commit '4fd51ab3b94c5a61d009f57ad28fb728bd154fb8' into 4.3.4 
Conflicts:
	.travis.yml
	cmake/macros/ConfigureBoost.cmake
	sql/base/auth_database.sql
	sql/base/characters_database.sql
	sql/base/dev/world_database.sql
	sql/updates/world/2015_03_21_00_world.sql
	src/server/game/Miscellaneous/Language.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Spells/spell_quest.cpp
	src/server/worldserver/Main.cpp
 2015-07-22 00:26:09 +02:00
Carbenium
d175c5fa59 Fix merge 2015-07-22 00:16:41 +02:00
Carbenium
069f4c279b Merge commit 'e96676aeddb4763f6353675724fd6a033d60fbcb' into 4.3.4 2015-07-22 00:08:04 +02:00
Carbenium
ee53cf1a88 Fix merge 2015-07-22 00:06:43 +02:00
Carbenium
b82a072b25 Merge commit 'bba8555a29ea5cde018a73f92f1e6aa1a61351de' into 4.3.4 
Conflicts:
	dep/cppformat/CMakeLists.txt
	dep/cppformat/ChangeLog.rst
	dep/cppformat/format.cc
	dep/cppformat/format.h
	dep/cppformat/posix.cc
	dep/cppformat/posix.h
	sql/updates/world/2015_03_16_02_world.sql
	sql/updates/world/2015_03_16_03_world.sql
	sql/updates/world/2015_03_16_04_world.sql
	sql/updates/world/2015_03_16_05_world.sql
	sql/updates/world/2015_03_16_06_world.sql
	sql/updates/world/2015_03_17_00_world.sql
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/worldserver/CMakeLists.txt
 2015-07-21 23:46:56 +02:00
Carbenium
e44401c292 CRLF -> LF 2015-07-21 23:39:19 +02:00
Carbenium
f7f6eae247 Merge commit 'd3ad87b1cf48222aef5cbbc1f00cf2babadce111' into 4.3.4 
Conflicts:
	sql/updates/world/2015_03_16_00_world.sql
	sql/updates/world/2015_03_16_01_world_335.sql
 2015-07-21 23:35:43 +02:00
Carbenium
98328bb744 Fix merge 2015-07-21 23:34:13 +02:00
Carbenium
17bed260e3 Merge commit '7833d3414667af5e2c55280a060fa54f43d1e25f' into 4.3.4 
Conflicts:
	sql/updates/world/2015_03_14_00_world.sql
	src/server/collision/Management/MMapManager.cpp
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Server/WorldSocket.cpp
 2015-07-21 23:27:27 +02:00
Carbenium
67d616c195 Merge commit '999a5ffa642c27dc3566664cf0e5b44dffafb1b7' into 4.3.4 
Conflicts:
	sql/updates/world/2015_03_01_00_world.sql
	src/server/game/Server/WorldSocket.cpp
	src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp
 2015-07-21 23:20:40 +02:00
Carbenium
e68de2bc0a Fix merge 2015-07-21 23:18:31 +02:00
Carbenium
2bdcce17f8 Merge commit '61ba5e4f34211c2f0f286e70d8ace37714ca3c56' into 4.3.4 
Conflicts:
	sql/updates/world/2015_02_23_00_world.sql
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
 2015-07-21 22:47:41 +02:00
Carbenium
4a25f01ab9 Fix merge 2015-07-21 22:36:24 +02:00
Carbenium
3d48e906b4 Merge commit 'abee9046a6d92e2f0ba9de9c97ce6304c2fcb883' into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
 2015-07-21 22:32:29 +02:00
Carbenium
73933e5e39 Merge commit '4999864c4a85f49513fe9ef7e091f308c0343952' into 4.3.4 
Conflicts:
	sql/updates/world/2015_02_14_00_world.sql
	sql/updates/world/2015_02_14_01_world.sql
	sql/updates/world/2015_02_14_02_world.sql
	sql/updates/world/2015_02_16_02_world.sql
	src/server/scripts/Kalimdor/zone_felwood.cpp
	src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
 2015-07-21 22:12:57 +02:00
Carbenium
78da5d8e7e Merge commit '2478bbcdb8f44c575714ae2f45aeef4a37556fc2' into 4.3.4 
Conflicts:
	sql/updates/world/2015_02_12_00_world.sql
	sql/updates/world/2015_02_12_01_world.sql
	sql/updates/world/2015_02_12_02_world.sql
	sql/updates/world/2015_02_12_03_world.sql
	sql/updates/world/2015_02_12_04_world.sql
	sql/updates/world/2015_02_12_05_world.sql
	sql/updates/world/2015_02_12_06_world.sql
	sql/updates/world/2015_02_12_07_world.sql
	sql/updates/world/2015_02_12_08_world.sql
	sql/updates/world/2015_02_12_09_world.sql
	sql/updates/world/2015_02_12_10_world.sql
	sql/updates/world/2015_02_13_00_world.sql
	sql/updates/world/2015_02_13_02_world.sql
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
 2015-07-21 22:07:47 +02:00
Carbenium
814ae4ba8b Merge commit '73709e7c1334521189d8882ab1ba33fe259a12dc' into 4.3.4 
Conflicts:
	sql/updates/world/2015_02_09_14_world.sql
 2015-07-21 21:59:41 +02:00
Carbenium
7d5d040948 Merge commit 'b69fd4ac682347b8b735ac7116ada25d79698933' into 4.3.4 
Conflicts:
	README.md
	sql/updates/world/2015_02_06_13_world_335.sql
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
 2015-07-21 21:45:04 +02:00
Carbenium
9fca7b8017 Merge commit '9ee820d83d2bc3a2fb7c88047874c6420b116799' into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
 2015-07-21 21:36:54 +02:00
Carbenium
95b79c2605 Merge commit 'c87de730fae0914a5d0741365066007a46f9a469' into 4.3.4 2015-07-21 21:32:49 +02:00
Carbenium
230db1a5f5 Fix merge 2015-07-21 21:28:39 +02:00
Carbenium
9d3b94f7f2 Merge commit 'ccdc100d10143285bc058d968f0472ea4d073120' into 4.3.4 
Conflicts:
	sql/updates/world/2015_01_09_01_world.sql
	sql/updates/world/2015_01_18_00_world.sql
	src/server/game/Entities/Unit/Unit.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/tools/CMakeLists.txt
 2015-07-21 21:21:09 +02:00
Carbenium
7bb3d51383 Fix merge fail 2015-07-21 21:13:55 +02:00
Carbenium
3447276d4f Merge commit 'f3e86d3e686b8f7e29f55b884f6c8cb226ee1598' into 4.3.4 
Conflicts:
	dep/libmpq/CMakeLists.txt
	doc/UnixInstall.txt
	src/server/game/Accounts/RBAC.cpp
	src/server/game/Guilds/GuildMgr.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/scripts/Commands/cs_mmaps.cpp
	src/server/scripts/Commands/cs_rbac.cpp
	src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/boss_azuregos.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_felwood.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
	src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
	src/server/shared/Cryptography/Authentication/AuthCrypt.cpp
	src/server/shared/Cryptography/Authentication/AuthCrypt.h
	src/server/shared/Cryptography/HMACSHA1.cpp
	src/server/shared/Cryptography/HMACSHA1.h
	src/server/shared/Packets/WorldPacket.h
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/mesh_extractor/ADT.cpp
	src/tools/mesh_extractor/ADT.h
	src/tools/mesh_extractor/CMakeLists.txt
	src/tools/mesh_extractor/Cache.h
	src/tools/mesh_extractor/Chunk.cpp
	src/tools/mesh_extractor/Chunk.h
	src/tools/mesh_extractor/ChunkedData.cpp
	src/tools/mesh_extractor/ChunkedData.h
	src/tools/mesh_extractor/Constants.h
	src/tools/mesh_extractor/ContinentBuilder.cpp
	src/tools/mesh_extractor/ContinentBuilder.h
	src/tools/mesh_extractor/DBC.cpp
	src/tools/mesh_extractor/DBC.h
	src/tools/mesh_extractor/DoodadHandler.cpp
	src/tools/mesh_extractor/DoodadHandler.h
	src/tools/mesh_extractor/Geometry.cpp
	src/tools/mesh_extractor/Geometry.h
	src/tools/mesh_extractor/LiquidHandler.cpp
	src/tools/mesh_extractor/LiquidHandler.h
	src/tools/mesh_extractor/MPQ.cpp
	src/tools/mesh_extractor/MPQ.h
	src/tools/mesh_extractor/MPQManager.cpp
	src/tools/mesh_extractor/MPQManager.h
	src/tools/mesh_extractor/MapChunk.cpp
	src/tools/mesh_extractor/MapChunk.h
	src/tools/mesh_extractor/MeshExtractor.cpp
	src/tools/mesh_extractor/Model.cpp
	src/tools/mesh_extractor/Model.h
	src/tools/mesh_extractor/ObjectDataHandler.cpp
	src/tools/mesh_extractor/ObjectDataHandler.h
	src/tools/mesh_extractor/TileBuilder.cpp
	src/tools/mesh_extractor/TileBuilder.h
	src/tools/mesh_extractor/Utils.cpp
	src/tools/mesh_extractor/Utils.h
	src/tools/mesh_extractor/WDT.cpp
	src/tools/mesh_extractor/WDT.h
	src/tools/mesh_extractor/WorldModelGroup.cpp
	src/tools/mesh_extractor/WorldModelGroup.h
	src/tools/mesh_extractor/WorldModelHandler.cpp
	src/tools/mesh_extractor/WorldModelHandler.h
	src/tools/mesh_extractor/WorldModelRoot.cpp
	src/tools/mesh_extractor/WorldModelRoot.h
	src/tools/vmap4_extractor/loadlib/loadlib.h
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
 2015-07-21 20:58:09 +02:00
Carbenium
b9c871fdb7 Merge commit '6390e6a4cc2d657e7fa49e80c5be32007df56ee1' into 4.3.4 
Conflicts:
	sql/updates/world/2014_12_30_00_world.sql
	sql/updates/world/2014_12_30_01_world.sql
	src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
 2015-07-21 20:45:16 +02:00
Carbenium
2530db5a51 Fix merge 2015-07-21 20:40:21 +02:00
Carbenium
79eb80dcba Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4 
Conflicts:
	README.md
	sql/base/auth_database.sql
	sql/updates/world/2014_12_27_01_world_335.sql
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
	src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
	src/server/scripts/Spells/spell_hunter.cpp
 2015-07-21 20:05:44 +02:00
Carbenium
e17af4b098 Fix merge fail 2015-07-21 19:11:36 +02:00
Carbenium
c0ee4ceac4 Merge commit '251a347190485d57c8e2e9d821f66a5063270f5f' into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Accounts/RBAC.h
	src/server/scripts/Commands/cs_modify.cpp
 2015-07-21 19:02:53 +02:00
Carbenium
fc13ce42df Merge commit '40bb5743acc0d117db3a5b0e0b1919793d25c392' into 4.3.4 
Conflicts:
	sql/updates/world/2014_11_05_00_world.sql
 2015-07-21 18:53:04 +02:00
Carbenium
8d47083319 Merge commit '64e34cdec837f9375d6d2ba6b12def8a534e08e7' into 4.3.4 
Conflicts:
	sql/base/dev/world_database.sql
	src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
 2015-07-21 18:51:30 +02:00
Carbenium
1940583e36 Fix merge error 2015-07-21 18:38:49 +02:00
Carbenium
68fd138476 Merge commit '799bdc17105c566a705cb93b4f1d1813c23f2ba2' into 4.3.4 
Conflicts:
	sql/updates/world/2014_10_27_00_world.sql
	sql/updates/world/2014_10_27_01_world_335.sql
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
 2015-07-21 18:30:05 +02:00
Carbenium
9f1d71a53f Merge commit 'a951af7b52992b47d6bf02a0f44561dcc079da6b' into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
 2015-07-21 18:22:27 +02:00
Carbenium
63df41b6b2 Merge commit '805be8ebba07c3280089a128f1764d49f6f84ab6' into 4.3.4 
Conflicts:
	sql/updates/world/2014_10_21_00_world.sql
 2015-07-21 18:17:08 +02:00
Carbenium
38027226ff Merge commit '1a075f0454fcfc1fb23432e6853af4a36730de98' into 4.3.4 
Conflicts:
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Server/WorldSession.h
 2015-07-21 18:04:43 +02:00
Carbenium
1350a08ee4 Merge commit '183a0c59e0b4ad63158b04dd62d76d20d8bfc24e' into 4.3.4 2015-07-21 17:54:19 +02:00
Rushor
e29375a337 Update Deadwind Pass 2015-07-21 13:04:02 +02:00