Merge branch 'master' into Mario/ons_updates

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

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 49d9719a9d8526734ecf0729a43d4ff74206d3e2..848c5ffd0384515b3d0564469d982297ba36e729 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -277,7 +277,7 @@ bool autocvar_hud_panel_itemstime_progressbar = 0;
 float autocvar_hud_panel_itemstime_progressbar_maxtime = 30;
 string autocvar_hud_panel_itemstime_progressbar_name = "progressbar";
 float autocvar_hud_panel_itemstime_progressbar_reduced;
-bool autocvar_hud_panel_itemstime_hidespawned = 0;
+bool autocvar_hud_panel_itemstime_hidespawned = 1;
 int autocvar_hud_panel_itemstime_text = 1;
 bool autocvar_hud_panel_infomessages;
 bool autocvar_hud_panel_infomessages_flip;
@@ -312,14 +312,8 @@ bool autocvar_hud_panel_physics_topspeed;
 float autocvar_hud_panel_physics_topspeed_time;
 bool autocvar_hud_panel_powerups;
 int autocvar_hud_panel_powerups_baralign;
-bool autocvar_hud_panel_powerups_flip;
 int autocvar_hud_panel_powerups_iconalign;
 bool autocvar_hud_panel_powerups_progressbar;
-bool autocvar_hud_panel_buffs;
-//float autocvar_hud_panel_buffs_iconalign;
-string autocvar_hud_panel_powerups_progressbar_shield;
-string autocvar_hud_panel_powerups_progressbar_strength;
-string autocvar_hud_panel_powerups_progressbar_superweapons;
 bool autocvar_hud_panel_powerups_text;
 int autocvar_hud_panel_pressedkeys;
 float autocvar_hud_panel_pressedkeys_aspect;
@@ -447,6 +441,8 @@ float autocvar_cl_hitsound_nom_damage = 25;
 float autocvar_cl_hitsound_antispam_time;
 int autocvar_cl_eventchase_death = 1;
 int autocvar_cl_eventchase_nexball = 1;
+vector autocvar_cl_eventchase_generator_viewoffset = '0 0 80';
+float autocvar_cl_eventchase_generator_distance = 400;
 float autocvar_cl_eventchase_distance = 140;
 float autocvar_cl_eventchase_speed = 1.3;
 vector autocvar_cl_eventchase_maxs = '12 12 8';