Merge remote branch 'origin/master' into samual/menu_updates

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / autocvars.qh

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 0e3d171bf9eb5990cfc0c79a6b6b837f5261ea33..e5a28ec5718073e82a4f6f1e30847982d6371cd9 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -89,9 +89,11 @@ float autocvar_crosshair_color_per_weapon;
 float autocvar_crosshair_dot;
 float autocvar_crosshair_dot_alpha;
 string autocvar_crosshair_dot_color;
+float autocvar_crosshair_dot_color_custom;
 float autocvar_crosshair_dot_size;
 float autocvar_crosshair_effect_scalefade;
 float autocvar_crosshair_effect_speed;
+float autocvar_crosshair_enabled;
 float autocvar_crosshair_hitindication;
 string autocvar_crosshair_hitindication_color;
 float autocvar_crosshair_hitindication_speed;
@@ -270,6 +272,7 @@ float autocvar_hud_panel_powerups_iconalign;
 float autocvar_hud_panel_powerups_progressbar;
 string autocvar_hud_panel_powerups_progressbar_shield;
 string autocvar_hud_panel_powerups_progressbar_strength;
+string autocvar_hud_panel_powerups_progressbar_superweapons;
 float autocvar_hud_panel_powerups_text;
 float autocvar_hud_panel_pressedkeys;
 float autocvar_hud_panel_pressedkeys_aspect;
@@ -375,7 +378,8 @@ float autocvar_cl_lerpexcess;
 string autocvar__togglezoom;
 float autocvar_cl_damageeffect;
 float autocvar_cl_damageeffect_ticrate;
-float autocvar_cl_damageeffect_limit;
+float autocvar_cl_damageeffect_bones;
+float autocvar_cl_damageeffect_distribute;
 float autocvar_cl_damageeffect_lifetime;
 float autocvar_cl_damageeffect_lifetime_min;
 float autocvar_cl_damageeffect_lifetime_max;
@@ -390,3 +394,4 @@ float autocvar_cl_forcemyplayercolors;
 float autocvar__cl_playerskin;
 string autocvar__cl_playermodel;
 float autocvar_cl_precacheplayermodels;
+float autocvar_cl_deathglow;