Merge branch 'master' into develop

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

diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index 2a4c2c5c7a801c0da4c60e244f1ff24ad5e2a2d4..f3c5ca7731151c512499a72d3e0d3ac7d3f01611 100644 (file)
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -325,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
@@ -387,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
@@ -493,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"