Merge branch 'bones_was_here/gunoffset' into 'master'

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

diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index a78cc3b1dfff6c4c172806eb5b0fdb5adf47f7dd..6d2550b8b7c6879c446c91252a97dd9c5a85a7da 100644 (file)
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -871,6 +871,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