Merge branch 'master' into Mario/headshots

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

diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index 244faaa416ad3dc53511418f3ec57eeeae4945ff..17224b222022d0cd29a942fdb07e8c6c80e49d8f 100644 (file)
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -171,6 +171,7 @@ v_kicktime 0 // how long damage kicks of the view last, default is 0 seconds
 gl_polyblend 0 // whether to use screen tints, this has now been replaced by a better system in CSQC
 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.)
 
 r_bloom_blur 4
 r_bloom_brighten 2
@@ -302,7 +303,8 @@ 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
-vid_gl20 1
+set vid_gl20 1
+set gl_vbo 3
 r_glsl_deluxemapping 1
 r_glsl_offsetmapping 0
 r_glsl_offsetmapping_lod 1
@@ -758,7 +760,7 @@ set cl_lerpanim_maxdelta_server 0.1 // must be slower than slowest server contro
 seta cl_autodemo_delete_keeprecords 0 "when 1, records with a newly made race/cts demo are kept even if cl_autodemo_delete is used to delete demos"
 
 // freeze camera
-set cl_lockview 0 "when 1, the camera does not move any more"
+set cl_lockview 0 "when 1, the camera does not move any more; when 2, you can only control camera angles"
 
 // we now use mastervolume
 volume 1