Commit Graph
1027 Commits
Author SHA1 Message Date
DDuarte 01d9681a4d Merge branch 'master' into 4.3.4
Conflicts:
	src/server/authserver/Realms/RealmList.cpp
	src/server/scripts/EasternKingdoms/zone_ironforge.cpp
2014-07-22 13:15:36 +01:00
DDuarte 44c0d66d63 Core/Misc: Remove a define that is no longer needed since ACE was removed 2014-07-22 13:12:39 +01:00
leak 5b0898b33c Core/DatabaseWorkerPool: Delete PCQ in dtor rather than in Close() and cancel queue properly before doing so 2014-07-21 20:12:44 +02:00
Sebastian Valle Herrera eae97c7bc8 Core/PreparedStatements: Fixed a Coverity warning 2014-07-21 13:01:11 -05:00
Vincent-Michael 946ab3e8b7 Core: Kill again whitespace :( 2014-07-21 18:14:22 +02:00
Vincent-Michael 3b32053c59 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/shared/Utilities/Util.h
2014-07-20 16:35:35 +02:00
Shauren c0eba6a127 Fixed gcc build without pch 2014-07-20 16:06:35 +02:00
Vincent-Michael e108478d62 Core: Fix non build (gcc) 2014-07-20 04:22:20 +02:00
Vincent-Michael e68d3b0937 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
2014-07-20 03:06:03 +02:00
Vincent-Michael 0531f52008 Core: Fix non pch build (gcc) 2014-07-20 02:54:12 +02:00
leak dce92611f3 Refactored singletons to enable proper deconstruction during shutdown 2014-07-20 00:40:08 +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
Shauren 7532864264 Buildsystem/MSVC: Warning fixes
C4800 'type' : forcing value to bool 'true' or 'false' (performance warning)
C4127 conditional expression is constant
2014-07-17 15:42:57 +02:00
Chaplain 68398a559e [Auth\Worldserver] Use boost to load console arguments. (Added a few style changes and cmake fix)
Conflicts:
	src/server/worldserver/Main.cpp
2014-07-15 18:15:55 +02:00
leak ecde28d1c1 Replacing ACE based multi threading with PCQ 2014-07-14 22:51:13 +02:00
leak a70fb4c306 Corrected order of inclusion in Define.h 2014-07-14 20:54:55 +02:00
Subv f14399d788 More warnings fixes 2014-07-13 16:49:56 -05:00
Subv f6962f9c68 Fixed some compiler warnings 2014-07-13 16:40:31 -05:00
Subv 87f830ca89 Fix a warning about abstract class not having a virtual destructor 2014-07-13 15:17:13 -05:00
Shauren 264363e76c Core/Misc: Fixed another compiler segmentation fault when compiling AsyncAcceptor with gcc 4.7.2 2014-07-11 22:24:22 +02:00
Shauren eaee0f5dd0 Core/Misc: Fixed compiler segmentation fault when compiling AsyncAcceptor with gcc 4.7.2 2014-07-11 22:07:48 +02:00
Subv da28c24d8e More GCC compile fixes 2014-07-09 12:24:20 -05:00
Subv 6eaffdac51 Nuked some compiler errors on Linux 2014-07-09 11:32:49 -05:00
Subv d15ced546f Fixed the UI64FMT and SI64FMT format specifiers 2014-07-08 17:33:34 -05:00
leak d1594998f8 Replaced the LogWorker thread with Boost ASIO 2014-07-08 20:55:25 +02:00
leak c24bf2f028 Fix of the fix ftw 2014-07-07 23:36:31 +02:00
leak 1a9c183bc6 Fixed the AsyncAcceptor overload (too much c#..) 2014-07-07 22:09:17 +02:00
leak c7d5660e99 Readd support for TCP_NODELAY socket option 2014-07-07 21:37:55 +02:00
leak 021e18d152 Refactored both world and auth main
- Master/Worldrunable removed
- World Update loop now running on main (which was doing nothing before)
- Processpriority moved to shared
- Added a preliminary thread pool for boost::asio::io_service
2014-07-04 15:22:06 +02:00
leak 4f2f9e08f8 Fixed compilation and some copy paste error 2014-07-04 15:20:23 +02:00
Subv 0a07fd5fc3 Some changes here and there in shared 2014-07-03 15:08:35 -05:00
Subv 87b72f41ca Fixed login and some errors 2014-07-02 21:56:40 -05:00
leak 310f5e6846 Some ground work for ASIO based RemoteAccess handling 2014-07-02 17:38:44 +02:00
Subv b2657a809d Fixed the authserver compile 2014-07-01 20:40:56 -05:00
leak 66c94ce965 Delinking ACE from Shared and authserver 2014-07-02 00:43:47 +02:00
leak 25e633aa34 Replaced ACE_Method_Request based DelayExecutor by PCQ impl
Untested due to worldserver still breaking because of ACE threading fails
2014-07-02 00:41:30 +02:00
leak f8e829da65 Removed useless SignalHandler class 2014-07-01 00:57:29 +02:00
leak 029bad6698 Replaced all remaining ACE based Singletons
Replaced ACE base AutoPtr class with shared_ptr
Note: worldserver currently broken due to MapUpdater threading failure (ACE ofc, what else could it be)
2014-07-01 00:54:09 +02:00
leak d39a013b6b Replaced ACE_Task_Base based DatabaseWorker with PCQ
Note: Not exactly sure how shutdown should be handled, currently the queue clears itself out before shutting down
This might need to be changed if the queue should be fully processed before being deleted
2014-06-30 18:37:23 +02:00
leak 9588c1d92b Replace ACE thread/mutex in OpenSSLCrypto 2014-06-30 16:28:55 +02:00
leak eb36acd152 Replaced ACE_Task_Base based LogWorker with ProducerConsumerQueue 2014-06-30 14:44:52 +02:00
Shauren a2b860b781 Core/DataStores: Implemented uint64 field type for DBC files and fixed structure of Achievement_Criteria.dbc 2014-06-27 00:37:17 +02:00
Shauren 21687aa857 Core/Battle.net: Fixed password change prepared statement 2014-06-27 00:35:47 +02:00
leak d8d0b4730e Revert "Removed ACE dependencies from LogWorker" This actually needs way more work
This reverts commit 0a592dd9db.
2014-06-24 21:10:07 +02:00
Subv f03d49705d Core/Databases: Removed ACE dependencies on some of the database handling code. 2014-06-24 13:17:41 -05:00
leak 0a592dd9db Removed ACE dependencies from LogWorker 2014-06-24 19:13:29 +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
Subv 393b7eef53 Merge branch 'master' of github.com:TrinityCore/TrinityCore into boost 2014-06-24 10:32:34 -05:00
Shauren 05ea2f76b8 Core/Misc: Fixed warnings 2014-06-24 02:01:40 +02:00
Vincent-Michael d8234bed42 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Accounts/AccountMgr.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/World/World.cpp
2014-06-23 23:47:48 +02:00