X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=commands.cfg;h=3a1ab30b706b3a3a6f57ee6815732969f0fe415a;hb=162f7b2b5ecac2899f21841fc99138dd79de3a41;hp=c84d748e6c763fa6b8ab2952823f780df00b0183;hpb=19d753312f0deff7bd297822907874d532e9303e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/commands.cfg b/commands.cfg
index c84d748e6..3a1ab30b7 100644
--- a/commands.cfg
+++ b/commands.cfg
@@ -117,7 +117,7 @@ alias menu_showhudexit "menu_cmd directmenu HUDExit"
 alias menu_showhudoptions "menu_cmd directpanelhudmenu ${* ?}"
 alias menu_showsandboxtools "menu_cmd directmenu SandboxTools"
 alias menu_showquitdialog "menu_cmd directmenu Quit"
-alias menu_showdisconnectdialog "menu_cmd directmenu Disconnect"
+alias menu_showgamemenudialog "menu_cmd directmenu GameMenu"
 alias menu_showmonstertools "menu_cmd directmenu MonsterTools"
 
 // command executed before loading a map by the menu
@@ -150,6 +150,10 @@ alias radar "qc_cmd_cl hud radar ${* ?}"
 alias scoreboard_columns_help "qc_cmd_cl hud scoreboard_columns_help"
 alias scoreboard_columns_set "qc_cmd_cl hud scoreboard_columns_set ${* ?}"
 
+set _scoreboard_team_selection_available 0 // set to 1 by CSQC
+alias _team_selection_show1 "_scoreboard_team_selection 1"
+alias _team_selection_show0 menu_showteamselect
+alias team_selection_show "_team_selection_show$_scoreboard_team_selection_available"
 
 // ========================================================
 //  cmd (client-to-server command) - server/command/cmd.qc
@@ -339,11 +343,11 @@ set sv_vote_master 0	"Allows the use of the vote master system"
 set sv_vote_master_callable 0 "When set, users can use \"vmaster\" to call a vote to become master of voting commands"
 set sv_vote_master_password "" "when set, users can use \"vlogin PASSWORD\" to log in as master, then run master commands directly using vdo"
 set sv_vote_master_playerlimit 2 "Minimum number of players needed for a player to be allowed to vote for master"
-set sv_vote_no_stops_vote 1 "Allow the vote caller to stop his own vote simply by voting no"
+set sv_vote_no_stops_vote 1 "Allow the vote caller to stop their own vote simply by voting no"
 set sv_vote_singlecount 0	"set to 1 to count votes once after timeout or to 0 to count with every vote"
 set sv_vote_timeout 24	"a vote will timeout after this many seconds"
-set sv_vote_wait 120	"a player can not call a vote again for this many seconds when his vote was not accepted"
-set sv_vote_stop 15	"a player can not call a vote again for this many seconds when he stopped this vote (e.g. to correct it)"
+set sv_vote_wait 120	"a player can not call a vote again for this many seconds when their vote was not accepted"
+set sv_vote_stop 15	"a player can not call a vote again for this many seconds when they stopped this vote (e.g. to correct it)"
 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"