Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-30 13:47:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,939 Commits 4 Branches 146 Tags
d2d4bc2668ddd29213da7c40c6368433a768ff49
Commit Graph

7136 Commits

Author SHA1 Message Date
Vincent-Michael
d2d4bc2668 Core: Header cleanup in game/*/*.cpp 
(cherry picked from commit 2e586bc520)

Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/Combat/ThreatManager.cpp
	src/server/game/DataStores/DB2Stores.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/ObjectGuid.cpp
	src/server/game/Entities/Object/Updates/UpdateData.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/Globals/ObjectAccessor.cpp
	src/server/game/Handlers/BankHandler.cpp
	src/server/game/Handlers/CombatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/PetitionsHandler.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Handlers/TokenHandler.cpp
	src/server/game/Handlers/VoiceChatHandler.cpp
	src/server/game/Maps/Map.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Server/Packet.cpp
	src/server/game/Server/Packets/SpellPackets.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellScript.cpp
	src/server/game/Warden/Warden.cpp
	src/server/game/Warden/WardenWin.cpp
	src/server/game/Weather/WeatherMgr.cpp
 2015-07-25 21:53:30 +01:00
Shauren
130878c1a5 Core/Collision: Removed direct GameObject references from collision project 
(cherry picked from commit a029f97c82)

Conflicts:
	src/server/collision/Models/GameObjectModel.cpp
 2015-07-25 16:22:33 +01:00
MitchesD
c40d3be6dc Core/SmartScripts: added new action SMART_ACTION_COMBAT_STOP 
* this avoid using hacks like evade, faction change or rooting. I wonder how SAI could be without this

(cherry picked from commit d68df33c76)
 2015-07-25 16:54:25 +02:00
DDuarte
d12fec67f2 Core/Misc: Add a few consts to methods 
(cherry picked from commit 7d9843c380)

Conflicts:
	src/server/bnetserver/Packets/ConnectionPackets.h
	src/server/game/AI/SmartScripts/SmartAI.h
	src/server/game/Battlefield/Battlefield.h
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Guilds/Guild.h
	src/server/game/Instances/InstanceSaveMgr.h
	src/server/game/Support/SupportMgr.h
 2015-07-24 12:02:57 +01:00
Shauren
b4adf3f5dd Core/Misc: Fixing warnings detected by Visual Studio 2015 compiler 
(cherry picked from commit a22e4e121a)

Conflicts:
	cmake/compiler/msvc/settings.cmake
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/GameObject/GameObject.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Garrison/Garrison.cpp
	src/server/game/Garrison/GarrisonMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Guilds/GuildMgr.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Server/Packets/ChannelPackets.h
	src/server/game/Server/Packets/PartyPackets.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/game/Spells/SpellScript.cpp
	src/server/scripts/Commands/cs_list.cpp
 2015-07-24 11:51:48 +01:00
mik1893
b1ac631f68 Merge pull request #15116 from pete318/runeforging 
[3.3.5] Core/Spell: Learn DK runeforging skill, when receving the spell book ability.
 2015-07-23 13:37:27 +02:00
Aokromes
d20ed095b1 Core/AuctionHouse: Fix misleading log 2015-07-22 13:40:55 +02:00
Naios
510194d6ba Core/Database: Enable perfect forwarding for chat format calls. 
(cherry picked from commit 4904318c43)
 2015-07-22 02:18:39 +02:00
Naios
e011ae63d5 Core/Logging: Enable perfect forwarding for logging format and args. 
* Handle timestamp parsing though cppformat.
* Change a wrong forward -> move

(cherry picked from commit 026ceb85b9)
 2015-07-22 02:18:36 +02:00
Naios
09d34e0a9b Core/Utilities: Move EventMap into its own source file. 
* Move implementation details to .cpp.

(cherry picked from commit 11bfead40b)

Conflicts:
	src/server/game/Battlegrounds/Battleground.h
	src/server/shared/Utilities/Util.cpp
 2015-07-22 02:02:51 +02:00
Naios
45058990e2 Core/Utilities: Remove global using of std::chrono namespace. 
* never use "using namespace" in header files!

(cherry picked from commit 6bf10c2b83)
 2015-07-22 01:59:57 +02:00
jackpoz
aa042e94c2 Core/Collision: Fix race conditions in mmaps 
Fix a race condition in MMapManager happening whenever a map was unloaded. GridUnload enabled was required to trigger the race condition.
 2015-07-20 20:52:36 +02:00
DDuarte
24ae640de3 Core/SAI: Fix some weird code in SmartAIMgr::IsTextValid 
Additions to cb0e6cac63

(cherry picked from commit 57da378dea)

Conflicts:
	src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
 2015-07-20 01:16:06 +01:00
jackpoz
ca7f31c6cd Core/Collision: Fix race conditions in vmaps 
Fix a race condition in VMapManager2 happening whenever a map was unloaded. GridUnload enabled was required to trigger the race condition.
 2015-07-19 21:10:27 +02:00
joschiwald
45d5ad270c Core/Spells: Renewed Hope also affects Flash Heal 
Closes #15037
 2015-07-19 18:19:08 +02:00
Vincent-Michael
9245bad755 Core/Misc: Update game object template locale in simple system 
(cherry picked from commit f4536f3812)

Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/QueryHandler.cpp
 2015-07-19 01:25:16 +01:00
pete318
9a4ccbaebd Learn death knight runeforging skill, when receving the spell book ability. (#13882) 2015-07-19 00:21:55 +00:00
Naios
5ceb3fd0ab Core/Globals: Rename AddCreData -> AddCreatureData and MoveCreData -> MoveCreatureData 2015-07-18 18:21:56 +02:00
mik1893
9889e6f730 Merge pull request #15036 from tkrokli/dk_wandering_plague 
Core/Spells: remove incorrect PvP combat state
 2015-07-15 18:54:23 +02:00
mik1893
90fcfb3f2d Merge pull request #14974 from pete318/stealth_work 
Stealth changes (Player stealthed vs NPCs) - 3.3.5
 2015-07-15 18:43:19 +02:00
mik1893
35f0d8e9c1 Merge pull request #14883 from tkrokli/omen_of_clarity 
[3.3.5] Core/Spells: Avoid losing spell mod auras when check on spellcast fails
 2015-07-15 18:21:43 +02:00
Rushor
ab0c0b7cb8 Merge pull request #15092 from robinsch/shamanT10enhancement 
Core/Spells:  Enhancement Shaman T10 4P bonus set 
closes #15090
 2015-07-15 14:21:43 +02:00
robinsch
230df99434 Core/Spells: Enhancement Shaman T10 4P bonus set #15090 2015-07-15 12:04:22 +02:00
mik1893
ef4918d939 Merge pull request #14987 from robinsch/fixupSpellModDOT 
Core/Spells: Revert changes to Unit.cpp done in 198ffba
 2015-07-14 16:46:55 +02:00
P-Kito
a80501a30e Core/Spells: remove incorrect PvP combat state 
by @P-Kito; retrieved from #15027

Neither Vampiric Embrace nor Wandering Plague
should keep PvP players in combat state.

Players can't drink for extended periods of time in arena
debuffed with Death Knight's Wandering Plague + diseases
or when the counterpart is buffed with Vampiric Embrace.
Every tick keeps them in combat. This PR should fix the issue.
 2015-07-14 10:56:51 +02:00
DDuarte
57091cc5f1 CRLF to LF 
Seriously....
 2015-07-10 20:16:55 +01:00
Carbenium
a6f7bb029c Merge pull request #15023 from robinsch/combatMovement 
SmartAI: Incorrect removal of movement at SetCombatMove
 2015-07-10 00:38:01 +02:00
jackpoz
fae8269589 Core/Instances: Fix some Instance Lock chat messages 
Always send a Welcome type Instance Lock chat message when entering an instance instead of changing type based on remaining time.
Fix scheduled warning message to always send "Your instance lock for ... will expire in 0 minutes." even if there are hours left, issue added in 4193806dba , closes #11519 .
Update warning messages based on remaining time so that the most meaning is always used (6 hours left, 59 minutes left, etc).
 2015-07-08 23:32:04 +02:00
robinsch
2b3ea2e181 SmartAI: Fixed a bug where creatures would clear movement flags when they shouldn't at SetCombatMove. 2015-07-07 10:32:49 +02:00
jackpoz
e5258f92c8 Core/Spells: Normalize Z for last point in a charge path 
Normalize the new point that 124398feef adds to a charge path.
 2015-07-05 11:49:05 +02:00
jackpoz
6681b3600c Core/Misc: Fix build warnings 
Fix build warning reported by clang 3.6
 2015-07-04 19:28:11 +02:00
Kaev
f3246f65d1 Update BattlegroundWS.cpp 
Changed timer check from 900000 to 15*MINUTE*IN_MILLISECONDS for better readability.
 2015-07-04 09:53:49 +02:00
DDuarte
dfc71765f8 Core/ObjectMgr: Fix 3 -Wunused-private-field warnings in TempSummonGroupKey 
Replace a memcmp by a lexicographical comparison with std::tie

(cherry picked from commit 1df20a2134dbb84d1eb30024171ccd7e8b103e47)
 2015-07-04 01:50:35 +01:00
jackpoz
a328a11978 Core/Spells: Fix Charge "no path" error with huge targets 
Fix Charge returning "no path found" error when targeting targets with Object Size of 8 like Festergut by changing how the target Z coordinate is set, using only half object size.
It is unclear why the CalculatePath() call in Charge handler is using target object size, maybe for corner cases where the target is slightly below the ground.
 2015-07-03 23:16:34 +02:00
pete318
1e0213bc57 The following stealth changes are implemented. 
- Combat no longer removes stealth, only damage does
 - Creatures will pursue a stealthed unit they cannot see if they're already in combat with them
 - When a player is ~~3 yards~~ 8% + 1.5 yards away from the usual stealth detection distance, the creature will perform the "alerted" effect.
 - When sitting/sleeping creatures are distracted or alerted, they will stand up
 - Idle movement creatures will return to their original (spawn) orientation after distract/alert
 - When entering combat with a distracted/alerted creature, distract state is removed
 - NPC no longer have a limit to stealth visibility (granted by stealth modifier spells/buffs)
 - If alert visibility is greater than aggro range, no alert sent
 2015-07-02 23:11:20 +00:00
mik1893
94bb71e5a1 Merge pull request #14797 from czw/3.3.5 
Core/Spells: Fix DK Death rune selection
 2015-07-02 14:23:33 +02:00
ShinDarth
5178395a4f DB/World schema backport: split quest_template and quest_template_addon 
Closes #14982

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2015-07-02 00:27:38 +01:00
jackpoz
55681666b3 Core/Misc: Fix build warnings 2015-07-01 20:57:20 +02:00
robinsch
2263cb9e10 Core/Unit: Fix issue with Divine Shield immunities 
Closes #14910
 2015-07-01 17:37:36 +02:00
robinsch
067b4c3243 Core/Spells: Revert changes to Unit.cpp done in 198ffba5ee. This will fix issues with direct damage spells dealing wrong damage that are based on percentage of existing HOT or DOT auras due to missing SPELLMOD_DOT apply. 2015-07-01 16:04:37 +02:00
robinsch
07df574b43 [3.3.5] Core/Spells: Omen of Clarity 
by @robinsch; closes #3088.

Purpose: make the Omen of Clarity druid buff (http://wotlk.openwow.com/spell=16864) work as intended.

This change is an addition to @Shauren's commit 37145b6.
Before this change, spell mod auras lose charges when they are unable to be cast
as mentioned in the issue. As an example: Omen of Clarity loses its charge
when Shred can not be used, because it requires the caster to behind the target.

This change will restore the spell mod if CheckCast returns false for the initial cast.
 2015-07-01 08:24:07 +02:00
mik1893
551c61b7ce Merge pull request #14898 from tkrokli/improved_devouring_plague 
[3.3.5] Core/Spells: Improved Devouring Plague spell direct damage
 2015-06-30 13:46:18 +02:00
Shauren
efad3a3123 Core/Spells: Implemented CAST_FLAG_IMMUNITY 2015-06-30 11:44:11 +02:00
Carbenium
adb5d3ea5f Merge pull request #14941 from ShinDarth/db_backports3 
DB/World schema backport: move questItem* fields to *_questitem tables
 2015-06-29 20:03:11 +02:00
mik1893
aacd8feb61 Merge pull request #14969 from chaodhib/taunt_threat_fixes 
[Spell] Fix bugged amount of threat given by Taunt
 2015-06-29 19:53:28 +02:00
ShinDarth
1c0b0f825c DB/World schema backport: move questItem* fields to *_questitem tables 2015-06-29 19:21:00 +02:00
chaodhib
00788c6f01 [SpellEffect] Fix bugged amount of threat given by Taunt 
1) doAddThreat call instead of AddThreat. ThreatCalcHelper shouldnt be called. Otherwise, the value of the threat that will be added to the caster will be multiplied by a threatModifier (about 1.6)
2) Taunt should give the caster the same threat as the one in the top of the list. If player A has aggro with 1000 threat, player B has 1050 threat and if player C taunts, player C should have 1050 threat after the taunt and not 1000 (the difference can be much bigger with ranged players).
 2015-06-29 17:39:55 +02:00
robinsch
7fbd035620 Core/WorldState: Send BATTLEFIELD_WG_WORLD_STATE_ACTIVE when sending initial world states for Wintergrasp. This will fix issue #14913 2015-06-29 10:49:43 +02:00
jackpoz
dfa556aaa2 Core/Dependencies: Update recast 
Update recast to 1dd5cf1883
Fix 2 warnings.

These changes have no effect on MMAPs and it's not needed to re-extact them.
 2015-06-28 21:20:01 +02:00
Mik1893
accab5451d Core/Creature: Fix UNIT_FLAG_IMMUNE_TO_PC validity for player pets 
related to #14780 and #14744
 2015-06-26 16:52:40 +02:00