Update luma HUD config and HUD panel border images

diff --git a/gfx/hud/luma/ammo_current_bg.tga b/gfx/hud/luma/ammo_current_bg.tga
index a5b2bbb4098a876a0e03a587f1b53f9c24d01268..4e7901ebc6df9c05b746be82dd6a9fd51631281b 100644 (file)
Binary files a/gfx/hud/luma/ammo_current_bg.tga and b/gfx/hud/luma/ammo_current_bg.tga differ

diff --git a/gfx/hud/luma/ammo_current_bg_east.tga b/gfx/hud/luma/ammo_current_bg_east.tga
deleted file mode 100644 (file)
index 67733f7..0000000
Binary files a/gfx/hud/luma/ammo_current_bg_east.tga and /dev/null differ

diff --git a/gfx/hud/luma/ammo_current_bg_north.tga b/gfx/hud/luma/ammo_current_bg_north.tga
deleted file mode 100644 (file)
index 13c20ae..0000000
Binary files a/gfx/hud/luma/ammo_current_bg_north.tga and /dev/null differ

diff --git a/gfx/hud/luma/ammo_current_bg_west.tga b/gfx/hud/luma/ammo_current_bg_west.tga
deleted file mode 100644 (file)
index 4bd89f2..0000000
Binary files a/gfx/hud/luma/ammo_current_bg_west.tga and /dev/null differ

diff --git a/gfx/hud/luma/border_corner_northeast.tga b/gfx/hud/luma/border_corner_northeast.tga
index 7c7b997ac29fa2556a521069c8d9684c5868068c..24437df863790a49630441c41e7abe2c90ee458d 100644 (file)
Binary files a/gfx/hud/luma/border_corner_northeast.tga and b/gfx/hud/luma/border_corner_northeast.tga differ

diff --git a/gfx/hud/luma/border_corner_northwest.tga b/gfx/hud/luma/border_corner_northwest.tga
index 61e04e8e7a7a24bb574a6b6a82c835e2e42fe065..c270d5ac0f8e6c547b3bb40e77897ccf32f8f266 100644 (file)
Binary files a/gfx/hud/luma/border_corner_northwest.tga and b/gfx/hud/luma/border_corner_northwest.tga differ

diff --git a/gfx/hud/luma/border_corner_southeast.tga b/gfx/hud/luma/border_corner_southeast.tga
index 759956217ccc3a44f01c3844de4cc6eaf1cb0eb9..521aceb59329bafd664df2c7544d7cd64271eac3 100644 (file)
Binary files a/gfx/hud/luma/border_corner_southeast.tga and b/gfx/hud/luma/border_corner_southeast.tga differ

diff --git a/gfx/hud/luma/border_corner_southwest.tga b/gfx/hud/luma/border_corner_southwest.tga
index d7502609f2f05f07b38c69f9064fff5a31d5ec5b..99ddc9d0ae963b28c08063e205af40db2b3a9dd9 100644 (file)
Binary files a/gfx/hud/luma/border_corner_southwest.tga and b/gfx/hud/luma/border_corner_southwest.tga differ

diff --git a/gfx/hud/luma/border_default.tga b/gfx/hud/luma/border_default.tga
index ac3bf1e390027b3e403321268fc953e0570f8444..35dc0bb0ec96fda40a3e81dcc0a72ff21cc625c9 100644 (file)
Binary files a/gfx/hud/luma/border_default.tga and b/gfx/hud/luma/border_default.tga differ

diff --git a/gfx/hud/luma/border_default_east.tga b/gfx/hud/luma/border_default_east.tga
index ea5ba1b793bc8e73852f40615b8332000f8d608a..e14fe2685a862fc5ada2370ea8f95957181d81e1 100644 (file)
Binary files a/gfx/hud/luma/border_default_east.tga and b/gfx/hud/luma/border_default_east.tga differ

diff --git a/gfx/hud/luma/border_default_north.tga b/gfx/hud/luma/border_default_north.tga
index 3bf10ad8b2fc3a14f3ba1346c7267b080d1e8aad..dd4e7ea28bb2f1f8de508915591a177eec7c088a 100644 (file)
Binary files a/gfx/hud/luma/border_default_north.tga and b/gfx/hud/luma/border_default_north.tga differ

diff --git a/gfx/hud/luma/border_default_south.tga b/gfx/hud/luma/border_default_south.tga
index 612beb68d83bfa6debd02537ddf3cc1f00ef2967..365ae08ee351e5b65a6034e8876fd737dd51c223 100644 (file)
Binary files a/gfx/hud/luma/border_default_south.tga and b/gfx/hud/luma/border_default_south.tga differ

