Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,173 Commits 4 Branches 146 Tags
b90329d63acaecb1f074dd2b303561baa9f639a2
Commit Graph

533 Commits

Author SHA1 Message Date
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
leak
1a27ce1267 Core/NetworkIO: Restore networking related scripting hooks 
Closes #12607
 2014-08-11 17:40:43 +02:00
leak
14cb6e4235 Resolve shutdown crash/leak if MySQL server is not running 
Fixes #12734
 2014-08-10 22:43:48 +02:00
Shauren
4fe45b8c63 Core/Worldserver: Replaced old hack sending key events to unblock console thread 2014-08-10 11:50:19 +02: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
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
903fbb6be7 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2014-07-29 02:02:38 +02:00
Shauren
86f3ee9949 Core/Instances: Explicitly unload InstanceSaveMgr before MapManager, fixes invalid memory access at shutdown 
Closes #12635
 2014-07-28 23:32:53 +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
DDuarte
8a05231994 Conf/World: Disable player limit by default 2014-07-27 15:46:34 +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
Jared P. Jones
11ecd851a1 Core/Misc: Silenced 500 OS X Warnings and removed deprecated finite() method. 
*Mac OS X fires off over 200 warnings related to gsoap about the deprecated register method. CMake has been patched to remove this warning.
*Updated all occurences of finite() to std::isfinite. The method finite() is not standardized by anyone aside from BSD. std::isfinite() however is standarized by C++
*Removed -ncurses and -pthread from OS X compilation. Now that we use Boost and C++11 there is no longer a need for pthread in OS X. All it does is throw a warning. However, ncurses isn't needed either as it's built into the OS X SDK and linked by default.

Note: There are only 5 remaining warnings left when compiling on OS X. I did not attempt to fix these as they were related to 3rd party libraries statically linked into the code. The 5 warnings left are all related to unused variables.
 2014-07-23 17:30:45 -05: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
leak
5ee5d493c2 Increased default thread pool size as it now handles more than signals and remote access 2014-07-22 18:48:03 +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
Shauren
2452cfb98e Part 2: Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2014-07-19 15:26:06 +02:00
Shauren
3e56a4b8d7 Part 1: Merge branch 'master' into 4.3.4 2014-07-19 13:40:14 +02:00
Shauren
57cf08f86e Core/Logging: Changed format of packet log file from .bin to .pkt and restored packet logging - PacketLogFile extension must now be .pkt to allow WowPacketParser to use it 2014-07-19 13:30:51 +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
jackpoz
fe1289ed1a Core/Misc: Fix abort() on shutdown on *nix 
Wait for cliThead to exit before deleting it to about std::abort() triggered on *nix systems.
 2014-07-17 20:54:32 +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
leak
8c10ffa62d GCC compile fixes 2014-07-16 19:27:15 +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
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
a4f7211aed Fixed the worldserver not using the path to the config file as defined in cmake 2014-07-13 15:55:46 -05:00
Subv
e84ba172a7 Fixed a GCC internal error when compiling AsyncAcceptor 2014-07-10 13:36:54 -05:00
Subv
375363ed08 Fixed the first world connection being slow 2014-07-09 16:53:15 -05:00
leak
2f28f4ce75 Fixed FreezeDetectorHandler trigger time 2014-07-08 21:17:24 +02:00
leak
d1594998f8 Replaced the LogWorker thread with Boost ASIO 2014-07-08 20:55:25 +02:00
leak
a738cd96dc Renamed WorldTcpSession back to WorldSocket 2014-07-07 22:03:41 +02:00
leak
c7d5660e99 Readd support for TCP_NODELAY socket option 2014-07-07 21:37:55 +02:00
Subv
eeb2720401 Removed some dead code 2014-07-06 19:05:13 -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
Subv
42b2041aeb Fixed PCH build, some leaks and tidied the code up a bit 2014-07-05 19:41:18 -05:00
leak
da3f6e923a Completely remove ACE as dependency for TC - kkthxbye 2014-07-06 01:42:35 +02:00
leak
7befb26625 Some groundwork for replacing the ACE based WorldSocket handling 2014-07-06 01:26:29 +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
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
leak
25debd7577 Fix non-PCH compile 2014-07-03 19:05:42 +02:00
Subv
87b72f41ca Fixed login and some errors 2014-07-02 21:56:40 -05:00
Subv
b516926da8 Enabled RA and removed all ACE from it 2014-07-02 18:58:48 -05:00
Subv
bdc42f663e Cleaned up worldserver includes a bit 2014-07-02 12:06:25 -05:00
Subv
2874014443 Cleaned up the authserver includes a bit. 
Fixed authserver pch build
 2014-07-02 11:50:03 -05:00
leak
8df9e98ba5 Remove unused RARunnable files 2014-07-02 18:21:18 +02:00
leak
310f5e6846 Some ground work for ASIO based RemoteAccess handling 2014-07-02 17:38:44 +02:00
Subv
c8fe4b8d50 Corrected some things from the previous commit 2014-07-01 23:05:06 -05:00
Subv
9817f5e23e Removed ACE from TCSoap 
Untested.

Note: That was some rather awful use of a semaphore
 2014-07-01 22:01:10 -05:00