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
This commit is contained in:
commit
293658fb13
100 files changed
+79037
-77341
No files matched your search
+2
-2
@@ -14,7 +14,7 @@ bzip2 (a freely available, patent free, high-quality data compressor)
|
||||
|
||||
cppformat (type safe format library)
|
||||
https://github.com/cppformat/cppformat
|
||||
Version: 1.1.0 fd53bb6fb88a23e38ec4fe331bfe95d7372d49c9
|
||||
Version: 7859f8123311c1b8f69856d3c5e1b8501fbdae11
|
||||
|
||||
G3D (a commercial-grade C++ 3D engine available as Open Source (BSD License)
|
||||
http://g3d.sourceforge.net/
|
||||
@@ -42,7 +42,7 @@ gSOAP (a portable development toolkit for C and C++ XML Web services and XML dat
|
||||
|
||||
recastnavigation (Recast is state of the art navigation mesh construction toolset for games)
|
||||
https://github.com/memononen/recastnavigation
|
||||
Version: 42b96b7306d39bb7680ddb0f89d480a8296c83ff
|
||||
Version: 1dd5cf1883d61e723fef3d4957cf758c50e7a52b
|
||||
|
||||
StormLib (a pack of modules, written in C++, which are able to read and also to write files from/to the MPQ archives)
|
||||
http://www.zezula.net/en/mpq/stormlib.html
|
||||
|
||||
Reference in new issue
Block a user