From: Severin Meyer Date: Tue, 20 Jan 2015 22:16:19 +0000 (+0100) Subject: Update luma HUD config and HUD panel border images X-Git-Tag: xonotic-v0.8.1~144^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4e4032cf0c047060686a1def7438bf416b2fbad9;p=xonotic%2Fxonotic-data.pk3dir.git 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 a5b2bbb40..4e7901ebc 100644 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 index 67733f79a..000000000 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 index 13c20ae96..000000000 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 index 4bd89f29f..000000000 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 7c7b997ac..24437df86 100644 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 61e04e8e7..c270d5ac0 100644 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 759956217..521aceb59 100644 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 d7502609f..99ddc9d0a 100644 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 ac3bf1e39..35dc0bb0e 100644 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 ea5ba1b79..e14fe2685 100644 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 3bf10ad8b..dd4e7ea28 100644 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 612beb68d..365ae08ee 100644 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 7b597e3e2..39ba91fd6 100644 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 c79ea55fa..1e37f16f7 100644 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 523247553..fa4610385 100644 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 a22a2030f..b14ac6941 100644 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 cfea143e3..cbf0de13d 100644 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 index a44034ae9..000000000 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 index eba1932c8..000000000 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 index 000000000..1b7b66678 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 index 000000000..7daf12c8a 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 index 000000000..9aacb1917 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 index 000000000..342ee3b6f 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 index 000000000..a413b39d2 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 index fb7f32ae1..000000000 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 index 7d2855a95..000000000 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 index e33a01dc7..000000000 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 index 56d79409a..000000000 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 index 01aa17875..000000000 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 index 000000000..974fb6bb8 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 index 000000000..62e379306 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 index 000000000..c6212d5a8 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 index 000000000..007efa8ed 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 c85d7256d..0a688f71d 100644 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 index 75d6bdd12..000000000 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 index 2568932ec..000000000 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 index 75558eb53..000000000 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 2eca6706a..a430f3b31 100644 --- 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 ""