Merge branch 'master' into Mario/no_engine_physics

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

diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index 23113c394829eda576bc37ac7ce7182da7e46c17..f73713338f53dcecdb0d19db437c0d9d1107e9d2 100644 (file)
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -870,6 +870,9 @@ scr_loadingscreen_scale 999
 scr_loadingscreen_scale_base 1
 scr_loadingscreen_scale_limit 2
 
+// in-game menu
+seta menu_gamemenu 1 "1: show in-game menu when esc is pressed; 0: show main menu when esc is pressed"
+
 // other config files
 exec effects-normal.cfg
 exec crosshairs.cfg