Merge branch 'terencehill/crosshair_hittest_settings_fix' into 'master'

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

diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index ac5212408fc613a0f192a7fea3bb9c2da846a8cf..8f7066d96b417c00176945c3b02319f44d7e7240 100644 (file)
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -216,6 +216,8 @@ seta cl_eventchase_vehicle 1 "camera goes into 3rd person mode when inside a veh
 seta cl_eventchase_vehicle_viewoffset "0 0 80"
 seta cl_eventchase_vehicle_distance 250
 
+seta chase_front 0 "show frontal view when using chase cam"
+
 set _vehicles_shownchasemessage 0
 
 seta cl_particles_oldvortexbeam 0 "Uses the old v2.3 Vortex beam instead of the new beam, only works if server allows it (g_allow_oldvortexbeam 1)"
@@ -532,12 +534,14 @@ seta accuracy_color2 "0 1 0"
 // for menu server list (eventually make them have engine support?)
 seta menu_slist_showfull 1 "show servers even if they are full and have no slots to join"
 seta menu_slist_showempty 1 "show servers even if they are no empty and have no opponents to play against"
+seta menu_slist_showlaggy 0 "show servers even if they are very high latency (see menu_slist_maxping)"
 seta menu_slist_modfilter "" // set to either: !modname or modname. modname of = means "same as we are running now".
 
 // other serverlist cvars
 seta menu_slist_categories 1
 seta menu_slist_categories_onlyifmultiple 1
 seta menu_slist_purethreshold 0
+seta menu_slist_maxping 300
 seta menu_slist_modimpurity 0
 seta menu_slist_recommendations 3
 seta menu_slist_recommendations_maxping 150