Merge branch 'master' into Mario/buff_updates

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

diff --git a/hud_luma.cfg b/hud_luma.cfg
index e6312c1ac9fd505929ceac40ba21c17a64d87b27..2ff915b4729997645ab41440834285b3fa7a3acd 100644 (file)
--- a/hud_luma.cfg
+++ b/hud_luma.cfg
@@ -16,8 +16,8 @@ seta hud_progressbar_alpha "0.600000"
 seta hud_progressbar_health_color "0.83 0.12 0"
 seta hud_progressbar_armor_color "0.28 0.8 0"
 seta hud_progressbar_fuel_color "0.77 0.67 0"
-seta hud_progressbar_strength_color "0.86 0.35 0"
-seta hud_progressbar_shield_color "0.28 0.8 0"
+seta hud_progressbar_strength_color "1 0.39 0"
+seta hud_progressbar_shield_color "0.36 1 0.07"
 seta hud_progressbar_superweapons_color "0.77 0.67 0"
 seta hud_progressbar_nexball_color "0.2 0.65 0.93"
 seta hud_progressbar_speed_color "0.77 0.67 0"
@@ -84,21 +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.325000 0.820000"
-seta hud_panel_powerups_size "0.350000 0.050000"
+seta hud_panel_powerups_pos "0.325000 0.815000"
+seta hud_panel_powerups_size "0.350000 0.055000"
 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 ""
-seta hud_panel_powerups_flip "1"
-seta hud_panel_powerups_iconalign "2"
-seta hud_panel_powerups_baralign "2"
+seta hud_panel_powerups_iconalign "3"
+seta hud_panel_powerups_baralign "3"
 seta hud_panel_powerups_progressbar "1"
-seta hud_panel_powerups_progressbar_strength "progressbar"
-seta hud_panel_powerups_progressbar_shield "progressbar"
-seta hud_panel_powerups_progressbar_superweapons "progressbar"
 seta hud_panel_powerups_text "1"
 
 seta hud_panel_healtharmor 1
@@ -303,16 +299,6 @@ seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "0.5"
 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.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 ""
-seta hud_panel_buffs_bg_alpha ""
-seta hud_panel_buffs_bg_border ""
-seta hud_panel_buffs_bg_padding ""
-
 seta hud_panel_mapvote 1
 seta hud_panel_mapvote_pos "0 0"
 seta hud_panel_mapvote_size "1 1"