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

Merge remote-tracking branch 'origin/master' into 4.3.4

Browse Source 
Conflicts:
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Spells/SpellMgr.cpp
This commit is contained in:
Nay
2012-10-07 14:57:18 +01:00
parent f570383fba 1a89de87c1
commit 44c2edee51
66 changed files with 3235 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Scripting/ScriptLoader.cpp
+2
View File
@@ -495,6 +495,7 @@ void AddSC_ruby_sanctum();
void AddSC_boss_baltharus_the_warborn();
void AddSC_boss_saviana_ragefire();
void AddSC_boss_general_zarithrian();
void AddSC_boss_halion();
void AddSC_dalaran();
void AddSC_borean_tundra();
@@ -1208,6 +1209,7 @@ void AddNorthrendScripts()
AddSC_boss_baltharus_the_warborn();
AddSC_boss_saviana_ragefire();
AddSC_boss_general_zarithrian();
AddSC_boss_halion();
AddSC_dalaran();
AddSC_borean_tundra();