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 18e58e522a4e301503eea2129f2ebe2bbaadb537..848c5ffd0384515b3d0564469d982297ba36e729 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -77,9 +77,9 @@ bool autocvar_cl_spawnzoom = 1;
 float autocvar_cl_spawnzoom_speed = 1;
 float autocvar_cl_spawnzoom_factor = 2;
 bool autocvar_cl_stripcolorcodes;
-float autocvar_cl_vehicle_spiderbot_cross_alpha = 0.6;
-float autocvar_cl_vehicle_spiderbot_cross_size = 1;
 bool autocvar_cl_vehicles_hud_tactical = 1;
+float autocvar_cl_vehicles_hudscale = 0.5;
+float autocvar_cl_vehicles_crosshair_size = 0.5;
 bool autocvar_cl_velocityzoom_enabled;
 float autocvar_cl_velocityzoom_factor;
 int autocvar_cl_velocityzoom_type = 3;
@@ -94,7 +94,6 @@ bool autocvar_cl_unpress_zoom_on_death = 1;
 bool autocvar_cl_unpress_zoom_on_weapon_switch = 1;
 bool autocvar_cl_unpress_attack_on_weapon_switch = 1;
 bool autocvar_con_chat;
-float autocvar_con_chatpos;
 bool autocvar_con_chatrect;
 float autocvar_con_chatsize;
 float autocvar_con_chattime;
@@ -173,6 +172,7 @@ float autocvar_g_waypointsprite_edgeoffset_left;
 float autocvar_g_waypointsprite_edgeoffset_right;
 float autocvar_g_waypointsprite_edgeoffset_top;
 float autocvar_g_waypointsprite_fontsize;
+int autocvar_g_waypointsprite_itemstime;
 float autocvar_g_waypointsprite_minalpha;
 float autocvar_g_waypointsprite_minscale;
 float autocvar_g_waypointsprite_normdistance;
@@ -269,6 +269,16 @@ float autocvar_hud_panel_healtharmor_progressbar_gfx_damage;
 float autocvar_hud_panel_healtharmor_progressbar_gfx_lowhealth;
 float autocvar_hud_panel_healtharmor_progressbar_gfx_smooth;
 int autocvar_hud_panel_healtharmor_text;
+int autocvar_hud_panel_itemstime = 2;
+float autocvar_hud_panel_itemstime_dynamicsize = 1;
+float autocvar_hud_panel_itemstime_ratio = 2;
+int autocvar_hud_panel_itemstime_iconalign;
+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 = 1;
+int autocvar_hud_panel_itemstime_text = 1;
 bool autocvar_hud_panel_infomessages;
 bool autocvar_hud_panel_infomessages_flip;
 bool autocvar_hud_panel_modicons;
@@ -302,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;
@@ -354,6 +358,8 @@ float autocvar_hud_panel_weapons_complainbubble_time;
 int autocvar_hud_panel_weapons_label;
 float autocvar_hud_panel_weapons_label_scale = 0.5;
 bool autocvar_hud_panel_weapons_onlyowned;
+float autocvar_hud_panel_weapons_noncurrent_alpha = 1;
+float autocvar_hud_panel_weapons_noncurrent_scale = 1;
 float autocvar_hud_panel_weapons_timeout;
 int autocvar_hud_panel_weapons_timeout_effect;
 float autocvar_hud_panel_weapons_timeout_fadebgmin;
@@ -371,6 +377,8 @@ vector autocvar_hud_progressbar_shield_color;
 vector autocvar_hud_progressbar_speed_color;
 vector autocvar_hud_progressbar_strength_color;
 vector autocvar_hud_progressbar_superweapons_color;
+vector autocvar_hud_progressbar_vehicles_ammo1_color;
+vector autocvar_hud_progressbar_vehicles_ammo2_color;
 bool autocvar_hud_showbinds;
 bool autocvar_hud_showbinds_limit;
 bool autocvar__hud_showbinds_reload;