Merge branch 'bones_was_here/vidsettings' into 'master'

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

diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index 09602a54325dfac4dce504df1bea44e8570d6087..349a393c61a4150610685da12e6adfd66c926b57 100644 (file)
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -23,8 +23,15 @@ alias use "impulse 21"
 cl_particles_forcetraileffects 1
 
 alias dropweapon "impulse 17"
-alias +show_info +button7
-alias -show_info -button7
+
+alias +show_info0 "+button7"
+alias -show_info0 "-button7"
+alias +show_info1 "menu_showwelcomedialog"
+alias -show_info1 ""
+
+seta cl_welcome_in_menu_dialog 1 "1: show the welcome message in a dedicated menu dialog; 0: show it as a centerprint message"
+alias +show_info +show_info$cl_welcome_in_menu_dialog
+alias -show_info -show_info$cl_welcome_in_menu_dialog
 
 // merge lightmaps up to 2048x2048 textures
 mod_q3bsp_lightmapmergepower 4
@@ -172,13 +179,14 @@ r_motionblur 0 // motion blur value, default is 0
 r_damageblur 0 // motion blur when damaged, default is 0 (removed in Xonotic)
 net_slist_queriespersecond 60 // to be reduced if any major issues arise (ping times increased etc.)
 
+// TODO: revisit bloom settings on the GL32 renderer!
 r_bloom_blur 4
-r_bloom_brighten 2
+r_bloom_brighten 1
 r_bloom_colorexponent 1
-r_bloom_colorscale 1
+r_bloom_colorscale 1.5
 r_bloom_colorsubtract 0.125
 r_bloom_resolution 320
-r_bloom_scenebrightness 0.85
+r_bloom_scenebrightness 1
 
 seta vid_x11_display ""        "xonotic-linux-*.sh will use this to start xonotic on an other/new X display"
 // This can have three possible settings:
@@ -317,8 +325,7 @@ seta cl_casings_sloppy 1 "sloppy casings, may temporarily penetrate walls"
 seta cl_projectiles_sloppy 1 "sloppy projectiles, may temporarily penetrate walls"
 cl_stainmaps 0
 cl_particles_smoke 1
-set vid_gl20 1
-set gl_vbo 3
+gl_vbo 1 // removed in GL32 renderer
 r_glsl_deluxemapping 1
 r_glsl_offsetmapping 0
 r_glsl_offsetmapping_lod 1
@@ -485,7 +492,7 @@ seta menu_tooltips 1 "menu tooltips: 0 disabled, 1 enabled, 2 also shows cvar or
 set menu_picmip_bypass 0 "bypass texture quality enforcement based on system resources, not recommended and may cause crashes!"
 set menu_showboxes 0 "show item bounding boxes (debug)"
 set menu_cvarlist_onlymodified 0 "show only modified cvars in the cvar list"
-set menu_force_on_disconnection 1 "force to show the menu this number of seconds after you get disconnected (0 to disable)"
+set menu_force_on_disconnection 1 "force to show the menu after you get disconnected"
 
 set _menu_credits_export 0 "set to 1 and restart the menu to export credits to credits.txt (menu will automatically reset to 0)"
 alias menu_credits_export "_menu_credits_export 1; menu_restart"