.gitlab-ci.yml

@@ -55,7 +55,7 @@ test_sv_game:
     - wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
     - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
 
-    - EXPECT=458e9e611a757c745da05c85a37e576d
+    - EXPECT=5bbaf1e67c9a18ac159614a7e59b8d1e
     - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg
       | tee /dev/stderr
       | sed -e 's,^\[[^]]*\] ,,'

.tx/merge-base

-Tue May  3 07:23:14 CEST 2022
+Sun Oct 16 07:24:02 CEST 2022

_hud_common.cfg

@@ -110,6 +110,7 @@ seta hud_panel_itemstime_progressbar_maxtime "30" "when left time is at least th
 seta hud_panel_itemstime_hidespawned "1" "if 1 hide an item from the panel when all the occurrences of it are available again; if 2 hide it when at least one occurrence is available again"
 seta hud_panel_itemstime_hidebig "0" "if 1 hide big armor and health from the panel"
 
+set _hud_panel_quickmenu_file_from_server "" "reserved cvar set by the server with a custom server quickmenu file that appears in the default quickmenu"
 seta hud_panel_quickmenu_file "" "load the quick menu from this file (empty or 0 to disable)"
 seta hud_panel_quickmenu_translatecommands 0 "when the game is translated, translate strings inside commands too (useful for chat commands)"
 seta hud_panel_quickmenu_time 5 "quickmenu expires after this number of seconds in the same page"

binds-xonotic.cfg

@@ -57,7 +57,7 @@ bind F1 vyes
 bind F2 vno
 bind F3 spec
 bind F4 ready
-bind F5 menu_showteamselect
+bind F5 team_selection_show
 bind F6 team_auto
 bind F7 menu_showsandboxtools
 bind F8 "quickmenu"
@@ -75,7 +75,7 @@ bind JOY5 "+fire2"
 bind JOY6 "+fire"
 bind JOY7 "+zoom"
 bind JOY8 "dropweapon"
-bind JOY9 "menu_showteamselect"
+bind JOY9 team_selection_show
 bind JOY10 "+show_info"
 bind JOY11 "+showscores"
 bind JOY12 "+con_chat_maximize"

commands.cfg

@@ -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