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
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
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
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
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
2bd1c8541d
Core/Updates: Add an automatic database update system. Automatically detects new and edited sql updates through file lists and hashing. Detects renames, deletes and is able to create and auto import full databases. * cleanups in main.cpp of world & bnetserver * refactoring in DatabaseWorkerPool.h & MySQLConnection.cpp
...
Make sure you re-run cmake, because boost::iostreams was added as dependency.
Maybe you need to install libboost-iostreams1.55-dev on unix as well.
Import every update manual until (included) those INSERT IGNORE updates for each database.
Thanks DDuarte and Shauren for your amazing ideas, help and advises.
In hope that nobody gets a "Your database structure is not up to date..." anymore ,-)
(cherry picked from commit 352012e53173372ebc82898e1b6854c983b01b25)
(cherry picked from commit 1f7f9feafc3f5017d617634ae993d2cdf4430920)
For 3.3.5:
* Synchronized ConfigureBoost.cmake with 6.x, libboost-filesystem1.55-dev also added as dependency!
Signed-off-by: Naios <naios-dev@live.de >
Signed-off-by: Nayd <dnpd.dd@gmail.com >
2015-03-21 20:54:54 +00: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 e40a5bf0b1483ce4275464a0a75a3d99035ca71c)
2015-03-18 20:12:20 +01:00
Carbenium
03176662d1
Merge pull request #14317 from Naios/typesafelog
...
Type safe logging
(cherry picked from commit cc0c9add5a3f3a17e19029ddcaa7e711040f4fc5)
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
Nayd
cc9a58eabe
Dep/zlib: Update zlib from version 1.2.7 to 1.2.8
...
"Version 1.2.8 fixes a very rare bug in decompression. All users are encouraged to upgrade immediately. Version 1.2.8 also has these improvements:
Add new inflateGetDictionary() function
Fix bug where gzopen() immediately followed by gzclose() would write an empty file instead of an empty gzip stream.
Fix bug in gzclose() when gzwrite() runs out of memory"
(cherry picked from commit 09f57db03d352a12d18d06a9c1616045f233dc4d)
2014-12-24 17:46:52 +00:00
Shauren
f773a9e053
Core: Implemented IPC (Inter-process communication) between worldserver and bnetserver using ZeroMQ library.
...
* Implemented ToonReady and ToonLoggedOut battle.net packets
2014-10-17 22:48:06 +02:00
Vincent-Michael
741f3dde2e
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
dep/PackageList.txt
src/server/game/Spells/Auras/SpellAuras.cpp
2014-08-26 19:21:22 +02:00
Shauren
febb26d4b7
Core/Deps: MySQL sources out.
...
Windows users are now required to download and install mysql server with headers and libraries
2014-08-26 18:45:54 +02:00
Vincent-Michael
4a29c73403
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-08-23 16:41:54 +02:00
jackpoz
5e8277e923
Core/Dependencies: Update G3D to v9.0 r4036
2014-08-22 21:00:56 +02:00
Shauren
909acdbac3
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/authserver/Main.cpp
src/server/authserver/Realms/RealmList.cpp
src/server/authserver/Realms/RealmList.h
src/server/authserver/Server/AuthSession.cpp
src/server/authserver/Server/AuthSocket.h
src/server/authserver/Server/RealmAcceptor.h
src/server/game/Accounts/AccountMgr.h
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Achievements/AchievementMgr.h
src/server/game/Battlegrounds/ArenaTeamMgr.cpp
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/DungeonFinding/LFGMgr.h
src/server/game/Entities/Object/Object.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/Handlers/BattleGroundHandler.cpp
src/server/game/Movement/Spline/MoveSplineFlag.h
src/server/game/Quests/QuestDef.cpp
src/server/game/Quests/QuestDef.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Server/WorldSocket.cpp
src/server/game/Server/WorldSocket.h
src/server/game/Spells/Spell.cpp
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
src/server/scripts/Spells/spell_mage.cpp
src/server/scripts/Spells/spell_rogue.cpp
src/server/scripts/Spells/spell_shaman.cpp
src/server/scripts/Spells/spell_warrior.cpp
src/server/shared/Cryptography/BigNumber.h
src/server/worldserver/RemoteAccess/RASocket.cpp
src/server/worldserver/worldserver.conf.dist
2014-07-19 03:51:11 +02:00
leak
da3f6e923a
Completely remove ACE as dependency for TC - kkthxbye
2014-07-06 01:42:35 +02:00
Vincent-Michael
3a63187b47
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
dep/PackageList.txt
src/server/game/DataStores/DBCEnums.h
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStores.h
src/server/game/DataStores/DBCfmt.h
2014-06-26 00:13:34 +02:00
jackpoz
ed5e3fceed
Core/MMAPs: Update recast
...
Update recast to https://github.com/memononen/recastnavigation/commit/42b96b7306d39bb7680ddb0f89d480a8296c83ff
Previous MMAPs might still work but it's recommended to re-extract them.
2014-06-25 22:04:06 +02:00
Vincent-Michael
f0c366141b
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/scripts/World/action_ip_logger.cpp
2014-06-24 18:26:52 +02:00
click
82ce4eacc8
Update dependency packagelist
2014-06-24 08:16:45 +02:00
Vincent-Michael
1d210bc490
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
dep/PackageList.txt
2014-06-21 00:07:48 +02:00
jackpoz
0892c71a16
Core/Dependencies: Clean up recastnavigation folder
...
Remove old files from recastnavigation folder and update the structure to the same of https://github.com/memononen/recastnavigation/ to allow easier updates.
2014-06-20 23:30:44 +02:00
Vincent-Michael
910f32d48d
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
2014-06-19 22:57:44 +02:00
jackpoz
57069b393d
Core/Dependencies: Upgrade to jemalloc-3.6.0
2014-06-19 22:20:55 +02:00
Vincent-Michael
e4b14b943d
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
sql/old/3.3.5a/TDB52_to_TDB53_updates/world/2013_07_24_00_world_spell_script_names.sql
sql/updates/world/2013_07_24_00_world_spell_script_names.sql
sql/updates/world/2013_07_24_00_world_spell_script_names_335.sql
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Achievements/AchievementMgr.h
src/server/game/Battlegrounds/ArenaTeamMgr.cpp
src/server/game/Chat/ChatLink.cpp
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/DynamicObject/DynamicObject.h
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Groups/Group.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/World/World.h
src/server/scripts/Commands/cs_character.cpp
src/server/scripts/Commands/cs_lookup.cpp
src/server/scripts/Commands/cs_titles.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/Kalimdor/zone_darkshore.cpp
src/server/scripts/Kalimdor/zone_mulgore.cpp
src/server/scripts/Kalimdor/zone_tanaris.cpp
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_mage.cpp
src/server/scripts/Spells/spell_rogue.cpp
src/server/shared/Database/Implementation/CharacterDatabase.cpp
src/server/shared/Database/Implementation/CharacterDatabase.h
src/tools/vmap4_extractor/mpq_libmpq04.h
2014-04-05 20:43:05 +02:00
jackpoz
a3e56b0689
Core/Dependencies: Upgrade to jemalloc-3.5.1
2014-03-28 22:34:39 +01:00
Vincent-Michael
313ef9da33
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-07-20 21:07:49 +02:00
Nay
7ce340bbd6
Core/Dependencies: Update utf8-cpp to version 2.3.4
2013-07-20 14:55:25 +01:00
Spp
1b6fb2b695
Merge branch 'master' into 4.3.4 [NOTE: There are parts of code marked as "REVIEW - MERGE" That needs some review)
...
Conflicts:
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStores.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Movement/Spline/MovementTypedefs.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
src/server/scripts/Spells/spell_generic.cpp
2013-05-21 09:41:13 +02:00
click
acf6c79d9b
Core/Dependencies: Upgrade to jemalloc-3.3.1 (Also fixes a few weird crashes), closes #7852
...
Note: This adds support for using jemalloc on FreeBSD, Mac OS X Lion and a few other platforms (not enabled by default)
Please read dep/jemalloc/ChangeLog for further information (Changed from 2.1.1 and up apply)
2013-04-16 21:03:29 +02:00
Nay
b404e0bec1
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
dep/PackageList.txt
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Combat/ThreatManager.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/BattleGroundHandler.cpp
src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
src/server/game/Movement/Spline/MoveSplineInit.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/World/World.cpp
src/server/game/World/World.h
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
src/server/scripts/Spells/spell_druid.cpp
src/server/scripts/Spells/spell_mage.cpp
src/server/scripts/Spells/spell_paladin.cpp
src/server/scripts/Spells/spell_priest.cpp
src/server/scripts/Spells/spell_rogue.cpp
src/server/scripts/Spells/spell_shaman.cpp
src/server/scripts/Spells/spell_warlock.cpp
src/server/scripts/Spells/spell_warrior.cpp
src/tools/map_extractor/CMakeLists.txt
src/tools/map_extractor/System.cpp
src/tools/map_extractor/loadlib.cpp
src/tools/map_extractor/mpq_libmpq.cpp
src/tools/map_extractor/mpq_libmpq04.h
src/tools/vmap4_assembler/CMakeLists.txt
src/tools/vmap4_extractor/CMakeLists.txt
src/tools/vmap4_extractor/mpq_libmpq.cpp
src/tools/vmap4_extractor/mpq_libmpq04.h
2013-01-28 01:04:37 +00:00
Nay
23961d0dce
Merge remote-tracking branch 'origin/master' into mmaps
2012-09-17 23:50:08 +01:00
Nay
6568b0624d
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Object/Updates/UpdateFields.h
src/server/game/Entities/Unit/Unit.cpp
src/server/scripts/Spells/spell_druid.cpp
2012-09-17 23:49:13 +01:00
Nay
2e21fa6b92
Core/Dependencies: Update ACE to v6.1.4 (Windows only)
...
Tested in multiple configurations
.diff with TC changes added
2012-09-17 23:21:01 +01:00
Nay
874ddcb0ae
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
dep/PackageList.txt
src/tools/map_extractor/System.cpp
2012-09-03 16:11:46 +01:00
Nay
c7fed98b9d
Merge remote-tracking branch 'origin/master' into mmaps
...
Conflicts:
dep/PackageList.txt
2012-09-03 15:51:34 +01:00
Nay
0db5573d4d
Core/Dependencies: Update G3D to version 8.01
2012-09-03 15:39:07 +01:00
Nay
5f6e190a96
Core/Dependencies: Update zlib to version 1.2.7
2012-09-03 15:37:39 +01:00
Nay
531e16e5b8
Core/Dependencies: Update utf8-cpp to version 2.3.2
2012-09-03 15:36:36 +01:00
Nay
6cde35955d
Core/Dependencies: Update bzip2 to version 1.0.6
2012-09-03 15:35:28 +01:00
Nay
1a49554af8
Misc: Correct a SQL, update PackageList.txt and remove an uneeded file (soap)
2012-09-02 22:52:22 +01:00
Subv
dc95ce61b4
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
...
Conflicts:
dep/PackageList.txt
src/server/game/Movement/MotionMaster.cpp
src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
src/server/game/Movement/Spline/MoveSplineInit.h
src/server/game/World/World.h
2012-08-22 17:26:53 -05:00
Shauren
ed6f3e2def
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x
2012-07-04 22:20:21 +02:00
kaelima
3d14384c32
Merge git://github.com/TrinityCore/TrinityCore into 4.x
...
Conflicts:
dep/PackageList.txt
sql/base/auth_database.sql
src/server/authserver/Server/AuthSocket.cpp
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Chat/Commands/Level1.cpp
src/server/game/Chat/Commands/Level3.cpp
src/server/game/DataStores/DBCEnums.h
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStores.h
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/Corpse/Corpse.cpp
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/DynamicObject/DynamicObject.cpp
src/server/game/Entities/GameObject/GameObject.cpp
src/server/game/Entities/Item/Item.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/Updates/UpdateData.h
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Transport/Transport.cpp
src/server/game/Entities/Unit/Unit.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/MiscHandler.cpp
src/server/game/Handlers/MovementHandler.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Loot/LootMgr.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Quests/QuestDef.cpp
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Server/Protocol/Opcodes.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/Spell.h
src/server/game/Spells/SpellEffects.cpp
src/server/game/Tickets/TicketMgr.cpp
src/server/scripts/Commands/cs_gps.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/shared/Database/Implementation/CharacterDatabase.cpp
src/server/shared/Logging/Log.h
src/tools/map_extractor/CMakeLists.txt
src/tools/map_extractor/System.cpp
src/tools/map_extractor/mpq_libmpq04.h
src/tools/vmap4_extractor/CMakeLists.txt
2012-05-30 08:01:02 +02:00
Shocker
de3db06731
Update PackageList.txt after recent jemalloc update
2012-04-17 04:24:59 +03:00
Venugh
37cf893ad9
Core/Dep:
...
+ Added recastnavigation.
+ Add Info to Packagelist.
+ Link recastnavigation in Cmake.
2012-04-09 14:24:53 +02:00
click
6afaed4a02
Core: Remove the MersenneTwiser-library (SFMT is now considered stable enough for full deployment)
2012-03-27 02:27:12 +02:00
Shauren
b1e4a1b14f
Core/Tools: Replaced libmpq with StormLib and made map extractor use it, you can now extract 4.2.2 dbcs with it (still not maps)
...
TODO: Update ADT structure
2012-02-20 19:12:05 +01:00