Merge branch 'master' into mirceakitsune/damage_effects

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

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 8cb994b0825ee22b0b05dbfc42fb807914db694b..17c01b576c4b6d9637d141ca6099dd9379bce711 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -19,6 +19,8 @@ float autocvar_camera_speed_roll;
 float autocvar_chase_active;
 float autocvar_cl_allow_uid2name;
 string autocvar_cl_announcer;
+var float autocvar_cl_announcer_antispam = 2;
+var float autocvar_cl_announcer_maptime = 3;
 float autocvar_cl_autodemo_delete;
 float autocvar_cl_autodemo_delete_keeprecords;
 float autocvar_cl_casings;
@@ -46,6 +48,7 @@ var float autocvar_cl_gibs_sloppy = 1;
 var float autocvar_cl_gibs_ticrate = 0.1;
 var float autocvar_cl_gibs_velocity_random = 1;
 var float autocvar_cl_gibs_velocity_scale = 1;
+var float autocvar_cl_gibs_avelocity_scale = 1;
 float autocvar_cl_gibs_velocity_up;
 float autocvar_cl_gunalign;
 float autocvar_cl_hidewaypoints;
@@ -61,7 +64,6 @@ var float autocvar_cl_reticle = 1;
 float autocvar_cl_reticle_item_nex;
 float autocvar_cl_reticle_item_normal;
 float autocvar_cl_reticle_stretch;
-float autocvar_cl_sound_maptime_warning;
 float autocvar_cl_stripcolorcodes;
 var float autocvar_cl_vehicle_spiderbot_cross_alpha = 0.6;
 var float autocvar_cl_vehicle_spiderbot_cross_size = 1;
@@ -149,18 +151,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;
@@ -206,24 +207,16 @@ 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;
-float autocvar_hud_panel_centerprint_fade_in;
-float autocvar_hud_panel_centerprint_fade_out;
-float autocvar_hud_panel_centerprint_fade_subsequent;
-float autocvar_hud_panel_centerprint_fade_subsequent_passone;
-float autocvar_hud_panel_centerprint_fade_subsequent_passone_minalpha;
-float autocvar_hud_panel_centerprint_fade_subsequent_passtwo;
-float autocvar_hud_panel_centerprint_fade_subsequent_passtwo_minalpha;
-float autocvar_hud_panel_centerprint_fade_subsequent_minfontsize;
-float autocvar_hud_panel_centerprint_fade_minfontsize;
+var float autocvar_hud_panel_centerprint_fade_in = 0.2;
+var float autocvar_hud_panel_centerprint_fade_out = 0.5;
+var float autocvar_hud_panel_centerprint_fade_subsequent = 1;
+var float autocvar_hud_panel_centerprint_fade_subsequent_passone = 3;
+var float autocvar_hud_panel_centerprint_fade_subsequent_passone_minalpha = 0.5;
+var float autocvar_hud_panel_centerprint_fade_subsequent_passtwo = 10;
+var float autocvar_hud_panel_centerprint_fade_subsequent_passtwo_minalpha = 0.5;
+var float autocvar_hud_panel_centerprint_fade_subsequent_minfontsize = 0.75;
+var float autocvar_hud_panel_centerprint_fade_minfontsize = 0;
 float autocvar_hud_panel_centerprint_flip;
 float autocvar_hud_panel_centerprint_fontscale;
 float autocvar_hud_panel_centerprint_time;
@@ -257,7 +250,7 @@ float autocvar_hud_panel_notify_fontsize;
 float autocvar_hud_panel_notify_print;
 float autocvar_hud_panel_notify_time;
 float autocvar_hud_panel_physics;
-float autocvar_hud_panel_physics_acceleration_progressbar_mode;
+float autocvar_hud_panel_physics_acceleration_mode;
 float autocvar_hud_panel_physics_acceleration_max;
 float autocvar_hud_panel_physics_progressbar;
 float autocvar_hud_panel_physics_acceleration_vertical;
@@ -380,3 +373,19 @@ 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_player;
+float autocvar_cl_damageeffect_gibs;
+float autocvar_cl_damageeffect_gibs_randomize;
+float autocvar_cl_damageeffect_lifetime;
+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;