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
|
069f4c279b
|
Merge commit 'e96676aeddb4763f6353675724fd6a033d60fbcb' into 4.3.4
|
2015-07-22 00:08:04 +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 |
|
Aokromes
|
87a427828a
|
Dep/Misc: More deps
|
2015-07-19 15:03:13 +02:00 |
|
Naios
|
66ce97c87e
|
Dep/CppFormat: Update cppformat to cppformat/cppformat@fd53bb6fb8
* fixes /W4 warning spamming.
|
2015-04-05 21:30:22 +02:00 |
|
Naios
|
589296da90
|
Dep/CppFormat: Update cppformat to cppformat/cppformat@aab64b55a4
* fixes argument limit, argument count is unlimited now.
|
2015-04-02 21:07:42 +02:00 |
|
Naios
|
f25666375e
|
Dep/CppFormat: Update cppformat to cppformat/cppformat@bf8636c959
* fixes detecting support of <initializer_list>
* fixes build on solaris
(cherry picked from commit e40a5bf0b1)
|
2015-03-18 20:12:20 +01:00 |
|
Carbenium
|
a7f78d9295
|
Dep/CppFormat: Fix cmake error when using GCC
(cherry picked from commit 3eaace1508)
|
2015-03-18 03:05:36 +01:00 |
|
Carbenium
|
03176662d1
|
Merge pull request #14317 from Naios/typesafelog
Type safe logging
(cherry picked from commit cc0c9add5a)
Conflicts:
src/server/bnetserver/CMakeLists.txt
src/server/game/Server/WorldSocketMgr.cpp
src/server/shared/Logging/AppenderDB.cpp
src/server/worldserver/CMakeLists.txt
|
2015-03-18 02:59:40 +01:00 |
|