Commit Graph
313 Commits
Author SHA1 Message Date
Shauren 7f2cdfd166 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/scripts/World/npcs_special.cpp
2014-09-12 20:26:46 +02:00
Shauren 946e2d0ca6 Core/Authserver: Added missing auth socket manager
Closes #13085
2014-09-10 21:17:55 +02:00
Shauren e0ce4528c5 Core/NetworkIO: Use reactor style sending on linux to reduce locking overhead 2014-09-09 19:19:25 +02:00
Shauren b90329d63a Core/Battle.net: Use real account name from account table to auth instead of always constructing bnetId#index. Fixes having to reconfigure addons by players.
*NEW* battle.net only accounts should be created with battlenet_account_id#account_index format in username
2014-08-22 20:09:18 +02:00
Shauren 42cac6796a Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/authserver/Server/AuthSession.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Server/WorldSocket.cpp
2014-08-21 23:59:00 +02:00
Shauren d2361ae056 Core/Battle.net: Made battle.net port configurable 2014-08-21 22:28:06 +02:00
Shauren abfd29ab61 Core/WorldSession: Added research notes about CMSG_AUTH_SESSION values and reordered checks during login to always initialize encryption first to make sure the client can read failure packet 2014-08-21 18:18:13 +02:00
Shauren d0176f985d Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/shared/Database/Implementation/WorldDatabase.cpp
2014-08-15 20:13:34 +02:00
Shauren 4a741258f1 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/Zones/BattlegroundAB.h
	src/server/game/Battlegrounds/Zones/BattlegroundAV.h
	src/server/game/Battlegrounds/Zones/BattlegroundEY.h
	src/server/game/Battlegrounds/Zones/BattlegroundIC.h
	src/server/game/Battlegrounds/Zones/BattlegroundSA.h
	src/server/game/Battlegrounds/Zones/BattlegroundWS.h
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/DynamicObject/DynamicObject.h
	src/server/game/Entities/Item/Item.h
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Guilds/Guild.h
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Server/WorldPacket.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/World/World.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/shared/Packets/ByteBuffer.h
2014-08-12 00:45:24 +02:00
Shauren c741d2682a Core/NetworkIO: Prevent queueing more async operations when socket is already closed 2014-08-11 20:43:07 +02:00
Shauren 39d3480172 Core/Authserver: Fixed writing to invalid memory address 2014-08-10 11:48:43 +02:00
Shauren df11916ad5 Core/NetworkIO: Allow receiving packets bigger than buffer size and properly handle situations where not entire packet was read in one go
Core/Authserver: Restored authenticator functionality
2014-08-10 11:00:27 +02:00
jackpoz 78af80230d Core/Misc: Fix static analysis issues 2014-08-08 21:14:12 +02:00
DDuarte 7e64222029 Auth/Main: Fix crashes on shutdown
"mutex destroyed while busy"
2014-08-05 15:23:42 +01:00
DDuarte 66a8d41f59 Auth/Networking: Use non-throw resolves in realmlist updates
Fixes #12737
2014-08-05 15:14:52 +01:00
Vincent-Michael a917b6599f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Server/WorldSocket.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
2014-07-30 22:26:59 +02:00
joschiwald 04bb78f6c3 Scripts/OutdoorPvP: replaced some chat texts with proper defense messages 2014-07-29 23:45:34 +02:00
Shauren d46c3bf877 Core/Authserver: Fixed invalid memory access when AsByteArray returns less bytes than expected 2014-07-29 18:26:10 +02:00
DDuarte 0e52b111f3 Core/Config: User-friendlyfy configuration parsing errors
It will now print useful error messages that pinpoint the issue
with the config file (missing file, bad syntax, etc)

In memory of MitchesD that lost 18 hours finding a problem with
his config because of a duplicated line.
2014-07-29 01:47:00 +01:00
Shauren d89a5d2d17 Fixed gcc compile with pch 2014-07-29 02:05:12 +02:00
Shauren fc687effce Attempt to fix centos compile 2014-07-28 10:15:31 +02:00
Shauren c8a241c49e Core/Network: Use base Socket class for battle.net 2014-07-27 21:50:01 +02:00
Shauren 2cba07d6a1 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	README.md
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.h
	src/server/game/Server/WorldPacket.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/shared/Packets/ByteBuffer.h
2014-07-27 20:59:22 +02:00
Shauren 6f272ea5b7 Core/Network: Optimized packet sending by removing unneccessary memory copying 2014-07-27 17:46:46 +02:00
Shauren e77c0b6ed4 Core/Network: Allow storing any packet types in Socket write queue to reduce the amount of copying going on 2014-07-27 14:59:46 +02:00
Vincent-Michael 55eafa247d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/authserver/Server/AuthSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
2014-07-27 12:09:32 +02:00
Shauren 26715795b4 Fixed gcc build 2014-07-27 01:26:03 +02:00
Shauren c1b1ba44ba Core/Network: Refactored socket code, moved common operations to base Socket class 2014-07-26 23:26:01 +02:00
Vincent-Michael 7f7987707b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-25 21:53:35 +02:00
Vincent-Michael e516265703 Core: Fix non pch build 2014-07-25 21:52:41 +02:00
DDuarte dcfa3bfa90 Core/Network: Fix build 2014-07-25 19:49:43 +01:00
Shauren db6be5927f Core/Realmlist: Force resolving realm addresses to ipv4
Closes #12640
2014-07-25 20:13:13 +02:00
Vincent-Michael 5a8e79528f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-25 19:35:11 +02:00
DDuarte 4f1d247dfb Core/Network: Fix some possible exceptions on socket.close()
Ref #12634
2014-07-25 18:06:43 +01:00
DDuarte 5193eaac87 Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
2014-07-24 03:35:19 +01:00
Shauren 42eeec12bf Core/Mains: Handle SIGBREAK to achieve clean shutdown when users click X button on windows 2014-07-23 19:04:07 +02:00
Vincent-Michael 8bc519a308 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
2014-07-23 06:32:44 +02:00
Shauren 0b236d480a Core/Authserver: Fixed changing realms 2014-07-22 20:15:11 +02:00
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