Commit Graph
140 Commits
Author SHA1 Message Date
Spp 5fd7d01bde Core/Build: Remove some more unneeded code for OS X from cmake files
Core: Minor changes here and there
2012-11-12 10:29:52 +01:00
Tuxity 516c6d31ec Merge branch 'master' into 4.3.4 2012-11-11 18:53:01 +01:00
Spp a91d59f37c Core/Build: Restore FindOpenSSL, even when it's provided by cmake, this file 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-10 13:15:09 +01:00
kaelima 08f6d3e975 Merge git://github.com/TrinityCore/TrinityCore into 4.3.4 2012-11-10 04:39:46 +01:00
Tuxity 2d0dddfcbe Core/Build: Update the G3DLite extra patch to compile under OS X with Clang 2012-11-09 16:56:10 +01:00
Spp a57254d769 Core/Build: Fix problem with acelite 2012-11-09 16:09:27 +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 5ee22a8006 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Commands/cs_misc.cpp
2012-09-04 19:08:22 +01:00
Shauren 8ec0146721 Dep/G3D: Restored 99c8399772 2012-09-04 14:43:32 +02:00
Nay 2fe8c2f41e Dependencies/G3D: Fix build on x64 (change already included in TC's diff) 2012-09-03 18:24:35 +01:00
Nay 25cc49b489 Core: Fix x64 compile and GCC compile 2012-09-03 18:16:04 +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 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
click 0cca186a44 Core/Dependencies: Ugrade gsoap-library to v2.8.10
+ add documentation for later upgrades and the original stub.file used for service generation.
2012-09-02 22:57:10 +02:00
Nay e118a7fcc5 Core: Fix compiling on Fedora (G3D related)
Thanks F3st and Gamera

Closes #7477
2012-08-26 21:45:15 +01:00
Nay fb3e446e4d Core: Fix compiling on Fedora (G3D related)
Thanks F3st and Gamera

Closes #7477
2012-08-22 14:38:29 +01:00
Shauren ed6f3e2def Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x 2012-07-04 22:20:21 +02:00
Shauren 138375c045 Merged pull request #6873 2012-07-04 18:26:54 +02:00
LordJZ c26b5a8c1f Proper SFileFindFirstFile fix. 2012-07-03 17:16:31 +02:00
LordJZ 459257b056 Update StormLib 2012-07-03 17:16:30 +02:00
Shauren 9ab6e76a78 Merge fix for map extractor 2012-05-31 00:59:40 +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
click c412328991 Revert "DEP: Updated Jemalloc to Version 2.5" - this version of the 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 126fd13e5d.
2012-04-23 20:23:30 +02:00
Shocker de3db06731 Update PackageList.txt after recent jemalloc update 2012-04-17 04:24:59 +03:00
Multivitamin 126fd13e5d DEP: Updated Jemalloc to Version 2.5
Signed-off-by: Multivitamin <DasUmba@.(none)>
2012-04-13 10:49:09 +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
click e2a92d4bbc Buildsystem/CMake: Add the ability to avoid linking the core with jemalloc on linux through using the -DNOJEM parameter.
WARNING: This is a developer flag only, and as such NOT documented elsewhere - we need this for valgrind and related tools.
Again : YOU HAVE BEEN WARNED! DO NOT USE THIS FLAG UNLESS YOU REALLY KNOW WHAT YOU ARE DOING!
2012-03-25 17:14:08 +02:00
thomas33 0c178320bf update forgotten copyright-headers for 2012 2012-03-11 20:53:08 +01:00
Shauren ca4c5ed544 Core/Utils: Fixed random crashes with SFMT caused by wrong memory alignment when operating on SSE instructions (they require 16 byte alignment, while classes and its members are only aligned to 8 byte boundaries) 2012-02-25 20:29:27 +01:00
Shauren f0ca875a21 Tools/Extractors: Changed search method, it will no longer miss some dbc files 2012-02-21 22:39:53 +01: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
Chaplain 99c8399772 Dependencies/G3D: Fix typo in isNaN(float x).
*In original G3D svn it was fixed long time ago.
2012-01-14 13:40:29 +03:00
Venugh 057621f866 CMake: Updated year to 2012. 2012-01-07 23:10:50 +01:00
kiper 8299627ed9 Update headers for 2012. HAPPY NEW YEAR!!! 2012-01-01 00:32:13 +01:00
leak ef17c05dec Core/DBLayer: Convert PExecute() queries to prepared statements No. 1 2011-12-25 18:13:21 +01:00
click 9762c17833 Core/Buildsystem: Update copyright-headers for 2011, and adjust with the correct teamname as well. 2011-04-27 18:17:00 +02:00
click c6a88dcf32 Core/Dependencies: Fix the connectionissues with SOAP on Windows platforms - thanks to leak for testing and Shauren for the suggestion on checking the variable 2011-04-27 17:56:56 +02:00
click d42c048818 Core/Dependencies: update to gSoap v2.8.2 - windows users please test and give feedback if connectionissues has been resolved 2011-04-27 00:34:22 +02:00
Xanadu c47c94f958 Dep/MySQL: Updated MySQL sources to version 5.5.9 (current GA) 2011-03-05 02:41:59 +01:00
Shauren 067648aad6 Buildsystem: Compile bzip2 project only with map tools 2011-03-03 21:27:46 +01:00
click 31334b8770 Core/Dependencies: Temporarily fix an RFC-breaking addition in gSoap (upstream developers have been notified)
+ local changes and diff (tc_changes.diff) included for future reference

--HG--
branch : trunk
2010-12-21 18:40:54 +01:00
click e75d16b813 Core/Dependencies: Adjust jemalloc library caching methods - this will fix the startup-crash on linux-based systems.
Note: This is a temporary measure untill we've figured out why this occurs, further testing will be done.

--HG--
branch : trunk
2010-12-18 16:14:08 +01:00
click 785d5a94a6 Core/Dependencies: Update jemalloc library from v1.0.0 to v2.1.0 (latest stable)
--HG--
branch : trunk
2010-12-18 02:31:10 +01:00
click 0054bd83d8 Buildsystem/Linux: Fix linking of a long lost little child : jemalloc (yes, it has returned, and is now actively linked again)
--HG--
branch : trunk
2010-12-18 01:36:00 +01:00
click a3de6e7c6f Core/Dependency: Update gSoap to v2.8.0 - this should also fix some issues when connecting with Axis framework (needs to be tested)
+ Update packagelist to include correct versions of what we have in repository

--HG--
branch : trunk
2010-12-17 01:04:12 +01:00