Merge branch 'master' into 4.3.4
Conflicts: src/server/game/Globals/ObjectMgr.cpp src/server/game/World/World.h src/server/scripts/Kalimdor/moonglade.cpp
This commit is contained in:
commit
80b1b6c494
32 files changed
+865
-239
No files matched your search
@@ -314,6 +314,7 @@ void AddSC_boss_ayamiss();
|
||||
void AddSC_boss_ossirian();
|
||||
void AddSC_instance_ruins_of_ahnqiraj();
|
||||
void AddSC_boss_cthun(); //Temple of ahn'qiraj
|
||||
void AddSC_boss_viscidus();
|
||||
void AddSC_boss_fankriss();
|
||||
void AddSC_boss_huhuran();
|
||||
void AddSC_bug_trio();
|
||||
@@ -941,6 +942,7 @@ void AddKalimdorScripts()
|
||||
AddSC_boss_ossirian();
|
||||
AddSC_instance_ruins_of_ahnqiraj();
|
||||
AddSC_boss_cthun(); //Temple of ahn'qiraj
|
||||
AddSC_boss_viscidus();
|
||||
AddSC_boss_fankriss();
|
||||
AddSC_boss_huhuran();
|
||||
AddSC_bug_trio();
|
||||
|
||||
Reference in new issue
Block a user