Commit Graph
782 Commits
Author SHA1 Message Date
Ovahlord 98fdf72c7b Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into ShatteredWorld
# Conflicts:
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
2018-01-02 01:23:06 +01:00
Aokromes 46366373ab Core/AI: Some more refactoring prep for #19930. CreatureAI::EnterCombat is now called CreatureAI::JustEngagedWith. There's also two new methods on UnitAI, though they're never invoked right now. 2018-01-01 16:02:22 +01:00
ariel- 7c999969c7 Core/Scripts: prevent Arthas in CoS losing his gossip flag and halting instance progress 2018-01-01 15:17:08 +01:00
Aokromes f2ab43568a Core/AI: Making guid const& in SetGUID method 2018-01-01 14:55:20 +01:00
Aokromes 4bd0525edd Update copyright note for 2018 2018-01-01 01:06:19 +01:00
Ovahlord 2eb70164ea Scripts/LCT: minimize differences between 434 branch 2017-12-27 18:10:43 +01:00
Aokromes e7152e828a DB/LCT: added loot to General Husam and Siamat
By Ovahlord
2017-12-27 15:41:28 +01:00
Aokromes 38aacc8967 Build Fix 2017-12-27 14:07:18 +01:00
Ovah 2d1aafe749 Scripts/LCT: implement Lockmaw and Augh encounter 2017-12-27 12:17:18 +00:00
Ovalord e45b1098b2 Scripts/LCT: make High Prophet Barim agressive on reset 2017-12-22 00:06:00 +01:00
Ovalord f0b815842b Scripts/LCT: make Siamat active when breaking his platform to make him visible from Lockmaw's area 2017-12-18 23:19:13 +01:00
Ovalord 4c26b161bf Scripts/LCT: added anti-cheat check to prevent Siamat being fightable if previous bosses have not been killed before. 2017-12-18 23:14:52 +01:00
Ovalord b40c40cf59 Scripts/LCT: implement Siamat encounter 2017-12-18 23:05:56 +01:00
Ovalord e43a015b83 Scripts/LCT: implement Lockmaw and Augh 2017-12-18 22:27:57 +01:00
Ovah dc5e6673ee Scripts/LCT: implement High Prophet Barim encounter 2017-12-12 14:47:39 +00:00
Krudor c8aeadc949 Remove reportUse parameter on GameObjectAI::GossipHello and give it its own event.
Ported from 3.3.5
2017-12-10 13:59:13 +01:00
Krudor 843c21048a Fix some warnings introduced in a previous commit 2017-12-10 12:56:35 +01:00
Erik Strandberg a3b16c040b Port https://github.com/TrinityCore/TrinityCore/commit/f913f3bb8977c127d200d5d4a608ab434b21bbcd 2017-12-10 00:37:21 +00:00
jackpoz 21cad46097 Core/Misc: Fix static analysis issues 2017-12-08 15:24:13 +01:00
Ovalord 10b18c3822 Scripts/LCT: fixed Tol'Vir land mine visuals after trigger model detection fix. 2017-11-27 13:26:27 +01:00
Ovah 3dd7f0bcd9 Scripts/HoO: fixed Rajh's issues 2017-11-27 07:29:04 +00:00
Aokromes a18293833e Misc: More cleanup 2017-11-25 03:02:18 +01:00
Aokromes b93430ee08 Misc: More cleanup 2017-11-25 02:25:18 +01:00
Aokromes 91affef0c6 Misc: Kill trailing white spaces 2017-11-25 01:36:21 +01:00
Aokromes 519b7ff133 another warning 2017-11-24 07:47:05 +01:00
Aokromes 57a3d20875 warning fixes 2017-11-24 02:31:16 +01:00
Ovah 406de9279c Scripts/LCT: implement General Husam encounter 2017-11-23 22:52:49 +00:00
Ovah 94268df94b Rajh 2017-11-23 22:28:22 +00:00
Aokromes 51d0befe6d Core/Misc: Fix static analysis issues 2017-11-12 13:30:18 +01:00
Aokromes 2cbb682d75 remove mistake 2017-11-12 13:20:24 +01:00
Aokromes fb0e0eb117 Scripts/Stratholme: spawn Timmy the Cruel if conditions are met 2017-11-12 13:19:19 +01:00
Wyreth 5b0729e2ed Scripts/Tanaris: move Aquementas to SAI & improve related event 2017-11-02 09:21:51 +01:00
dr-j 8f5943a218 Quest/Script: Conversion of Bristlelimb Cage/Stillpine Captive cpp to SAI 2017-11-02 09:15:14 +01:00
Aokromes b8c03556a2 Creature/Scripts: Add Aggro sound to Cairne Bloodhoo, Sylvanas Windrunner 2017-10-29 11:01:23 +01:00
Andrew Letson 296d22540c DB/Scripts: Rivern Frostwind 2017-10-22 11:00:33 +02:00
Aokromes 8a7a7915c6 DB/SAI: SAI scripts for Silithus creatures 2017-10-10 21:13:45 +02:00
Aokromes 7251f28d1d remove bad merged file 2017-10-10 21:03:26 +02:00
ZenoX92 919ceebde8 Creature/Script: Convert Spitelash Naga cpp to SAI 2017-10-10 21:02:37 +02:00
vincent-michael c9e25147cc Scripts/Misc: Fixed static analysis issues 2017-07-16 12:21:13 +02:00
Aokromes 4326455788 build fix 2017-06-19 21:16:50 +02:00
Aokromes 1a5c0f5c3b Core/Grids: Ported cmangos/mangos-wotlk@ea99457
(cherry picked from commit 9299e9b)
2017-06-19 20:20:26 +02:00
Aokromes b1f54ba152 Make travis happy 2017-06-17 11:33:02 +02:00
Girip Dragos Andrei 2d9aeacfd7 Wailing Caverns 2017-06-17 08:44:27 +00:00
Aokromes 461ba1cb56 Fix (C) for multiple files 2017-06-15 08:46:45 +02:00
Aokromes ac3dbcb880 Core/Utilities: Rename RandomResizeList->RandomResize as it is no longer restricted to a list 2017-06-07 09:53:04 +02:00
Ryan 1442984686 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2017-05-28 19:10:00 +01:00
Aokromes 6e49330f54 Fix missing changes 2017-05-23 15:20:21 +02:00
Aokromes f0e36b0863 Core/Defines: define faction templates and replace magic numbers from scripts 2017-05-23 14:37:54 +02:00
Ryan 20726edec2 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2017-05-19 23:49:46 +01:00
Aokromes 0fbcdca05e Core/Collision: Replaced phasemask with proper phases in GameObject c…
…ollision calculation
2017-05-06 01:55:17 +02:00