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/Entities/Player/Player.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/worldserver/worldserver.conf.dist
This commit is contained in:
Nay
2012-09-01 22:19:13 +01:00
parent d218afa198 a7dd289b04
commit 2e1de60593
20 changed files with 476 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Scripting/ScriptLoader.cpp
+2
View File
@@ -50,6 +50,7 @@ void AddSC_ban_commandscript();
void AddSC_bf_commandscript();
void AddSC_cast_commandscript();
void AddSC_character_commandscript();
void AddSC_cheat_commandscript();
void AddSC_debug_commandscript();
void AddSC_disable_commandscript();
void AddSC_event_commandscript();
@@ -658,6 +659,7 @@ void AddCommandScripts()
AddSC_bf_commandscript();
AddSC_cast_commandscript();
AddSC_character_commandscript();
AddSC_cheat_commandscript();
AddSC_debug_commandscript();
AddSC_disable_commandscript();
AddSC_event_commandscript();