Commit Graph
275 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
Vincent-Michael 946ab3e8b7 Core: Kill again whitespace :( 2014-07-21 18:14:22 +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
leak dce92611f3 Refactored singletons to enable proper deconstruction during shutdown 2014-07-20 00:40:08 +02:00
Shauren abe8dd7abf Build fix (gcc) 2014-07-19 20:05:36 +02:00
Shauren 0bcc92d900 Part 3: Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2014-07-19 17:03:32 +02:00
Shauren 3e56a4b8d7 Part 1: Merge branch 'master' into 4.3.4 2014-07-19 13:40:14 +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
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
Subv e84ba172a7 Fixed a GCC internal error when compiling AsyncAcceptor 2014-07-10 13:36:54 -05:00
Subv 110396447f Fixed the authserver not accepting clients.
Fixed using hostnames in the realmlist table.
2014-07-07 14:25:17 -05:00
Subv 77caf33deb Removed some unneeded boost dependencies.
Ensure that the correct packet sizes are read in the authserver.
Added some try catch to the authserver to deal with boost exceptions (this part is not finished)
2014-07-06 17:04:42 -05:00
leak 59c8ffe4b3 Change the freeze detector thread to be a periodic callback running on the thread pool 2014-07-06 23:04:38 +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 151785b9ce Merge branch 'master' of github.com:TrinityCore/TrinityCore into boost
Conflicts:
	src/server/game/World/World.cpp
2014-07-03 15:57:47 -05:00
Subv 2874014443 Cleaned up the authserver includes a bit.
Fixed authserver pch build
2014-07-02 11:50:03 -05:00
leak c31c6f3ba3 Backported AsyncAcceptor generalization to authserver 2014-07-02 18:05:30 +02:00
leak 310f5e6846 Some ground work for ASIO based RemoteAccess handling 2014-07-02 17:38:44 +02:00
leak 66c94ce965 Delinking ACE from Shared and authserver 2014-07-02 00:43:47 +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 eb36acd152 Replaced ACE_Task_Base based LogWorker with ProducerConsumerQueue 2014-06-30 14:44:52 +02:00
Vincent-Michael a260454ad6 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-28 21:08:20 +02:00
jackpoz 82df3f090b Auth/Misc: Move OpenSSL version log from Warning to Information 2014-06-28 17:55:40 +02:00
leak a20ac4c25b Compile fix for recently added coding accessing socket information 2014-06-24 17:41:43 +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
Subv 0db743c4ff Merge branch 'master' of github.com:TrinityCore/TrinityCore into boost
Conflicts:
	src/server/authserver/Server/AuthSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/shared/Packets/ByteBuffer.cpp
	src/server/shared/Utilities/Util.h
2014-06-23 16:35:54 -05:00
Shauren ec49d510fc Core/Battle.net: Defined more communication channels 2014-06-21 23:45:06 +02:00
Subv b9d288e2ad Auth/Battle.net: Corrected some battle.net auth response enum values 2014-06-20 20:04:05 -05:00
Ascathor 6949735098 Core/Misc:
* Fix some codestyle, fix some typos

* Change CMakeLists for: Custom (can be uncommented), Events, World
** Custom is theoretically unchanged. You can, however, uncomment the glob_recurse that initializes every file within. This might be easier for beginners.

* Introducing the IP Based Action Log System:
** On several different actions, e.g. Login, Character Login, etc., a new entry is added
** Can be logged on and off in worldserver config
*** Disabled by default to prevent increased log db size for unknowing users.

* Add a new row to account table called 'last_attempt_ip'
** Lists the last ip trying to connect to the account

* Add a new type of HookScripts: AccountScript
** Includes: OnAccountLogin, OnFailedAccountLogin, OnEmailChange, OnFailedChange, OnPasswordChange, OnFailedPasswordChange

* Added new Hook to PlayerScripts: OnFailedPlayerDelete

* Added new variables to PlayerScripts: OnPlayerDelete
2014-06-13 16:25:11 +02:00
Shauren 0a6e81989a Core/Battle.net: Sorted out includes in BattlenetBitStream.h 2014-06-11 22:56:34 +02:00
Shauren 2b6575692b Core/Battle.net: Added missing include and fixed a warning 2014-06-11 20:51:48 +02:00
Shauren fea9995797 Build fix 2014-06-11 18:17:45 +02:00
Shauren 434b3a80e1 Core/Commands: Added a set of commands to manage battle.net accounts
TODO: Ban commands, linking game accounts to battle.net accounts
2014-06-08 17:58:28 +02:00
Shauren 7dd552c826 Merge branch 'battle.net' into 4.3.4 2014-06-08 16:14:24 +02:00
Shauren 9f69eda67f Core/Battle.net: Additional checks
* Force grunt login for versions < 15595
* Force bn login if supported and game account is linked to bn account
2014-06-08 15:34:24 +02:00
Shauren 05c0524bf3 Core/Battle.net: Refactored handling multiple game accounts 2014-06-08 14:54:37 +02:00
Vincent-Michael 1d39db16b9 Core/Misc: Kill Whitespace ... 2014-06-07 23:58:08 +02:00
Shauren 6eee75a4f7 Core/Battle.net: Removed sending "b", it's supposed to stay secret 2014-06-03 19:15:12 +02:00
Shauren 7a27492071 Core/Crypto: Refactored HmacHash to make it easier to use with different hash algorithms 2014-06-03 18:15:35 +02:00
leak 68e22ad311 Replaced ACE based typedefs for fixed width ints with C++11 versions 2014-06-01 20:55:31 +02:00
Shauren c98853ca1c Core/Authserver: Added game account flags 2014-06-01 15:03:22 +02:00
Shauren bdd6e9aa8a Core/Battle.net: Implemented reconnects 2014-06-01 13:56:36 +02:00
Shauren dc5c5ef636 Core/Authserver: Refactoring - moved GetAddressForClient to Realm structure, changed BigNumber string methods to return std::string, added missing prepared statement 2014-06-01 13:03:30 +02:00
Shauren db2cb70120 Core/Battle.net: Refactored ModuleInfo creation 2014-06-01 02:39:55 +02:00
Shauren 914d5d5366 Core/Battle.net: Fixed size check in bit stream 2014-06-01 02:36:50 +02:00
leak 35aa142f6a Replaced ACE_INET_Addr with boost::asio::ip::address 2014-05-31 18:31:53 +02:00
Shauren cc748e2ba4 Core/Battle.net: Prevent joining invalid/offline realms 2014-05-31 18:19:53 +02:00
leak bf6e58b8d4 Ditched ACE_Singleton in favor of C++11 like Singleton 2014-05-31 15:58:59 +02:00