Merge branch 'bones_was_here/sv_maxidle_playertospectator' into 'master'

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

diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index bf1735e0240655e9cdf937e7208222c2e5a290cc..f5204648527d640b4eca0d63350265966eb99c68 100644 (file)
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -32,7 +32,6 @@ mod_q3bsp_lightmapmergepower 4
 // player defaults
 _cl_color "112.211" // same effect as 112, but menuqc can detect this as the default and not intentionally set
 _cl_name ""
-seta _cl_gender 0 "storage cvar for current player gender (0 = undisclosed, 1 = male, 2 = female)"
 _cl_playerskin 0
 
 seta cl_reticle 1 "enable zoom reticles"
@@ -216,6 +215,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)"
@@ -246,6 +247,17 @@ alias g_waypointeditor_remove        "wpeditor remove"
 alias g_waypointeditor_relinkall     "wpeditor relinkall"
 alias g_waypointeditor_saveall       "wpeditor saveall"
 alias g_waypointeditor_unreachable   "wpeditor unreachable"
+alias g_waypointeditor_help          "wpeditor"
+alias g_waypointeditor_menu          "wpeditor_menu"
+alias g_waypointeditor_spawn_x       "wpeditor spawn crosshair"
+alias g_waypointeditor_spawn_jump    "wpeditor spawn jump"
+alias g_waypointeditor_spawn_crouch  "wpeditor spawn crouch"
+alias g_waypointeditor_spawn_support "wpeditor spawn support"
+alias g_waypointeditor_hardwire      "wpeditor hardwire"
+alias g_waypointeditor_hardwire_x    "wpeditor hardwire crosshair"
+alias g_waypointeditor_lock          "wpeditor lock"
+alias g_waypointeditor_symorigin     "wpeditor symorigin $*"
+alias g_waypointeditor_symaxis       "wpeditor symaxis $*"
 
 alias navwaypoint_relink        g_waypointeditor_spawn
 alias navwaypoint_remove        g_waypointeditor_remove
@@ -687,10 +699,10 @@ set camera_look_attenuation       8       "Attenuation of \"looking\" movements, only if ca
 set camera_forward_follows     1       "0: Move the camera forwards without changing altitude. 1: Move towards what you are looking"
 
 // "Gentle mode": show no blood
-seta cl_gentle 0               "client side gentle mode, master switch for removing both gibs and messages"
-seta cl_gentle_gibs 0          "client side gentle mode (only replaces gibs); when set to 1, white smoke replaces gibs, when set to 2, colorful clouds replace gibs"
-seta cl_gentle_messages 0      "client side gentle mode (only replaces frag messages/centerprints)"
-seta cl_gentle_damage 0        "client side gentle mode (only replaces damage flash); when set to 1, a white flash replaces the blood image, when set to 2, a randomly colored flash is used instead"
+seta cl_gentle 0                       "client side gentle mode, master switch"
+seta cl_gentle_gibs 0          "client side gentle mode for gibs (cl_nogibs); when set to 1, white smoke replaces gibs, when set to 2, colorful clouds replace gibs"
+seta cl_gentle_messages 0      "client side gentle mode for frag messages/centerprints"
+seta cl_gentle_damage 0                "client side gentle mode for damage flash (hud_damage); when set to 1, a white flash replaces the blood image, when set to 2, a randomly colored flash is used instead"
 
 set cl_jetpack_attenuation 2 "jetpack sound attenuation"
 
@@ -741,7 +753,7 @@ set cl_accuracy_data_receive 0 "1 receive weapon accuracy data statistics at the
 set developer_csqcentities 0 "csqc entity spam"
 
 seta cl_forceplayermodels 0 "make everyone look like your own model (requires server to have sv_defaultcharacter 0)"
-seta cl_forceplayercolors 0 "make enemies look like your own color (requires server to have sv_defaultcharacter 0); 2: enable it even in teamplay (only when there is exactly one enemy team); 3: enable it only playing Duel"
+seta cl_forceplayercolors 0 "make enemies look like your own color (requires server to have sv_defaultcharacter 0); 1: in all game modes without teams, 2: even in game modes with 2 teams, 3: only in Duel"
 seta cl_forcemyplayermodel "" "set to the model file name you want to show yourself as (does not affect how enemies look with cl_forceplayermodels)"
 seta cl_forcemyplayerskin 0 "set to the skin number you want to show yourself as (does not affect how enemies look with cl_forceplayermodels)"
 seta cl_forcemyplayercolors 0 "set to the color value (encoding is same as _cl_color) for your own player model (ignored in teamplay; does not affect how enemies look with cl_forceplayermodels)"
@@ -765,6 +777,8 @@ r_useportalculling 1
 set cl_lerpanim_maxdelta_framegroups 0.05 // must be faster than fastest weapon refire
 set cl_lerpanim_maxdelta_server 0.1 // must be slower than slowest server controlled anim (e.g. animinfo stuff)
 
+r_lerpsprites 1
+
 // autodemo deleting
 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"