Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 09:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
34,670 Commits 4 Branches 146 Tags
d97f0df58ccfa7e80cfd9ba69cf583b0c1e73bd7
Commit Graph

34670 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ovahlord
d97f0df58c DB/MH: added many waypoints for creatures in the Flamewake 2019-04-27 22:32:08 +02:00
Ovahlord
cdc9cc2b49 DB/MH: scripted combat with Baron Geddon 2019-04-27 21:28:32 +02:00
Ovahlord
ded495d545 DB/MH: merged Mount Hyjal changes from 434 branch 2019-04-27 21:27:46 +02:00
Ovahlord
cd55e1742b fixed build² 2019-04-27 21:17:02 +02:00
jackpoz
66f2bd91bb Shared/Metric: Fix a rare memory leak 
Fix a memory leak in Metric happening only when enabling/disabling Metric from configs at runtime, leaking the metric added between last SendBatch() call and the ScheduleSend() call in the same function. The only way to reproduce this is to actually freeze the thread calling SendBatch(), disable metric, reload config, unfreeze the thread.
 2019-04-27 21:10:05 +02:00
jackpoz
a730e17a37 Core/Commands: Fix .cheat god command letting you die 
Fix .cheat god command still letting you die with Area Aura like Slime near Thaddius, broken since 777b287dff

# Conflicts:
#	src/server/game/Entities/Unit/Unit.cpp
 2019-04-27 21:09:46 +02:00
jackpoz
0020ea9f92 Core/Maps: Fix crash caused by setActive(false) called after DespawnOrUnsummon() 
Fix crash caused by WorldObject::setActive(false) called after WorldObject::DespawnOrUnsummon() happening because the WorldObject would be set as not active but then Map::RemoveFromActiveHelper() would not be called because of not being in world anymore.
Whenever setActive() gets desync'd with what Map actually contains a rare crash would happen since Map only reads a few values of the active WorldObject, making it hard to reproduce. If this happens again some ASSERT calls should be added (or a check in Map::RemoveFromMap() could be added about if the WorldObject is in Map::m_activeNonPlayers container).
 2019-04-27 21:08:52 +02:00
Ovahlord
1681889fdd Fixed build 2019-04-27 21:05:48 +02:00
Ovahlord
5258dc74d1 Core/Spells: do not allow root auras to bypass the root movement data for creatures when getting removed 2019-04-27 20:10:03 +02:00
Ovahlord
1c7a520095 Revert "Core/SmartAI: Remove duplicate OnReset() call" 
This reverts commit 73345b0d7f.
 2019-04-27 17:38:06 +02:00
