merge qa staging into naxxramas

This commit is contained in:
Gemt
2017-07-16 18:49:32 +02:00
378 changed files with 11277 additions and 16289 deletions
+5
View File
@@ -49,6 +49,7 @@ void AddSC_spell_scripts();
//eastern kingdoms
void AddSC_instance_blackrock_spire();
void AddSC_blackrock_depths(); //blackrock_depths
void AddSC_blackrock_depths_arena_challenge();
void AddSC_boss_ambassador_flamelash();
void AddSC_boss_anubshiah();
void AddSC_boss_draganthaurissan();
@@ -271,6 +272,8 @@ void AddSC_thunder_bluff();
void AddSC_ungoro_crater();
void AddSC_winterspring();
void AddSC_npc_j_eevee(); // J'Eevee, the Imp in a Jar
void AddScripts()
{
//Nostalrius
@@ -316,6 +319,7 @@ void AddScripts()
//eastern kingdoms
AddSC_blackrock_depths(); //blackrock_depths
AddSC_blackrock_depths_arena_challenge();
AddSC_boss_ambassador_flamelash();
AddSC_boss_anubshiah();
AddSC_boss_draganthaurissan();
@@ -537,4 +541,5 @@ void AddScripts()
AddSC_ungoro_crater();
AddSC_winterspring();
AddSC_npc_j_eevee();
}