diff --git a/gfx/hud/luma/border_default_west.tga b/gfx/hud/luma/border_default_west.tga
index 7b597e3e24946092c50dfbafbb4e3bde7595189b..39ba91fd689cdaa4d5581eae2c06f57137f8690b 100644 (file)
Binary files a/gfx/hud/luma/border_default_west.tga and b/gfx/hud/luma/border_default_west.tga differ

diff --git a/gfx/hud/luma/border_fading_east.tga b/gfx/hud/luma/border_fading_east.tga
index c79ea55fa75b4aed3abdfef9021a9c486e1079d8..1e37f16f75f77a24037129c312d2a3ae8e1e192a 100644 (file)
Binary files a/gfx/hud/luma/border_fading_east.tga and b/gfx/hud/luma/border_fading_east.tga differ

diff --git a/gfx/hud/luma/border_fading_north.tga b/gfx/hud/luma/border_fading_north.tga
index 523247553ad56090542209ced2e3ee2a8c6cad91..fa4610385293c892813533fe1038ac7ae930864e 100644 (file)
Binary files a/gfx/hud/luma/border_fading_north.tga and b/gfx/hud/luma/border_fading_north.tga differ

diff --git a/gfx/hud/luma/border_fading_south.tga b/gfx/hud/luma/border_fading_south.tga
index a22a2030fc482fc632e55c5b1d0d6388d9f4f366..b14ac694153370155904b396d2bb08cf6741674f 100644 (file)
Binary files a/gfx/hud/luma/border_fading_south.tga and b/gfx/hud/luma/border_fading_south.tga differ

diff --git a/gfx/hud/luma/border_fading_west.tga b/gfx/hud/luma/border_fading_west.tga
index cfea143e3fc1e615a6ad5b41141e8c206e2c738b..cbf0de13d0974c05b5cfe53103c0322ecd1b6bb4 100644 (file)
Binary files a/gfx/hud/luma/border_fading_west.tga and b/gfx/hud/luma/border_fading_west.tga differ

diff --git a/gfx/hud/luma/border_highlighted.tga b/gfx/hud/luma/border_highlighted.tga
deleted file mode 100644 (file)
index a44034a..0000000
Binary files a/gfx/hud/luma/border_highlighted.tga and /dev/null differ

diff --git a/gfx/hud/luma/border_highlighted2.tga b/gfx/hud/luma/border_highlighted2.tga
deleted file mode 100644 (file)
index eba1932..0000000
Binary files a/gfx/hud/luma/border_highlighted2.tga and /dev/null differ

diff --git a/gfx/hud/luma/border_plain.tga b/gfx/hud/luma/border_plain.tga
new file mode 100644 (file)
index 0000000..1b7b666
Binary files /dev/null and b/gfx/hud/luma/border_plain.tga differ

diff --git a/gfx/hud/luma/border_plain_east.tga b/gfx/hud/luma/border_plain_east.tga
new file mode 100644 (file)
index 0000000..7daf12c
Binary files /dev/null and b/gfx/hud/luma/border_plain_east.tga differ

diff --git a/gfx/hud/luma/border_plain_north.tga b/gfx/hud/luma/border_plain_north.tga
new file mode 100644 (file)
index 0000000..9aacb19
Binary files /dev/null and b/gfx/hud/luma/border_plain_north.tga differ

diff --git a/gfx/hud/luma/border_plain_south.tga b/gfx/hud/luma/border_plain_south.tga
new file mode 100644 (file)
index 0000000..342ee3b
Binary files /dev/null and b/gfx/hud/luma/border_plain_south.tga differ

diff --git a/gfx/hud/luma/border_plain_west.tga b/gfx/hud/luma/border_plain_west.tga
new file mode 100644 (file)
index 0000000..a413b39
Binary files /dev/null and b/gfx/hud/luma/border_plain_west.tga differ

diff --git a/gfx/hud/luma/border_small.tga b/gfx/hud/luma/border_small.tga
deleted file mode 100644 (file)
index fb7f32a..0000000
Binary files a/gfx/hud/luma/border_small.tga and /dev/null differ

diff --git a/gfx/hud/luma/border_small_east.tga b/gfx/hud/luma/border_small_east.tga
deleted file mode 100644 (file)
index 7d2855a..0000000
Binary files a/gfx/hud/luma/border_small_east.tga and /dev/null differ

diff --git a/gfx/hud/luma/border_small_north.tga b/gfx/hud/luma/border_small_north.tga
deleted file mode 100644 (file)
index e33a01d..0000000
Binary files a/gfx/hud/luma/border_small_north.tga and /dev/null differ

diff --git a/gfx/hud/luma/border_small_south.tga b/gfx/hud/luma/border_small_south.tga
deleted file mode 100644 (file)
index 56d7940..0000000
Binary files a/gfx/hud/luma/border_small_south.tga and /dev/null differ

