Merge remote-tracking branch 'origin/master' into 4.3.4
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:
commit
2e1de60593
20 files changed
+476
-243
No files matched your search
@@ -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();
|
||||
|
||||
Reference in new issue
Block a user