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

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

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 218ab85f49d613cc2cbb01ad8859772c5900ad01..867859c571de307787db1182970cb8a201619f30 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -10,7 +10,7 @@ float autocvar_camera_forward_follows;
 float autocvar_camera_free;
 float autocvar_camera_look_attenuation;
 float autocvar_camera_look_player;
-float autocvar_camera_mouse_treshold;
+float autocvar_camera_mouse_threshold;
 float autocvar_camera_reset;
 float autocvar_camera_speed_attenuation;
 float autocvar_camera_speed_chase;
@@ -99,21 +99,30 @@ string autocvar_crosshair_dot_color;
 float autocvar_crosshair_dot_size;
 float autocvar_crosshair_effect_scalefade;
 float autocvar_crosshair_effect_speed;
+float autocvar_crosshair_hitindication;
+string autocvar_crosshair_hitindication_color;
+float autocvar_crosshair_hitindication_speed;
 float autocvar_crosshair_hittest;
 float autocvar_crosshair_hittest_blur;
 float autocvar_crosshair_hittest_showimpact;
 float autocvar_crosshair_per_weapon;
 float autocvar_crosshair_pickup;
 float autocvar_crosshair_pickup_speed;
-float autocvar_crosshair_ring_sniperrifle_alpha;
+float autocvar_crosshair_ring;
+float autocvar_crosshair_ring_inner;
+float autocvar_crosshair_ring_minelayer;
+float autocvar_crosshair_ring_minelayer_alpha;
+float autocvar_crosshair_ring_nex;
+float autocvar_crosshair_ring_nex_alpha;
 float autocvar_crosshair_ring_nex_currentcharge_movingavg_rate;
 float autocvar_crosshair_ring_nex_currentcharge_scale;
 float autocvar_crosshair_ring_nex_inner_alpha;
 float autocvar_crosshair_ring_nex_inner_color_blue;
 float autocvar_crosshair_ring_nex_inner_color_green;
 float autocvar_crosshair_ring_nex_inner_color_red;
-float autocvar_crosshair_ring_nex_outer_alpha;
 float autocvar_crosshair_ring_size;
+float autocvar_crosshair_ring_sniperrifle;
+float autocvar_crosshair_ring_sniperrifle_alpha;
 float autocvar_crosshair_size;
 float autocvar_ekg;
 float autocvar_fov;
@@ -146,10 +155,9 @@ 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_fadetime;
+float autocvar_hud_contents_fadeintime;
+float autocvar_hud_contents_fadeouttime;
 float autocvar_hud_contents_lava_alpha;
 string autocvar_hud_contents_lava_color;
 float autocvar_hud_contents_slime_alpha;
@@ -157,14 +165,11 @@ string autocvar_hud_contents_slime_color;
 float autocvar_hud_contents_water_alpha;
 string autocvar_hud_contents_water_color;
 float autocvar_hud_damage;
-float autocvar_hud_damage_blur;
-float autocvar_hud_damage_blur_alpha;
 string autocvar_hud_damage_color;
 float autocvar_hud_damage_factor;
 float autocvar_hud_damage_fade_rate;
 float autocvar_hud_damage_gentle_alpha_multiplier;
 string autocvar_hud_damage_gentle_color;
-float autocvar_hud_damage_image;
 float autocvar_hud_damage_maxalpha;
 float autocvar_hud_damage_pain_threshold;
 float autocvar_hud_damage_pain_threshold_lower;
@@ -210,6 +215,7 @@ float autocvar_hud_panel_modicons;
 float autocvar_hud_panel_notify;
 float autocvar_hud_panel_notify_fadetime;
 float autocvar_hud_panel_notify_flip;
+float autocvar_hud_panel_notify_fontsize;
 float autocvar_hud_panel_notify_print;
 float autocvar_hud_panel_notify_time;
 float autocvar_hud_panel_powerups;
@@ -256,9 +262,6 @@ var float autocvar_hud_panel_weapons_fade = 1;
 float autocvar_hud_panel_weapons_label;
 float autocvar_hud_panel_weapons_timeout;
 float autocvar_hud_panel_weapons_timeout_effect;
-float autocvar_hud_postprocessing;
-float autocvar_hud_postprocessing_maxbluralpha;
-float autocvar_hud_postprocessing_maxblurradius;
 float autocvar_hud_progressbar_alpha;
 float autocvar_hud_showbinds;
 float autocvar_hud_showbinds_limit;
@@ -297,3 +300,6 @@ float autocvar_vid_conheight;
 float autocvar_vid_conwidth;
 float autocvar_vid_pixelheight;
 float autocvar_viewsize;
+float autocvar_crosshair_color_by_health;
+float autocvar_cl_hitsound;
+float autocvar_cl_hitsound_antispam_time;