Merge remote-tracking branch 'origin/master' into pending-release

[xonotic/xonotic-data.pk3dir.git] / commands.cfg

diff --git a/commands.cfg b/commands.cfg
index 3a1ab30b706b3a3a6f57ee6815732969f0fe415a..5d4a7271ee0e9ff3902e1dbac5cb292fb4352c62 100644 (file)
--- a/commands.cfg
+++ b/commands.cfg
@@ -276,11 +276,29 @@ alias banlist              "qc_cmd_sv     banlist              ${* ?}" // List a
 alias kickban              "qc_cmd_sv     kickban              ${* ?}" // Disconnect a client and ban it at the same time
 alias mute                 "qc_cmd_sv     mute                 ${* ?}" // Disallow a client from talking by muting them
 alias unban                "qc_cmd_sv     unban                ${* ?}" // Remove an existing ban
-alias unmute               "qc_cmd_sv     unmute               ${* ?}" // Unmute a client
+alias unmute               "qc_cmd_sv     unmute               ${* ?}" // Unmute a client (Remove an existing muting ban)
 
 // other aliases for ban commands
 alias bans "banlist"
 
+
+// Client
+alias ignore                  "qc_cmd_cmd    ignore               ${* ?}" // Keep client out of your personal chat log for a match
+alias unignore                "qc_cmd_cmd    unignore             ${* ?}" // Remove an existing ignored client
+alias clear_ignores           "qc_cmd_cmd    clear_ignores"               // Remove all existing ignored clients
+
+// Server
+alias playban                 "qc_cmd_sv     playban              ${* ?}" // Ban disallowing a client from playing (forced to spectate)
+alias unplayban               "qc_cmd_sv     unplayban            ${* ?}" // Remove an existing play ban client
+alias voteban                 "qc_cmd_sv     voteban              ${* ?}" // Ban disallowing a client from voting
+alias unvoteban               "qc_cmd_sv     unvoteban            ${* ?}" // Remove an existing vote ban client
+
+// other aliases for muteban, playban and voteban lists
+alias mutebans  "g_muteban_list ${* ?}"
+alias playbans  "g_playban_list ${* ?}"
+alias votebans  "g_voteban_list ${* ?}"
+
+
 // character classes (intersected with 32..126 minus ", $, ;, ^, \ - if you
 // want these, include them explicitly)
 // note that QC code always forbids $ and ; in VoteCommand_checknasty
@@ -351,6 +369,7 @@ set sv_vote_stop 15 "a player can not call a vote again for this many seconds wh
 set sv_vote_majority_factor 0.5        "What percentage of the PLAYERS constitute a majority? (Must be at least 0.5, recommended: 0.5)"
 set sv_vote_majority_factor_of_voted 0.5 "What percentage of the VOTERS constitute a majority too? (Must be at least 0.5, recommended: 0.5)"
 set sv_vote_gamestart 0 "Allow voting during map change"
+set sv_vote_debug 0 "count votes by bots too for debugging purposes (to get a bot to vote exec this command: bot_cmd 1 cc vote yes)
 // when disabled, don't allow game type changes "note: set these two equal to JUST support simple majorities"
 set sv_vote_override_mostrecent 0