Merge branch 'master' into terencehill/menu_quit_game

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

diff --git a/commands.cfg b/commands.cfg
index e9dfc0e0232ff9b6a11ac3e36fe6fb81f324076d..1e26673d42055b639a03f40bbc12d9358e842c07 100644 (file)
--- a/commands.cfg
+++ b/commands.cfg
@@ -111,12 +111,13 @@ alias tdem "timedemo $1"
 // ===============================================
 //  menu_cmd (menu command) - menu/command/menu_cmd.qc
 // ===============================================
+alias menu_showwelcomedialog "menu_cmd directmenu Welcome"
 alias menu_showteamselect "menu_cmd directmenu TeamSelect"
 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
@@ -184,7 +185,7 @@ alias team_red "cmd selectteam red; cmd join"
 alias team_blue "cmd selectteam blue; cmd join"
 alias team_pink "cmd selectteam pink; cmd join"
 alias team_yellow "cmd selectteam yellow; cmd join"
-alias team_auto "cmd selectteam auto; cmd join"
+alias team_auto "togglemenu 0; cmd selectteam auto; cmd join"
 
 alias spec "spectate ${* ?}"