From: Samual Lenks Date: Fri, 31 May 2013 15:23:18 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/master' into samual/updatecommands X-Git-Tag: xonotic-v0.7.0~31^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=756a2e093820dc91621b95d955ca48a3462af3cb;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/master' into samual/updatecommands --- 756a2e093820dc91621b95d955ca48a3462af3cb diff --cc qcsrc/client/command/cl_cmd.qc index 687c6ae59,acac8b312..7926544d4 --- a/qcsrc/client/command/cl_cmd.qc +++ b/qcsrc/client/command/cl_cmd.qc @@@ -307,8 -349,10 +349,9 @@@ void LocalCommand_(float request // ================================== // Normally do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;) -// but for 0.5 compat, we need vyes and vno here as they were replaced... REMOVE THEM AFTER 0.6 RELEASE!!!! #define CLIENT_COMMANDS(request,arguments) \ CLIENT_COMMAND("blurtest", LocalCommand_blurtest(request), "Feature for testing blur postprocessing") \ + CLIENT_COMMAND("create_scrshot_ent", LocalCommand_create_scrshot_ent(request), "Create an entity at this location for automatic screenshots") \ CLIENT_COMMAND("debugmodel", LocalCommand_debugmodel(request, arguments), "Spawn a debug model manually") \ CLIENT_COMMAND("handlevote", LocalCommand_handlevote(request, arguments), "System to handle selecting a vote or option") \ CLIENT_COMMAND("hud", LocalCommand_hud(request, arguments), "Commands regarding/controlling the HUD system") \