 Michael
|
eac01c3f2a
|
Core/NetworkIO: Added latency info for opcodes overflow log
|
2014-06-09 23:10:49 +02:00 |
|
|
Michael
|
8207aff0d6
|
Core/NetworkIO: Added latency info for opcodes overflow log
|
2014-06-06 19:41:57 +02:00 |
|
|
Michael
|
83c2e79d52
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/scripts/Spells/spell_paladin.cpp
|
2014-06-05 19:42:48 +02:00 |
|
|
Michael
|
37e3f65f7f
|
Core: Fix fail in 672b8c6e13
|
2014-05-25 22:26:46 +02:00 |
|
|
Michael
|
672b8c6e13
|
Core: Fix merge fail
|
2014-05-25 22:25:26 +02:00 |
|
|
Michael
|
9df4db15a7
|
Core: Fix warning
|
2014-05-25 22:21:01 +02:00 |
|
|
Michael
|
15efe08a60
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Item/Item.cpp
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Reputation/ReputationMgr.cpp
src/server/game/Server/Protocol/Opcodes.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Spells/SpellEffects.cpp
src/server/game/Weather/Weather.cpp
src/server/game/Weather/WeatherMgr.cpp
src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
src/server/scripts/Spells/spell_hunter.cpp
|
2014-05-25 21:52:27 +02:00 |
|