Ovahlord
3d08987773 Core/Creatures: reduced a difference between 434 and 335 2019-04-27 17:36:41 +02:00
Ovahlord
528427bf5f DB/GB: added more waypoints and formation data to Grim Batol creatures 2019-04-27 15:22:15 +02:00
Killyana
22e34861bd Core: Restore reset in EscortAI::InitializeAI (#23197) 
Closes  #23008
 2019-04-26 18:59:11 +02:00
Ovahlord
d9c809d828 Core/SAI: more cherrypick followups 2019-04-26 18:58:58 +02:00
Treeston
1f15fe5096 oops, now it builds (and a bonus refactor that annoyed me) 
# Conflicts:
#	src/server/game/AI/SmartScripts/SmartAI.cpp
#	src/server/game/AI/SmartScripts/SmartAI.h
#	src/server/game/AI/SmartScripts/SmartScript.cpp
#	src/server/game/AI/SmartScripts/SmartScript.h
 2019-04-26 18:56:31 +02:00
Ovahlord
28b33663e7 Core/SAI: cherry pick followup 2019-04-26 18:52:38 +02:00
Treeston
99a2c24116 Scripts/SmartAI: Forward invoker to invoked action list actions. Also JustAppeared -> InitializeAI. 
# Conflicts:
#	src/server/game/AI/SmartScripts/SmartScript.h
 2019-04-26 18:51:19 +02:00
Treeston
7c025ee803 Core/AI: EscortAI init logic moved from JustAppeared to InitializeAI. There are no escort NPCs using compatibility mode anymore, so this is equivalent. 
As a result, inheriting scripts calling Start in on-create hooks (like JustSummoned) will now work properly again.

Tagging #20310.

# Conflicts:
#	src/server/game/AI/ScriptedAI/ScriptedEscortAI.h
 2019-04-26 18:49:47 +02:00
sirikfoll
73345b0d7f Core/SmartAI: Remove duplicate OnReset() call 
It is already called for every creature in SmartAI::InitializeAI(), removing the one from SmartAI::JustAppeared to keep as much as possible of the old behavior, because JustAppeared is called on the next tick after InitializeAI

Closes #20881
Closes #20771
 2019-04-26 18:46:55 +02:00
Ovahlord
e5d59d5f98 Core/Object: Range check (#23179) (ported commit: 32e1de39a2) 2019-04-26 18:41:31 +02:00
jackpoz
738aa92782 Core/Spells: Adjust range checks to GameObject targets 2019-04-26 18:01:19 +02:00
jackpoz
85bf4daf45 Core/Spells: Adjust range checks to GameObject targets 2019-04-26 18:01:12 +02:00
jackpoz
d99de4db33 Core/Spells: Add range checks to GameObject targets 
Close #23062
Patch by robinsch
 2019-04-26 18:01:05 +02:00
jackpoz
5ef08fa5e8 Core/GameObject: Code cleanup 
(cherry picked from commit 16a154c4e8)
 2019-04-26 17:53:43 +02:00
Killyana
b7f63b29a0 Core/GameObject: Remove summoned gobs properly from the map without effecting other cases 
Ref 0e8e3828f4
Ref #23115

(cherry picked from commit 9db64666dc)

# Conflicts:
#	src/server/game/Entities/GameObject/GameObject.cpp
 2019-04-26 17:53:36 +02:00
Killyana
00a2de63ad Core/GameObject: Delete summoned gobs and DestroyForNearbyPlayers gobs spawned with negative spawn time once the gob is deactivated 
(cherry picked from commit 0e8e3828f4)
 2019-04-26 17:51:20 +02:00
Ovahlord
ee69943717 Core/Movement: ported time synchronization (commits: 975f1e364a and 50d32fe493) 2019-04-26 16:48:09 +02:00
Ovahlord
433bd5a1bb Scripts/BWD: use sniffed exit coordinate for passenger ejection and initial work on Nefarian's heroic intro 2019-04-22 19:36:16 +02:00
Ovahlord
6af3c166a0 Scripts/ZG: added some passive react states to Shadow of Hakkar, Spirit of Hakkar, Jin'do the Godbreaker and Gurubashi Shadow 2019-04-20 23:21:49 +02:00
Ovahlord
4626c426b9 Core/Spells: fixed remaining Soulburn mechanics 2019-04-18 22:37:07 +02:00
Ovahlord
5222d15910 Revert "DB/MH: synch a gameobject guid with 434 branch" 
This reverts commit 7f8d7b5a63.
 2019-04-18 20:49:33 +02:00
Ovahlord
cfe347824f Scripts/MH: corrected the summon destination coordinates for Emerald Flameweaver 2019-04-18 15:15:29 +02:00
Ovahlord
7f8d7b5a63 DB/MH: synch a gameobject guid with 434 branch 2019-04-18 14:52:29 +02:00
Ovahlord
c73b56ec5d Core/Spells: 
* updated Infusion of Light proc entry to Cataclysm
* fixed Seals of Command proc
 2019-04-16 20:25:17 +02:00
Ovahlord
eaad601e12 DB: fixed another typo 2019-04-16 19:42:16 +02:00
Ovahlord
f7e2b491bc DB: fixed a startup error caused by last commit 2019-04-16 19:39:57 +02:00
Ovahlord
f2049d5f0d Core/Spells: updated Beacon of Light to Cataclysm 2019-04-16 19:32:16 +02:00
Ovahlord
3fb3ed2954 Scripts/BWD: fixed Magmaw's health sharing aura stacking and cleaned up some obsolete code 2019-04-16 15:14:18 +02:00
Ovahlord
319b019080 Core/Spells: Holy Power decay timer will now be reset when getting a charge of holy power 2019-04-16 15:05:00 +02:00
Ovahlord
463c2d9045 Core/Spells: fixed two more startup errors 2019-04-14 12:55:23 +02:00
jackpoz
237901719a Core/MMaps: Fix crash added in 386b5a6fd9 
# Conflicts:
#	src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp

* fixed cherrypick conflicts
 2019-04-14 12:27:49 +02:00
Shauren
2fb644344d Core/Dep: Boost 1.70 compatibility 
(cherry picked from commit bcda8dd742)

# Conflicts:
#	src/server/authserver/Main.cpp
#	src/server/shared/Realm/RealmList.cpp
#	src/server/shared/Realm/RealmList.h
 2019-04-14 12:18:33 +02:00
Ovahlord
aa62a9c75f Core/Movement: solve cherrypick conflicts 2019-04-14 12:15:11 +02:00
jackpoz
5cb3e69e1e Core/MMaps: Simplify d182e5f7e7 and handle PATHFIND_INCOMPLETE in ChaseMovementGenerator as "cannot reach the target" 
# Conflicts:
#	src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp
 2019-04-14 12:13:59 +02:00
jackpoz
6552a00208 Core/MMaps: Fallback to shortcut for flying units if Detour returned an incomplete path. 
Fallback to shortcut for flying units if Detour returned an incomplete path. This is needed when a flying unit should fly to the floor below to reach the target, but since Recastnavigation doesn't support "jumping down" the unit would not find a path to the target.
 2019-04-14 12:12:15 +02:00
jackpoz
6fbf6d73db Dep/Recast: Update recastnavigation to 54bb0943e5 
(cherry picked from commit e061663508)

# Conflicts:
#	dep/recastnavigation/Detour/Source/DetourCommon.cpp
 2019-04-14 12:11:34 +02:00
Ovahlord
fa07b45655 Scripts/BWD: more work on Magmaw encounter 2019-04-13 22:14:14 +02:00
Ovahlord
9d1a0b85f4 Core/Spells: use a more reliable check for personal gnoll summons 2019-04-13 13:20:17 +02:00
Ovahlord
ed1b1ada94 DB/Uldum: added waypoints for Mar'at and Akhenet Fields 2019-04-12 22:55:29 +02:00
Ovahlord
99ef1b9b36 DB/Loot: added tempoary loot data to empty loot template entries for spells and gameobjects to fix startup errors 2019-04-12 09:24:14 +02:00