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 4f801509eb8681932a3ca0e9cdd98cd9fb9daf60..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 "
 
@@ -31,7 +33,7 @@ seta hud_configure_grid_xsize "0.005000"
 seta hud_configure_grid_ysize "0.005000"
 
 seta hud_panel_weapons 1
-seta hud_panel_weapons_pos "0.965000 0.120000"
+seta hud_panel_weapons_pos "0.965000 0.125000"
 seta hud_panel_weapons_size "0.035000 0.770000"
 seta hud_panel_weapons_bg "border_default_east"
 seta hud_panel_weapons_bg_color ""
@@ -60,10 +62,12 @@ 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.330000 0.865000"
-seta hud_panel_ammo_size "0.340000 0.060000"
+seta hud_panel_ammo_pos "0.315000 0.865000"
+seta hud_panel_ammo_size "0.370000 0.060000"
 seta hud_panel_ammo_bg "border_tab_south"
 seta hud_panel_ammo_bg_color ""
 seta hud_panel_ammo_bg_color_team ""
@@ -80,17 +84,17 @@ seta hud_panel_ammo_progressbar_xoffset "0"
 seta hud_panel_ammo_text "1"
 
 seta hud_panel_powerups 1
-seta hud_panel_powerups_pos "0 0.270000"
-seta hud_panel_powerups_size "0.040000 0.415000"
-seta hud_panel_powerups_bg "border_default_west"
+seta hud_panel_powerups_pos "0.325000 0.820000"
+seta hud_panel_powerups_size "0.350000 0.050000"
+seta hud_panel_powerups_bg "border_shadow_south"
 seta hud_panel_powerups_bg_color ""
 seta hud_panel_powerups_bg_color_team ""
 seta hud_panel_powerups_bg_alpha ""
 seta hud_panel_powerups_bg_border ""
-seta hud_panel_powerups_bg_padding "2"
+seta hud_panel_powerups_bg_padding ""
 seta hud_panel_powerups_flip "1"
-seta hud_panel_powerups_iconalign "1"
-seta hud_panel_powerups_baralign "1"
+seta hud_panel_powerups_iconalign "2"
+seta hud_panel_powerups_baralign "2"
 seta hud_panel_powerups_progressbar "1"
 seta hud_panel_powerups_progressbar_strength "progressbar"
 seta hud_panel_powerups_progressbar_shield "progressbar"
@@ -206,7 +210,7 @@ seta hud_panel_modicons_dom_layout "1"
 seta hud_panel_modicons_freezetag_layout "1"
 
 seta hud_panel_pressedkeys 1
-seta hud_panel_pressedkeys_pos "0.445000 0.730000"
+seta hud_panel_pressedkeys_pos "0.445000 0.710000"
 seta hud_panel_pressedkeys_size "0.110000 0.090000"
 seta hud_panel_pressedkeys_bg " "
 seta hud_panel_pressedkeys_bg_color ""
@@ -251,7 +255,7 @@ seta hud_panel_infomessages_bg_padding "0"
 seta hud_panel_infomessages_flip "1"
 
 seta hud_panel_physics 3
-seta hud_panel_physics_pos "0.410000 0.630000"
+seta hud_panel_physics_pos "0.410000 0.625000"
 seta hud_panel_physics_size "0.180000 0.080000"
 seta hud_panel_physics_bg "0"
 seta hud_panel_physics_bg_color ""
@@ -300,8 +304,8 @@ seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75"
 seta hud_panel_centerprint_fade_minfontsize "0"
 
 seta hud_panel_buffs 1
-seta hud_panel_buffs_pos "0.435000 0.840000"
-seta hud_panel_buffs_size "0.125000 0.035000"
+seta hud_panel_buffs_pos "0.325000 0.820000"
+seta hud_panel_buffs_size "0.350000 0.050000"
 seta hud_panel_buffs_bg "0"
 seta hud_panel_buffs_bg_color ""
 seta hud_panel_buffs_bg_color_team ""