diff options
author | DDuarte <dnpd.dd@gmail.com> | 2015-07-12 14:55:04 +0100 |
---|---|---|
committer | DDuarte <dnpd.dd@gmail.com> | 2015-07-12 14:55:04 +0100 |
commit | 9aa91061312ed50c52f868bfe19a7321a4e29b90 (patch) | |
tree | 880dc81eb8ff9808e69341c7e1f1511e36e2e3b5 /src/server/shared/Logging/Log.cpp | |
parent | 197e8d92a5785eaa5fde9ab8c8f96c626b356046 (diff) |
Scripts/VioletHold: cherry-pick multiple commits from 3.3.5
---
Scripts/VioletHold: picked some things from pull request #11399 (thx MitchedD for initial work)
(cherry picked from commit 34a721ba84643cf468f63e5c375949aaa3e15cac)
by joschiwald
---
Core/Scripts: Rework Violet Hold bosses adding missing spells/mechanics:
- Cyanigosa, Arcane Vacuum
- Ichoron, globules mechanic
- Moragg, optic link visuals
- Lavanthor, minor changes
- Zuramat, correctly implement void sentries
- Erekem, implement Windfury and correct management of Erekem Guards
- Script for the pre-event
Thx @ManuFe
(cherry picked from commit 0bb7f89e82c65f6b750e5d96766c2092031803b5)
Conflicts:
src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
by mik1893
---
Rename 2015_06_08_01_world.sql to 2015_06_25_00_world.sql
(cherry picked from commit 8176902b17ce7050029f70a87bec3284c1090785)
by MitchesD
---
Scripts/VioletHold: fixed non-pch build and codestyle
(cherry picked from commit e34f74dacea82f85b3b945e23f3432deda4595b7)
by MitchesD
---
Scripts/VioletHold: Fix codestyle and unwanted crash in Violet/Hold
closes #14952 and #14953
(cherry picked from commit 49809bd404ae7b58ac81086d52297532ec85972a)
by mik1893
---
Scripts/VioletHold: fix a crash during Ichoron encounter
Closes #14962
(cherry picked from commit 7c01638d45b3eaed7af124a43f21cc6d15407667)
by mik1893
---
Core/Misc: Fix build warnings
(cherry picked from commit 55681666b3cc0e33eeb5cdb77e638e68c19f452c)
Conflicts:
src/server/authserver/Main.cpp
by jackpoz
Diffstat (limited to 'src/server/shared/Logging/Log.cpp')
0 files changed, 0 insertions, 0 deletions