Merge branch 'master' into terencehill/weaponmodel_effects_2

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

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 7a1d66450b06347a505f1ffa077399e1ae52302f..49cafb896a18fcc122d751fdcda6180c657ff802 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -53,7 +53,6 @@ float autocvar_cl_gibs_velocity_random = 1;
 float autocvar_cl_gibs_velocity_scale = 1;
 float autocvar_cl_gibs_avelocity_scale = 1;
 float autocvar_cl_gibs_velocity_up;
-int autocvar_cl_gunalign;
 bool autocvar_cl_hidewaypoints;
 bool autocvar_cl_lockview;
 bool autocvar_cl_nogibs;
@@ -153,10 +152,6 @@ float autocvar_crosshair_size;
 int autocvar_ekg;
 float autocvar_fov;
 float autocvar_g_balance_damagepush_speedfactor;
-float autocvar_g_balance_tuba_attenuation;
-float autocvar_g_balance_tuba_fadetime;
-float autocvar_g_balance_tuba_volume;
-int autocvar_g_balance_tuba_pitchstep;
 float autocvar_g_warmup_limit;
 bool autocvar_hud_cursormode = true;
 float autocvar_hud_colorflash_alpha;
@@ -456,4 +451,5 @@ vector autocvar_crosshair_rpc_color = '0.2 1.0 0.2';
 float autocvar_crosshair_rpc_alpha = 1;
 float autocvar_crosshair_rpc_size = 1;
 int autocvar_cl_nade_timer;
+bool autocvar_cl_items_nofade;
 #endif