diff --git a/gfx/hud/luma/border_small_west.tga b/gfx/hud/luma/border_small_west.tga
deleted file mode 100644 (file)
index 01aa178..0000000
Binary files a/gfx/hud/luma/border_small_west.tga and /dev/null differ

diff --git a/gfx/hud/luma/border_tab_east.tga b/gfx/hud/luma/border_tab_east.tga
new file mode 100644 (file)
index 0000000..974fb6b
Binary files /dev/null and b/gfx/hud/luma/border_tab_east.tga differ

diff --git a/gfx/hud/luma/border_tab_north.tga b/gfx/hud/luma/border_tab_north.tga
new file mode 100644 (file)
index 0000000..62e3793
Binary files /dev/null and b/gfx/hud/luma/border_tab_north.tga differ

diff --git a/gfx/hud/luma/border_tab_south.tga b/gfx/hud/luma/border_tab_south.tga
new file mode 100644 (file)
index 0000000..c6212d5
Binary files /dev/null and b/gfx/hud/luma/border_tab_south.tga differ

diff --git a/gfx/hud/luma/border_tab_west.tga b/gfx/hud/luma/border_tab_west.tga
new file mode 100644 (file)
index 0000000..007efa8
Binary files /dev/null and b/gfx/hud/luma/border_tab_west.tga differ

diff --git a/gfx/hud/luma/weapon_ammo.tga b/gfx/hud/luma/weapon_ammo.tga
index c85d7256d2aff618f79f92b2117257ac2f82db87..0a688f71dc47cbf0266065ca5fa60d484d10238e 100644 (file)
Binary files a/gfx/hud/luma/weapon_ammo.tga and b/gfx/hud/luma/weapon_ammo.tga differ

diff --git a/gfx/hud/luma/weapon_ammo_north.tga b/gfx/hud/luma/weapon_ammo_north.tga
deleted file mode 100644 (file)
index 75d6bdd..0000000
Binary files a/gfx/hud/luma/weapon_ammo_north.tga and /dev/null differ

diff --git a/gfx/hud/luma/weapon_ammo_south.tga b/gfx/hud/luma/weapon_ammo_south.tga
deleted file mode 100644 (file)
index 2568932..0000000
Binary files a/gfx/hud/luma/weapon_ammo_south.tga and /dev/null differ

diff --git a/gfx/hud/luma/weapon_ammo_west.tga b/gfx/hud/luma/weapon_ammo_west.tga
deleted file mode 100644 (file)
index 75558eb..0000000
Binary files a/gfx/hud/luma/weapon_ammo_west.tga and /dev/null differ

diff --git a/hud_luma.cfg b/hud_luma.cfg
index 2eca6706ad80830c8a642ee47499bf8a378e2e16..a430f3b31fb6413c0b61d45a0450e8ccd9d7224c 100644 (file)
--- a/hud_luma.cfg
+++ b/hud_luma.cfg
@@ -31,8 +31,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.085000"
+seta hud_panel_weapons_size "0.035000 0.850000"
 seta hud_panel_weapons_bg "border_default_east"
 seta hud_panel_weapons_bg_color ""
 seta hud_panel_weapons_bg_color_team ""
@@ -48,8 +48,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"
@@ -61,17 +61,17 @@ seta hud_panel_weapons_timeout_speed_out "0.75"
 seta hud_panel_weapons_onlyowned "1"
 
 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.330000 0.865000"
+seta hud_panel_ammo_size "0.340000 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.7"
-seta hud_panel_ammo_noncurrent_scale "1"
+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"
@@ -79,17 +79,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 0.270000"
+seta hud_panel_powerups_size "0.040000 0.415000"
+seta hud_panel_powerups_bg "border_default_west"
 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_flip "1"
-seta hud_panel_powerups_iconalign "3"
-seta hud_panel_powerups_baralign "3"
+seta hud_panel_powerups_iconalign "1"
+seta hud_panel_powerups_baralign "1"
 seta hud_panel_powerups_progressbar "1"
 seta hud_panel_powerups_progressbar_strength "progressbar"
 seta hud_panel_powerups_progressbar_shield "progressbar"
@@ -97,9 +97,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 ""
@@ -116,8 +116,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 ""
@@ -131,9 +131,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 ""
@@ -181,7 +181,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 ""
@@ -299,8 +299,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.450000 0.855000"
-seta hud_panel_buffs_size "0.050000 0.070000"
+seta hud_panel_buffs_pos "0.435000 0.840000"
+seta hud_panel_buffs_size "0.125000 0.035000"
 seta hud_panel_buffs_bg "0"
 seta hud_panel_buffs_bg_color ""
 seta hud_panel_buffs_bg_color_team ""