Commit Graph
32881 Commits
Author SHA1 Message Date
Ovalord 80f65d665b Core/Pets: updated many pet damage formulars and apply spellpower bonus for warlock pets 2018-03-16 12:28:34 +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 a59ea8fc6d DB/Gilneas: updated some smart scripts for better and correct behaivior 2018-03-15 22:05:17 +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
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
Aokromes a5b5762c15 Core/MMaps: fixed loading parent maps 2018-03-13 17:07:29 +00:00
Ovahlord 0526b169ff Core/MMaps: fixed loading parent maps 2018-03-13 18:04:22 +01:00
Aokromes a3780f77a1 Updated Phasing with latest master differences 2018-03-13 12:30:56 +00: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
Aokromes c10a266986 MMaps phasing 2018-03-12 18:19:20 +00: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
Aokromes 813be5c000 DB/Creature: Needs master branch hover 2018-03-12 13:05:41 +01:00
Aokromes 1a12767f16 rename files 2018-03-12 13:02:17 +01:00
Killyana 18176cc3db DB/SAI: Add an extra param "player only" for los_ooc event 2018-03-12 12:40:29 +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
Killyana ad4d1b20b6 DB/Gameobject: Fix phaseMask and spawntimesecs for cosmetic eggs used on Territorial Trespass Quest
Ref #20771
2018-03-12 12:21:58 +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
ariel- e4e85ffa22 DB/Creature: root training dummies
Closes #21513
2018-03-12 12:20:01 +01:00
Aokromes 57ed6c6cf8 Phasing 2018-03-12 11:01:05 +00: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
Aokromes 3857b76431 rename files 2018-03-10 23:51:36 +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
Killyana 8216b6a533 DB/Conditions: Remove wrong condition 2018-03-10 23:49:52 +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
Killyana bb4ccf59c3 DB/Misc: Death knights area rework part 10
Original work done by Grz3s on Cmangos
2018-03-10 23:49:22 +01:00
Aokromes e26c77d3a1 Tools/Vmaps: Fix linux crash
closes #152
2018-03-10 21:36:44 +01:00
Aokromes 6a83bfce8a Core/Maps: fixed loading maps 2018-03-10 20:11:45 +00:00
Ovahlord 4623c411be Core/Maps: fixed loading maps 2018-03-10 20:59:53 +01:00
Aokromes 066f0eada0 Core/Objects: use map to get area and zone id 2018-03-10 15:43:39 +00:00
Ovahlord 5ad547d8d9 Core/Objects: use map to get area and zone id 2018-03-10 16:37:17 +01:00
Aokromes 6aa93fd89a missing part 2018-03-10 16:27:32 +01:00
Aokromes fcbd10062b Core/Phasing: Rewrite GetTerrainMapId *updated phasing with latest changes 2018-03-10 15:13:00 +00:00
Ovahlord 27652214b5 Core/Phasing: Rewrite GetTerrainMapId *updated phasing with latest changes 2018-03-10 16:10:48 +01:00