Merge branch 'master' into develop

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

diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index 5d3025517967e4392d1ce4b37ae289ea9cdef710..f3c5ca7731151c512499a72d3e0d3ac7d3f01611 100644 (file)
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -179,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:
@@ -385,8 +386,6 @@ alias weapon_group_7 "impulse 7"
 alias weapon_group_8 "impulse 8"
 alias weapon_group_9 "impulse 9"
 alias weapon_group_0 "impulse 14" // cycles the superweapons
-// TODO: remove after 0.8.2. Default impulse commands for 0.8.1 servers
-exec weapons.cfg
 
 cl_curl_enabled 1
 cl_curl_maxdownloads 3
@@ -491,7 +490,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"