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 070f4f6c96c55a6e09ed72636bfd6ab840f355e0..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;
@@ -151,18 +153,17 @@ float autocvar_g_waypointsprite_normdistance;
 float autocvar_g_waypointsprite_scale;
 float autocvar_g_waypointsprite_spam;
 float autocvar_g_waypointsprite_timealphaexponent;
+float autocvar_g_waypointsprites_turrets;
+float autocvar_g_waypointsprites_turrets_maxdist;
+
 float autocvar_hud_colorflash_alpha;
-float autocvar_hud_configure_bg_minalpha;
 float autocvar_hud_configure_checkcollisions;
 float autocvar_hud_configure_grid;
 float autocvar_hud_configure_grid_alpha;
-float autocvar_hud_configure_grid_xsize;
-float autocvar_hud_configure_grid_ysize;
 float autocvar_hud_configure_teamcolorforced;
 float autocvar_hud_contents;
 float autocvar_hud_contents_blur;
 float autocvar_hud_contents_blur_alpha;
-float autocvar_hud_contents_factor;
 float autocvar_hud_contents_fadeintime;
 float autocvar_hud_contents_fadeouttime;
 float autocvar_hud_contents_lava_alpha;
@@ -208,14 +209,6 @@ vector autocvar_hud_panel_bg_color;
 float autocvar_hud_panel_bg_color_team;
 float autocvar_hud_panel_bg_padding;
 float autocvar_hud_panel_centerprint;
-string autocvar_hud_panel_centerprint_pos;
-string autocvar_hud_panel_centerprint_size;
-string autocvar_hud_panel_centerprint_bg;
-string autocvar_hud_panel_centerprint_bg_color;
-string autocvar_hud_panel_centerprint_bg_color_team;
-string autocvar_hud_panel_centerprint_bg_alpha;
-string autocvar_hud_panel_centerprint_bg_border = "";
-string autocvar_hud_panel_centerprint_bg_padding = "";
 float autocvar_hud_panel_centerprint_align;
 var float autocvar_hud_panel_centerprint_fade_in = 0.2;
 var float autocvar_hud_panel_centerprint_fade_out = 0.5;
@@ -279,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;
@@ -382,6 +376,22 @@ var float autocvar_cl_eventchase_distance = 140;
 var float autocvar_cl_eventchase_speed = 1.3;
 float autocvar_cl_lerpexcess;
 string autocvar__togglezoom;
+float autocvar_cl_damageeffect;
+float autocvar_cl_damageeffect_ticrate;
+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;
 float autocvar_cl_playerdetailreduction;
 float autocvar_cl_loddistance1 = 1024;
 float autocvar_cl_loddistance2 = 4096;
+float autocvar_cl_forceplayermodels;
+float autocvar_cl_forceplayercolors;
+string autocvar_cl_forcemyplayermodel;
+float autocvar_cl_forcemyplayerskin;
+float autocvar_cl_forcemyplayercolors;
+float autocvar__cl_playerskin;
+string autocvar__cl_playermodel;
+float autocvar_cl_precacheplayermodels;
+float autocvar_cl_deathglow;