Merge remote-tracking branch 'origin/master' into tzork/gm_nexball

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

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index add0473595f6116681e78c50c1e1b9ef11627e0a..d829904631ab0cf20e04d1fe5ffdea4b7b541ad4 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -48,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;
@@ -150,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;
@@ -207,14 +207,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;
@@ -384,3 +376,7 @@ string autocvar__togglezoom;
 float autocvar_cl_playerdetailreduction;
 float autocvar_cl_loddistance1 = 1024;
 float autocvar_cl_loddistance2 = 4096;
+float autocvar_cl_forceplayermodels;
+float autocvar__cl_playerskin;
+string autocvar__cl_playermodel;
+float autocvar_cl_precacheplayermodels;