aboutsummaryrefslogtreecommitdiff
path: root/dep
AgeCommit message (Collapse)Author
2013-01-23SQL: Rename SQL merged in PRVincent_Michael
2013-01-22Update more copyright note for 2013.Vincent_Michael
2013-01-02Merge branch 'master' into 4.3.4Spp
Conflicts: dep/libmpq/CMakeLists.txt src/server/game/AI/EventAI/CreatureEventAI.cpp src/server/game/AI/EventAI/CreatureEventAI.h src/server/game/AI/EventAI/CreatureEventAIMgr.cpp src/server/game/AI/EventAI/CreatureEventAIMgr.h src/server/game/Entities/Creature/Creature.h src/server/game/Entities/Item/ItemPrototype.h src/server/game/Entities/Object/ObjectDefines.h src/server/game/Entities/Player/Player.cpp src/server/game/Handlers/ReferAFriendHandler.cpp src/server/game/Movement/Spline/MoveSplineInit.h src/server/game/World/World.h src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h src/server/scripts/EasternKingdoms/boss_kruul.cpp src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp src/server/scripts/OutdoorPvP/OutdoorPvPEP.h src/server/shared/Database/Implementation/CharacterDatabase.cpp src/server/shared/Database/Implementation/CharacterDatabase.h src/server/shared/Database/Implementation/WorldDatabase.cpp
2013-01-01Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmapsVincent_Michael
Conflicts: src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
2013-01-01Update copyright note for 2013.Vincent_Michael
Happy new year.
2012-12-31Core: Fixed some level 4 warnings (msvc)Shauren
2012-12-21Merge git://github.com/TrinityCore/TrinityCore into mmapskaelima
Conflicts: src/server/game/Entities/Vehicle/Vehicle.cpp src/server/game/Movement/MovementGenerator.h src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp src/server/game/Movement/MovementGenerators/PointMovementGenerator.h src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h src/server/game/Movement/Spline/MoveSpline.h
2012-11-27Merge branch 'master' into 4.3.4Spp
Conflicts: src/server/game/Achievements/AchievementMgr.cpp src/server/game/Achievements/AchievementMgr.h src/server/game/AuctionHouse/AuctionHouseMgr.cpp src/server/game/AuctionHouse/AuctionHouseMgr.h src/server/game/Battlegrounds/BattlegroundMgr.h src/server/game/Chat/ChatLink.cpp src/server/game/DataStores/DBCEnums.h src/server/game/DataStores/DBCStructure.h src/server/game/DataStores/DBCfmt.h src/server/game/Entities/Corpse/Corpse.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Entities/Vehicle/Vehicle.cpp src/server/game/Groups/Group.cpp src/server/game/Groups/Group.h src/server/game/Guilds/Guild.cpp src/server/game/Handlers/ArenaTeamHandler.cpp src/server/game/Handlers/AuctionHouseHandler.cpp src/server/game/Handlers/BattlefieldHandler.cpp src/server/game/Handlers/GroupHandler.cpp src/server/game/Handlers/ItemHandler.cpp src/server/game/Handlers/MovementHandler.cpp src/server/game/Miscellaneous/SharedDefines.h src/server/game/Movement/Spline/MoveSpline.cpp src/server/game/Movement/Spline/MoveSplineFlag.h src/server/game/Movement/Spline/MovementUtil.cpp src/server/game/Reputation/ReputationMgr.cpp src/server/game/Spells/Auras/SpellAuraDefines.h src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/game/Spells/SpellInfo.cpp src/server/scripts/Commands/cs_disable.cpp src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.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_mandokir.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp src/server/scripts/EasternKingdoms/redridge_mountains.cpp src/server/scripts/EasternKingdoms/stormwind_city.cpp src/server/scripts/EasternKingdoms/tirisfal_glades.cpp src/server/scripts/Kalimdor/boss_azuregos.cpp src/server/scripts/Kalimdor/ungoro_crater.cpp src/server/shared/Packets/ByteBuffer.h src/tools/map_extractor/dbcfile.h
2012-11-27Core: Fix some silly warnings (some stupid remnants from old times that has ↵click
bugged me enough) No need to recompiling anything, it's just a visual change to make the compilers STFU about variable initializations
2012-11-23Merge remote-tracking branch 'origin/master' into mmapsNay
Conflicts: src/server/game/Maps/Map.cpp src/server/game/Movement/MovementGenerator.h src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp src/server/game/Movement/MovementGenerators/PointMovementGenerator.h src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h src/server/game/Spells/SpellEffects.cpp
2012-11-12Core/Build: Remove some more unneeded code for OS X from cmake filesSpp
Core: Minor changes here and there
2012-11-11Merge branch 'master' into 4.3.4Tuxity
2012-11-10Core/Build: Restore FindOpenSSL, even when it's provided by cmake, this file ↵Spp
also provides newbie-check (warns if you trying to use wrong libs) - Also, apply the hack needed to make g3dlite compile in OS X
2012-11-10Merge git://github.com/TrinityCore/TrinityCore into 4.3.4kaelima
2012-11-09Core/Build: Update the G3DLite extra patch to compile under OS X with ClangTuxity
2012-11-09Core/Build: Fix problem with aceliteSpp
2012-09-28Tools: Fixed build in MeshExtractor (almost)Subv
2012-09-17Merge remote-tracking branch 'origin/master' into mmapsNay
2012-09-17Merge remote-tracking branch 'origin/master' into 4.3.4Nay
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-17Core/Dependencies: Update ACE to v6.1.4 (Windows only)Nay
Tested in multiple configurations .diff with TC changes added
2012-09-04Merge remote-tracking branch 'origin/master' into mmapsNay
Conflicts: src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
2012-09-04Merge remote-tracking branch 'origin/master' into 4.3.4Nay
Conflicts: src/server/game/Achievements/AchievementMgr.cpp src/server/game/Spells/SpellInfo.cpp src/server/scripts/Commands/cs_misc.cpp
2012-09-04Dep/G3D: Restored 99c8399772701af9bf3c79e4c514aead57cdc7d6Shauren
2012-09-03Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmapsSubv
2012-09-03Dependencies/G3D: Fix build on x64 (change already included in TC's diff)Nay
2012-09-03Core: Fix x64 compile and GCC compileNay
2012-09-03Merge remote-tracking branch 'origin/master' into 4.3.4Nay
Conflicts: dep/PackageList.txt src/tools/map_extractor/System.cpp
2012-09-03Merge remote-tracking branch 'origin/master' into mmapsNay
Conflicts: dep/PackageList.txt
2012-09-03Core/Dependencies: Update G3D to version 8.01Nay
2012-09-03Core/Dependencies: Update zlib to version 1.2.7Nay
2012-09-03Core/Dependencies: Update utf8-cpp to version 2.3.2Nay
2012-09-03Core/Dependencies: Update bzip2 to version 1.0.6Nay
2012-09-02Misc: Correct a SQL, update PackageList.txt and remove an uneeded file (soap)Nay
2012-09-02Core/Dependencies: Ugrade gsoap-library to v2.8.10click
+ add documentation for later upgrades and the original stub.file used for service generation.
2012-08-28CMake/BuildSystem: Add ACE to the VS solution also when only building tools ↵Subv
(its needed by the mmaps_generator)
2012-08-26Merge remote-tracking branch 'origin/master' into mmapsNay
2012-08-26Core: Fix compiling on Fedora (G3D related)Nay
Thanks F3st and Gamera Closes #7477
2012-08-22Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmapsSubv
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-22Core: Fix compiling on Fedora (G3D related)Nay
Thanks F3st and Gamera Closes #7477
2012-07-04Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.xShauren
2012-07-04Merged pull request #6873Shauren
2012-07-03Proper SFileFindFirstFile fix.LordJZ
2012-07-03Update StormLibLordJZ
2012-05-31Merge fix for map extractorShauren
2012-05-30Merge git://github.com/TrinityCore/TrinityCore into 4.xkaelima
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-04-23Revert "DEP: Updated Jemalloc to Version 2.5" - this version of the ↵click
jemalloc-library is crashy at best, and should not have been pushed. Further investigations on why this occurs is required before it will be slammed into master. This reverts commit 126fd13e5d6b57dc0c8830248d44db504c7d103f.
2012-04-17Update PackageList.txt after recent jemalloc updateShocker
2012-04-13DEP: Updated Jemalloc to Version 2.5Multivitamin
Signed-off-by: Multivitamin <DasUmba@.(none)>
2012-04-09Core/Dep:Venugh
+ Added recastnavigation. + Add Info to Packagelist. + Link recastnavigation in Cmake.
2012-03-27Core: Remove the MersenneTwiser-library (SFMT is now considered stable ↵click
enough for full deployment)