Commit Graph
23301 Commits
Author SHA1 Message Date
Ovahlord 97cefb1cff Revert "Core/Creatures: merged a change regarding energy regeneration"
This reverts commit 374a405321.
2018-03-17 23:23:41 +01:00
Ovahlord b837812ff9 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2018-03-17 21:05:34 +01:00
Ovah 16c97d35a1 Phasing 2018-03-17 19:41:20 +00:00
Ovahlord 49ba502387 Core/Spells: since Cataclysm all DoTs and HoTs can crit 2018-03-17 19:17:31 +01:00
Ovahlord 5ef1a67a27 Core/Spells: fix Fel Armor healing effect 2018-03-17 18:55:06 +01:00
Ovahlord 7602eb73f3 Core/Spells: improve codestyle of recent spell fixes 2018-03-17 17:00:19 +01:00
Ovahlord d707a474df Revert nullptr crash fix as it causes another crash 2018-03-17 16:44:14 +01:00
Aokromes 712239e215 Core/Conditions: Add missing break 2018-03-17 14:17:45 +01:00
Ovahlord e294044787 Core/Spells: Drain Soul will now properly grant Soul Shards while channeling.
* moved Soul Shard handling to aurascript
2018-03-17 13:15:22 +01:00
Ovahlord a46736ba4c Core/Spells: fixed Drain Life healing
* implement Soul Siphon bonus heal effect for Drain Life
* implement Drain Life bonus healing from Death's Embrace
2018-03-17 12:49:50 +01:00
Aokromes cc3639cbb9 fix build 2018-03-17 10:37:50 +01:00
Aokromes 04f488e55e Core/Players: Include graveyards from terrain swap maps 2018-03-17 10:12:00 +01:00
Aokromes 8d38ec47fb Core/Misc: Graveyards can now use conditions, SourceType = 27, SourceEntry = graveyard_zone.ID 2018-03-17 09:56:43 +01:00
Ovahlord 53fb32414b Core/Spells: corrected damage bonus for warlock pets 2018-03-17 01:11:19 +01:00
Ovahlord a85bebf771 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2018-03-17 00:44:49 +01:00
Aokromes fefdfbb971 make travis happy 2018-03-16 20:06:14 +01:00
Ovalord 80f65d665b Core/Pets: updated many pet damage formulars and apply spellpower bonus for warlock pets 2018-03-16 12:28:34 +01:00
Aokromes 73a57ff4e9 another warning fix 2018-03-15 23:29:08 +01:00
Aokromes fb19272ab9 more warning fixes 2018-03-15 23:19:37 +01:00
Aokromes 2229dcf8ff more warning fixes 2018-03-15 23:06:45 +01:00
Aokromes fa182ef2c6 warning fix 2018-03-15 22:08:38 +01:00
Ovalord 0e998a6161 Scripts/Deadmines: fixed a warning 2018-03-15 22:06:15 +01:00
Ovalord ddb9c2a698 Core/Units: fixed a possible crash location caused by nullpointers 2018-03-15 22:06:03 +01:00
Ovalord d7d0048b7e Core/LFG: do not display currentcy reward info in chat window for random dungeon rewards 2018-03-15 20:31:34 +01:00
Aokromes a22175ca4f Core/Transports: Fix warnings 2018-03-15 20:26:46 +01:00
Ovalord 246a3c31de Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2018-03-15 17:22:03 +01:00
Ovalord e0d987fa37 Merge branch '4.3.4' of https://github.com/Ovahlord/TrinityCore into 4.3.4 2018-03-15 17:21:39 +01:00
Ovalord bcd6057ab9 Scripts/Deadmines: added WIP code for Vanessa VanCleef
* removed some grid searchers and use instancescript instead
2018-03-15 17:18:06 +01:00
Aokromes 91a78c6e42 Core/Handler: Port missing stuff 2018-03-14 12:57:14 +01:00
Ovahlord a6368c7e6b Fixed build 2018-03-14 09:11:11 +01:00
Ovahlord 617b3a8a11 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4
# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Maps/Map.cpp
#	src/server/game/Maps/Map.h
2018-03-14 08:22:00 +01:00
Ovahlord 8eda9ce7ae Revert "Core/Spells: fixed a tempfix for vehicles vanishing after area change" 2018-03-14 08:09:01 +01:00
Ovahlord 0526b169ff Core/MMaps: fixed loading parent maps 2018-03-13 18:04:22 +01:00
Ovah 3de2e68245 Updated Phasing with latest master differences 2018-03-13 12:30:56 +00:00
Aokromes 8779839d60 Tools/Extractor: Fix vmaps extractor crash on linux 2018-03-13 10:59:11 +01:00
Aokromes 9471392886 Core: fixed phasegroup error log formatting 2018-03-12 20:43:29 +00:00
Ovahlord 9f34b21347 Core: fixed phasegroup error log formatting 2018-03-12 21:36:59 +01:00
Aokromes af494832b1 Merge branch 'phasing' into '4.3.4'
Phasing

See merge request trinitycore/TrinityCore_434!119
2018-03-12 20:29:01 +00:00
Ovahlord 3dfc062d72 Core/MMaps: fixed some warnings and fixed a typo that caused mmaps generation errors. please re-extract 2018-03-12 21:23:32 +01:00
Ovah 60afe858e8 MMaps phasing 2018-03-12 18:19:19 +00:00
Ovahlord 457839982a Core/MMaps: Implemented loading phased tiles 2018-03-12 19:15:21 +01:00
Ovahlord 1c7cb1b6af Core/Vmaps: fixed parentMapID setting for vmaps. re-extraction required 2018-03-12 19:15:20 +01:00
jackpoz 19ce97eae4 Core/SmartScripts: Code cleanup 2018-03-12 12:40:23 +01:00
Killyana 81698da80d Core/SAI: Add event_parm5 "player only" for EVENT_OOC_LOS and EVENT_IC_LOS
Closes #21497
2018-03-12 12:40:14 +01:00
Keader 6da3663547 Core/Unit: Guardians no longer enter combat before reaching the target (#19816) 2018-03-12 12:21:46 +01:00
Treeston b09c808291 Scripts/Naxxramas: Fix an issue that could cause Sapphiron to stop using Drain 2018-03-12 12:21:37 +01:00
Ovahlord 6afdbfc8ce Revert "Core/Objects: use map to get area and zone id"
This reverts commit 5ad547d8d9.
2018-03-12 11:55:28 +01:00
Ovahlord 78793ac452 Core/Entities: use PhaseShift when processing terrain updates 2018-03-12 11:08:05 +01:00
sirikfoll 9209aadb43 Scripts/Spells: Quest King of the Mountain
Added missing jump jets and battle standard visuals
Added allowed area conditions for the vehicle
Fixed Jumpbot's attack spell (thanks @keader for fixing the proc)
2018-03-10 23:49:58 +01:00
Shauren b7e29526a2 Core/CrashHandler: Fixed generating crash logs from CRT debug assertions
(cherry picked from commit abdf6479ddbf42c8b53cb943c54203211ceb0691)
2018-03-10 23:49:43 +01:00