Merge branch 'master' into sev/luma_revisions

[xonotic/xonotic-data.pk3dir.git] / hud_luma.cfg

diff --git a/hud_luma.cfg b/hud_luma.cfg
index 3888765cb8fd7113781254455866cad2d3353d0e..0912910b76eafe67ec28ce1b1efc27cf1baa9c05 100644 (file)
--- a/hud_luma.cfg
+++ b/hud_luma.cfg
@@ -23,6 +23,8 @@ seta hud_progressbar_nexball_color "0.2 0.65 0.93"
 seta hud_progressbar_speed_color "0.77 0.67 0"
 seta hud_progressbar_acceleration_color "0.2 0.65 0.93"
 seta hud_progressbar_acceleration_neg_color "0.86 0.35 0"
+seta hud_progressbar_vehicles_ammo1_color "0.77 0.67 0"
+seta hud_progressbar_vehicles_ammo2_color "0.86 0.35 0"
 
 seta _hud_panelorder "15 12 9 5 10 6 14 0 7 4 11 2 1 3 8 13 16 "
 
@@ -60,6 +62,8 @@ seta hud_panel_weapons_timeout_fadefgmin "0.4"
 seta hud_panel_weapons_timeout_speed_in "0.25"
 seta hud_panel_weapons_timeout_speed_out "0.75"
 seta hud_panel_weapons_onlyowned "1"
+seta hud_panel_weapons_noncurrent_alpha "0.8"
+seta hud_panel_weapons_noncurrent_scale "0.8"
 
 seta hud_panel_ammo 1
 seta hud_panel_ammo_pos "0.315000 0.865000"