Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 16:38:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,544 Commits 4 Branches 146 Tags
de4aea093bdb7bba5a3c2aad98a52dfa7d5071e2
Commit Graph

1106 Commits

Author SHA1 Message Date
Shauren
de4aea093b Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Server/WorldSocket.h
 2014-09-12 20:27:46 +02:00
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
8f5ae1fb90 Core/Misc: Added const modifier to MessageBuffer::Write parameter 2014-09-12 20:20:35 +02:00
Vincent-Michael
53ee1eff0b Core: Fix warning 2014-09-12 19:51:29 +02:00
Shauren
6dff6b7425 Core/NetworkIO: Set non blocking mode on sockets properly 2014-09-12 19:34:26 +02:00
w1sht0l1v3
c4ce889344 Core/Misc: Kill few more warnings. 2014-09-12 00:16:04 +03:00
w1sht0l1v3
0392bf9bdf Core/Misc: Get rid of some warnings. 2014-09-11 23:08:02 +03:00
jackpoz
8bb4f33852 Core/DB: Fix crash on shutdown 
Fix race condition crash on shutdown, closing MySQL connections with queries still being executed
 2014-09-10 22:39:03 +02:00
joschiwald
9008442a3e Core/Creature: added HealthModifierExtra value to creature_template 
Requested by @Malcrom
 2014-09-10 03:35:00 +02:00
Duarte Duarte
2697b18cf2 Core/Net: Fix GCC build 2014-09-09 22:32:27 +01:00
Shauren
0c40ca8574 Build fix 2014-09-09 21:32:21 +02:00
Shauren
e0ce4528c5 Core/NetworkIO: Use reactor style sending on linux to reduce locking overhead 2014-09-09 19:19:25 +02:00
Vincent-Michael
5cdea8b30c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-08 22:15:42 +02:00
Odyssey
54e201b8b9 Scripts/Commands: Allow to set a custom duration to the Freeze command applied Aura 
- Allow to set a default duration for the Freeze Aura in worldserver.conf
- Handle the .freeze and .unfreeze command custom effects through the Freeze AuraScript
- Make players able to eventually unfreeze by themselves since the aura will expire without someone having to use .unfreeze
- Make .freeze command usable with the following syntax:

      * .freeze (with a targeted player)
      * .freeze duration_in_seconds (with a targeted player)
      * .freeze playername duration (if duration is an invalid value it will be defaulted to the config one)
      * .freeze playername (in this case, duration will be defaulted to the config value)

- Make .listfreeze command able to show the remaining freeze duration on all affected players

Closes #12972
 2014-09-08 15:56:32 +01:00
Leonid Logvinov
1e34aa9dcf Removed redundant cast to c_str() in ConfigMgr::Reload function. 
cppcheck performance warning:
[src/server/shared/Configuration/Config.cpp:62]: (performance) Passing the
result of c_str() to a function that takes std::string as argument no. 1 is
slow and redundant.
 2014-09-07 21:35:37 +02:00
DDuarte
1f6066c6e3 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
 2014-09-06 22:03:20 +01:00
Shauren
9ab74b3910 Core/DBLayer: Fixed GetUInt32,GetInt64 and GetUInt64 on windows when value stored in db was greater than 2147483647 2014-09-06 22:58:29 +02:00
Vincent-Michael
3a248fbfec Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/BattlegroundScore.h
 2014-08-28 21:00:53 +02:00
ShinDarth
b65172910c Core/BattleGrounds: store data about BGs victories 
Enable in worldserver.conf

Closes #12944

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-08-28 15:32:38 +01:00
Shauren
9ef63d7e8d Corrected initialization value in previous commit 2014-08-24 12:08:31 +02:00
Shauren
c3e10f32da Core/NetworkIO: Fixed uninitialized fields in ByteBuffer for received packets 2014-08-24 11:22:18 +02:00
Vincent-Michael
547115476f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/ArenaTeam.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/Spell.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Spells/spell_warrior.cpp
 2014-08-24 02:11:33 +02:00
jackpoz
7fe7f30521 Core/Misc: Fix some -Wconversion warnings 2014-08-23 19:56:41 +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
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
Vincent-Michael
acfbb61204 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-08-17 18:31:41 +02:00
Shauren
7cb72c2aac Core/DBLayer: Fixed an incredibly rare memory leak happening when player started loading from database and never finished 2014-08-16 01:43:42 +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
aab4ab166d Core/Socket: Added helpers to retrieve the size of currently ready data 2014-08-15 18:43:17 +02:00
joschiwald
ccfa82e7d5 Core/Creature: update creature_template and some other small things 
http://www.trinitycore.org/f/topic/9572-creature-damage/
 2014-08-14 16:09:14 +02:00
Shauren
bd4edf6e22 Core/Threading: Fixed possible race condition with m_timeOutTime and fixed Thread #1: pthread_cond_{signal,broadcast}: dubious: associated lock is not held by any thread in PCQ 2014-08-12 18:18:52 +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
leak
1a27ce1267 Core/NetworkIO: Restore networking related scripting hooks 
Closes #12607
 2014-08-11 17:40:43 +02:00
leak
528baae5f7 Kill potentially uninitialized variable warning 2014-08-11 14:03:16 +02:00
leak
14cb6e4235 Resolve shutdown crash/leak if MySQL server is not running 
Fixes #12734
 2014-08-10 22:43:48 +02:00
Vincent-Michael
9aea8046ce Core: Fix non pch build 2014-08-10 21:46:04 +02:00
Shauren
f5bf13295c Core/NetworkIO: Prevent double closing the same socket 2014-08-10 21:32:57 +02:00
Shauren
99e36e923f Core/Misc: Removed ACE leftovers 2014-08-10 12:09:26 +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
Vincent-Michael
0daebd9705 Core: Fix build for Intel Composer XE 2014-08-10 01:08:07 +02:00
DDuarte
df3b08d140 Core/Server: Use nullptr instead of 0 where pointers are expected 2014-08-09 21:32:26 +01:00
DDuarte
a394205eca Core/Server: Add missing overrides 2014-08-09 20:17:40 +01:00
Shauren
936db9d50d Core/NetworkIO: Handle exceptions thrown from socket constructor when retrieving remote address 2014-08-08 14:01:09 +02:00
Vincent-Michael
7c6e1b1505 Revert "Core: Fix build for vs2014" 
This reverts commit e303451189.
 2014-08-07 21:21:19 +02:00
Vincent-Michael
e303451189 Core: Fix build for vs2014 2014-08-07 20:41:33 +02:00
Duarte Duarte
ca368a781b Core/Socket: Fix typo in constructor 
Using moved objects is generally a bad idea

Thanks @Daejiv

Closes #12800
 2014-08-07 14:25:43 +01:00
Vincent-Michael
fad2bd4f92 Core: Kill AGAIN whitespace :( 2014-08-07 07:19:06 +02:00
Vincent-Michael
8c73b2dbae Core: Fix non pch build 2014-08-07 07:00:17 +02:00