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 09e496b812efed8a1ff70061dc96eba371689d49..0edab56dba6a8cc9413dedc8040f4db82e721c85 100644 (file)
--- a/hud_luma.cfg
+++ b/hud_luma.cfg
@@ -1,6 +1,6 @@
 seta hud_skin "luma"
 seta hud_panel_bg "0"
-seta hud_panel_bg_color "0 0.17 0.31"
+seta hud_panel_bg_color "0 0.14 0.25"
 seta hud_panel_bg_color_team "1"
 seta hud_panel_bg_alpha "1"
 seta hud_panel_bg_border "2"
@@ -8,7 +8,7 @@ seta hud_panel_bg_padding "3"
 seta hud_panel_fg_alpha "1"
 
 seta hud_dock "0"
-seta hud_dock_color "0 0.449576 0.860796"
+seta hud_dock_color "0 0 0"
 seta hud_dock_color_team "1"
 seta hud_dock_alpha "1"
 
@@ -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,8 +33,8 @@ 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.955000 0.090000"
-seta hud_panel_weapons_size "0.045000 0.780000"
+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 ""
 seta hud_panel_weapons_bg_color_team ""
@@ -41,6 +43,7 @@ seta hud_panel_weapons_bg_border ""
 seta hud_panel_weapons_bg_padding "0"
 seta hud_panel_weapons_accuracy "0"
 seta hud_panel_weapons_label "1"
+seta hud_panel_weapons_label_scale "0.3"
 seta hud_panel_weapons_complainbubble "1"
 seta hud_panel_weapons_complainbubble_padding "0"
 seta hud_panel_weapons_complainbubble_time "0"
@@ -48,8 +51,8 @@ seta hud_panel_weapons_complainbubble_fadetime "1"
 seta hud_panel_weapons_complainbubble_color_outofammo "0.8 0.11 0"
 seta hud_panel_weapons_complainbubble_color_donthave "0.88 0.75 0"
 seta hud_panel_weapons_complainbubble_color_unavailable "0 0.71 1"
-seta hud_panel_weapons_ammo "1"
-seta hud_panel_weapons_ammo_color "1 1 1"
+seta hud_panel_weapons_ammo "0"
+seta hud_panel_weapons_ammo_color "0.58 1 0.04"
 seta hud_panel_weapons_ammo_alpha "1"
 seta hud_panel_weapons_aspect "1"
 seta hud_panel_weapons_timeout "1"
@@ -59,17 +62,21 @@ 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.9"
 
 seta hud_panel_ammo 1
-seta hud_panel_ammo_pos "0.310000 0.965000"
-seta hud_panel_ammo_size "0.380000 0.035000"
-seta hud_panel_ammo_bg ""
+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 ""
 seta hud_panel_ammo_bg_alpha ""
 seta hud_panel_ammo_bg_border ""
-seta hud_panel_ammo_bg_padding "0"
+seta hud_panel_ammo_bg_padding "4"
 seta hud_panel_ammo_onlycurrent "0"
+seta hud_panel_ammo_noncurrent_alpha "0.6"
+seta hud_panel_ammo_noncurrent_scale "0.4"
 seta hud_panel_ammo_iconalign "0"
 seta hud_panel_ammo_progressbar "0"
 seta hud_panel_ammo_progressbar_name "progressbar"
@@ -77,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.350000 0.840000"
-seta hud_panel_powerups_size "0.300000 0.045000"
-seta hud_panel_powerups_bg "border_small"
+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 "3"
-seta hud_panel_powerups_baralign "3"
+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"
@@ -95,9 +102,9 @@ seta hud_panel_powerups_progressbar_superweapons "progressbar"
 seta hud_panel_powerups_text "1"
 
 seta hud_panel_healtharmor 1
-seta hud_panel_healtharmor_pos "0.310000 0.905000"
-seta hud_panel_healtharmor_size "0.380000 0.065000"
-seta hud_panel_healtharmor_bg "border_fading_south"
+seta hud_panel_healtharmor_pos "0.300000 0.925000"
+seta hud_panel_healtharmor_size "0.400000 0.070000"
+seta hud_panel_healtharmor_bg "border_default_south"
 seta hud_panel_healtharmor_bg_color ""
 seta hud_panel_healtharmor_bg_color_team ""
 seta hud_panel_healtharmor_bg_alpha ""
@@ -114,8 +121,8 @@ seta hud_panel_healtharmor_progressbar_gfx_smooth "2"
 seta hud_panel_healtharmor_text "1"
 
 seta hud_panel_notify 1
-seta hud_panel_notify_pos "0.710000 0.800000"
-seta hud_panel_notify_size "0.290000 0.200000"
+seta hud_panel_notify_pos "0.730000 0.800000"
+seta hud_panel_notify_size "0.265000 0.200000"
 seta hud_panel_notify_bg "0"
 seta hud_panel_notify_bg_color ""
 seta hud_panel_notify_bg_color_team ""
@@ -129,9 +136,9 @@ seta hud_panel_notify_fadetime "3"
 seta hud_panel_notify_icon_aspect "1"
 
 seta hud_panel_timer 1
-seta hud_panel_timer_pos "0.460000 0"
-seta hud_panel_timer_size "0.080000 0.030000"
-seta hud_panel_timer_bg "border_small_north"
+seta hud_panel_timer_pos "0.456000 0"
+seta hud_panel_timer_size "0.088000 0.030000"
+seta hud_panel_timer_bg "border_plain_north"
 seta hud_panel_timer_bg_color ""
 seta hud_panel_timer_bg_color_team ""
 seta hud_panel_timer_bg_alpha ""
@@ -179,7 +186,7 @@ seta hud_panel_racetimer_bg_border ""
 seta hud_panel_racetimer_bg_padding ""
 
 seta hud_panel_vote 1
-seta hud_panel_vote_pos "0.720000 0.670000"
+seta hud_panel_vote_pos "0.740000 0.690000"
 seta hud_panel_vote_size "0.190000 0.090000"
 seta hud_panel_vote_bg " "
 seta hud_panel_vote_bg_color ""
@@ -203,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 ""
@@ -248,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 ""
@@ -297,13 +304,15 @@ 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.450000 0.855000"
-seta hud_panel_buffs_size "0.050000 0.070000"
+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_buffs_progressbar 1
+seta hud_panel_buffs_progressbar_name "progressbar"
 
 menu_sync