araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-19 14:39:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.3.4

Browse Source 
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/World/World.h
	src/server/scripts/Kalimdor/moonglade.cpp
This commit is contained in:
Spp
2012-12-19 08:23:34 +01:00
parent a227a34947 a2832805af
commit 80b1b6c494
32 changed files with 865 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Scripting/ScriptLoader.cpp
+2
View File
@@ -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();