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
leak
e502e01f5d
Fixed a rare crash case when authserver socket was forcefully closed during read
...
Closes #12634
2014-07-27 18:36:03 +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
Shauren
e1c400250c
Added comments to 6961f957c9 to make sure noone decides that storing the result in a variable is unneccessary
2014-07-26 16:14:18 +02:00
Shauren
6961f957c9
Core/DBLayer: Fixed possible crashes with async queries retrieving result
...
Closes #12655
2014-07-26 16:10:05 +02:00
Subv
a03c879565
Core/PreparedStatements: Fixed a change I missed in the World prepared statements for waypoints.
2014-07-25 20:18:43 -05:00
Subv
b5d025938e
Core/Waypoints: Allow the table waypoint_data to use Takeoff and Land waypoints.
2014-07-25 19:05:25 -05: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
0b75e38755
Core/Shared: Change rand32 to return uin32 instead of int32
...
Fixes a crash that happened when rand32 returned negative values.
Also updated some related comments that were outdated since we changed to SFMT.
Closes #12638
2014-07-25 15:00:40 +01:00
DDuarte
6e1c5021fe
Merge branch 'master' into 4.3.4
2014-07-24 17:11:12 +01:00
Shauren
b5f0b85b48
Core/Misc: Fixed a possible crash in ProducerConsumerQueue::Cancel
2014-07-24 18:05:54 +02: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
DDuarte
737c3aa9f6
Core/Common: Remove the no longer finite(x) macro for MSVC
...
Use std::isinfinite(f) instead.
2014-07-24 01:01:03 +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
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