From: Mario Date: Fri, 31 May 2013 19:43:21 +0000 (+1000) Subject: Merge branch 'master' into Mario/monsters X-Git-Tag: xonotic-v0.8.0~241^2^2~214 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=264bfe3c675e13957c0188c75276af431f8a433f;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into Mario/monsters --- 264bfe3c675e13957c0188c75276af431f8a433f diff --cc qcsrc/server/command/sv_cmd.qc index aa69aaa47,ba9b48a29..b7256deed --- a/qcsrc/server/command/sv_cmd.qc +++ b/qcsrc/server/command/sv_cmd.qc @@@ -1773,10 -1721,8 +1773,9 @@@ void GameCommand_(float request // ================================== // Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;) - // Common commands have double indentation to separate them a bit. #define SERVER_COMMANDS(request,arguments,command) \ SERVER_COMMAND("adminmsg", GameCommand_adminmsg(request, arguments), "Send an admin message to a client directly") \ + SERVER_COMMAND("butcher", GameCommand_butcher(request), "Instantly removes all monsters on the map") \ SERVER_COMMAND("allready", GameCommand_allready(request), "Restart the server and reset the players") \ SERVER_COMMAND("allspec", GameCommand_allspec(request, arguments), "Force all players to spectate") \ SERVER_COMMAND("anticheat", GameCommand_anticheat(request, arguments), "Create an anticheat report for a client") \