Merge branch 'sev/luma_update' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 30 Apr 2016 07:35:34 +0000 (07:35 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 30 Apr 2016 07:35:34 +0000 (07:35 +0000)
Small luma update

- Remove background color from menu gametype icons,
because the gametype vote dialog now has its own background.
- Slightly revise the shape of the buff icons
- Make the detailed crosshairs (last row) less obtrusive.
- Add new menu background image

See merge request !304

67 files changed:
gfx/crosshair55.tga
gfx/crosshair56.tga
gfx/crosshair57.tga
gfx/crosshair58.tga
gfx/crosshair59.tga
gfx/crosshair60.tga
gfx/crosshair61.tga
gfx/crosshair62.tga
gfx/crosshair63.tga
gfx/crosshair64.tga
gfx/crosshair65.tga
gfx/crosshair66.tga
gfx/hud/default/buff_ammo.tga
gfx/hud/default/buff_bash.tga
gfx/hud/default/buff_blessed.tga
gfx/hud/default/buff_disability.tga
gfx/hud/default/buff_flight.tga
gfx/hud/default/buff_inferno.tga
gfx/hud/default/buff_invisible.tga
gfx/hud/default/buff_jump.tga
gfx/hud/default/buff_luck.tga
gfx/hud/default/buff_magnet.tga
gfx/hud/default/buff_medic.tga
gfx/hud/default/buff_resistance.tga
gfx/hud/default/buff_speed.tga
gfx/hud/default/buff_swapper.tga
gfx/hud/default/buff_vampire.tga
gfx/hud/default/buff_vengeance.tga
gfx/hud/luma/buff_ammo.tga
gfx/hud/luma/buff_bash.tga
gfx/hud/luma/buff_blessed.tga
gfx/hud/luma/buff_disability.tga
gfx/hud/luma/buff_flight.tga
gfx/hud/luma/buff_inferno.tga
gfx/hud/luma/buff_invisible.tga
gfx/hud/luma/buff_jump.tga
gfx/hud/luma/buff_luck.tga
gfx/hud/luma/buff_magnet.tga
gfx/hud/luma/buff_medic.tga
gfx/hud/luma/buff_resistance.tga
gfx/hud/luma/buff_speed.tga
gfx/hud/luma/buff_swapper.tga
gfx/hud/luma/buff_vampire.tga
gfx/hud/luma/buff_vengeance.tga
gfx/menu/luma/background.tga
gfx/menu/luma/background.txt [new file with mode: 0644]
gfx/menu/luma/gametype_as.tga
gfx/menu/luma/gametype_ca.tga
gfx/menu/luma/gametype_ctf.tga
gfx/menu/luma/gametype_cts.tga
gfx/menu/luma/gametype_dm.tga
gfx/menu/luma/gametype_dom.tga
gfx/menu/luma/gametype_duel.tga
gfx/menu/luma/gametype_ft.tga
gfx/menu/luma/gametype_inf.tga
gfx/menu/luma/gametype_inv.tga
gfx/menu/luma/gametype_jb.tga
gfx/menu/luma/gametype_ka.tga
gfx/menu/luma/gametype_kh.tga
gfx/menu/luma/gametype_lms.tga
gfx/menu/luma/gametype_nb.tga
gfx/menu/luma/gametype_ons.tga
gfx/menu/luma/gametype_rc.tga
gfx/menu/luma/gametype_tdm.tga
gfx/menu/luma/gametype_vip.tga
models/relics/sign_luck.tga
models/relics/sign_luck_glow.tga

index 8709b58..ecbcf1f 100644 (file)
Binary files a/gfx/crosshair55.tga and b/gfx/crosshair55.tga differ
index 61adf9a..9cceb82 100644 (file)
Binary files a/gfx/crosshair56.tga and b/gfx/crosshair56.tga differ
index d0d9220..80f54e3 100644 (file)
Binary files a/gfx/crosshair57.tga and b/gfx/crosshair57.tga differ
index 0bdb7f9..e3e784b 100644 (file)
Binary files a/gfx/crosshair58.tga and b/gfx/crosshair58.tga differ
index 8e48aa2..70fbf5e 100644 (file)
Binary files a/gfx/crosshair59.tga and b/gfx/crosshair59.tga differ
index c03e19d..4483975 100644 (file)
Binary files a/gfx/crosshair60.tga and b/gfx/crosshair60.tga differ
index 507853f..3ec893d 100644 (file)
Binary files a/gfx/crosshair61.tga and b/gfx/crosshair61.tga differ
index 54031b1..ea84ee5 100644 (file)
Binary files a/gfx/crosshair62.tga and b/gfx/crosshair62.tga differ
index 1aa5d55..5818a22 100644 (file)
Binary files a/gfx/crosshair63.tga and b/gfx/crosshair63.tga differ
index 06893f8..1911f2d 100644 (file)
Binary files a/gfx/crosshair64.tga and b/gfx/crosshair64.tga differ
index ebf77c3..7205c3a 100644 (file)
Binary files a/gfx/crosshair65.tga and b/gfx/crosshair65.tga differ
index ccba58d..4039e84 100644 (file)
Binary files a/gfx/crosshair66.tga and b/gfx/crosshair66.tga differ
index 379aa24..de3a5fe 100644 (file)
Binary files a/gfx/hud/default/buff_ammo.tga and b/gfx/hud/default/buff_ammo.tga differ
index 556a445..eaf416c 100644 (file)
Binary files a/gfx/hud/default/buff_bash.tga and b/gfx/hud/default/buff_bash.tga differ
index e1fbace..a6e050d 100644 (file)
Binary files a/gfx/hud/default/buff_blessed.tga and b/gfx/hud/default/buff_blessed.tga differ
index f2c49ba..8abb6f6 100644 (file)
Binary files a/gfx/hud/default/buff_disability.tga and b/gfx/hud/default/buff_disability.tga differ
index 7ed8aa0..b0a85cd 100644 (file)
Binary files a/gfx/hud/default/buff_flight.tga and b/gfx/hud/default/buff_flight.tga differ
index 08875a2..11d432a 100644 (file)
Binary files a/gfx/hud/default/buff_inferno.tga and b/gfx/hud/default/buff_inferno.tga differ
index e0e4fed..6bbe648 100644 (file)
Binary files a/gfx/hud/default/buff_invisible.tga and b/gfx/hud/default/buff_invisible.tga differ
index 126a07c..05b519f 100644 (file)
Binary files a/gfx/hud/default/buff_jump.tga and b/gfx/hud/default/buff_jump.tga differ
index 74655cf..288ae07 100644 (file)
Binary files a/gfx/hud/default/buff_luck.tga and b/gfx/hud/default/buff_luck.tga differ
index 85b011d..242fd8e 100644 (file)
Binary files a/gfx/hud/default/buff_magnet.tga and b/gfx/hud/default/buff_magnet.tga differ
index 0792407..4d926d3 100644 (file)
Binary files a/gfx/hud/default/buff_medic.tga and b/gfx/hud/default/buff_medic.tga differ
index f88ea2a..d7e2524 100644 (file)
Binary files a/gfx/hud/default/buff_resistance.tga and b/gfx/hud/default/buff_resistance.tga differ
index 54a65af..b9651ce 100644 (file)
Binary files a/gfx/hud/default/buff_speed.tga and b/gfx/hud/default/buff_speed.tga differ
index c5b97ce..ab9659c 100644 (file)
Binary files a/gfx/hud/default/buff_swapper.tga and b/gfx/hud/default/buff_swapper.tga differ
index 1d60e6b..2bae31b 100644 (file)
Binary files a/gfx/hud/default/buff_vampire.tga and b/gfx/hud/default/buff_vampire.tga differ
index 1da8e7f..5cf9127 100644 (file)
Binary files a/gfx/hud/default/buff_vengeance.tga and b/gfx/hud/default/buff_vengeance.tga differ
index 4f08580..6c789ef 100644 (file)
Binary files a/gfx/hud/luma/buff_ammo.tga and b/gfx/hud/luma/buff_ammo.tga differ
index 05ec43c..c193a15 100644 (file)
Binary files a/gfx/hud/luma/buff_bash.tga and b/gfx/hud/luma/buff_bash.tga differ
index 9ff048e..5e5d2b6 100644 (file)
Binary files a/gfx/hud/luma/buff_blessed.tga and b/gfx/hud/luma/buff_blessed.tga differ
index 8d04da0..b03ea29 100644 (file)
Binary files a/gfx/hud/luma/buff_disability.tga and b/gfx/hud/luma/buff_disability.tga differ
index 1f1e59d..863c39e 100644 (file)
Binary files a/gfx/hud/luma/buff_flight.tga and b/gfx/hud/luma/buff_flight.tga differ
index 1661e3b..e5977f9 100644 (file)
Binary files a/gfx/hud/luma/buff_inferno.tga and b/gfx/hud/luma/buff_inferno.tga differ
index 34adf17..8e65dc4 100644 (file)
Binary files a/gfx/hud/luma/buff_invisible.tga and b/gfx/hud/luma/buff_invisible.tga differ
index a6cd9e0..c8475ac 100644 (file)
Binary files a/gfx/hud/luma/buff_jump.tga and b/gfx/hud/luma/buff_jump.tga differ
index e258e9f..746e9e5 100644 (file)
Binary files a/gfx/hud/luma/buff_luck.tga and b/gfx/hud/luma/buff_luck.tga differ
index e1b1587..0788ee4 100644 (file)
Binary files a/gfx/hud/luma/buff_magnet.tga and b/gfx/hud/luma/buff_magnet.tga differ
index d2b039c..29513b8 100644 (file)
Binary files a/gfx/hud/luma/buff_medic.tga and b/gfx/hud/luma/buff_medic.tga differ
index 0667472..046c22a 100644 (file)
Binary files a/gfx/hud/luma/buff_resistance.tga and b/gfx/hud/luma/buff_resistance.tga differ
index 14ae3c3..ab25069 100644 (file)
Binary files a/gfx/hud/luma/buff_speed.tga and b/gfx/hud/luma/buff_speed.tga differ
index 5cb620c..02ca7b0 100644 (file)
Binary files a/gfx/hud/luma/buff_swapper.tga and b/gfx/hud/luma/buff_swapper.tga differ
index 229c5ad..f214d73 100644 (file)
Binary files a/gfx/hud/luma/buff_vampire.tga and b/gfx/hud/luma/buff_vampire.tga differ
index 64d7468..53842ea 100644 (file)
Binary files a/gfx/hud/luma/buff_vengeance.tga and b/gfx/hud/luma/buff_vengeance.tga differ
index 7497ddc..b5b7623 100644 (file)
Binary files a/gfx/menu/luma/background.tga and b/gfx/menu/luma/background.tga differ
diff --git a/gfx/menu/luma/background.txt b/gfx/menu/luma/background.txt
new file mode 100644 (file)
index 0000000..09a6c8a
--- /dev/null
@@ -0,0 +1,5 @@
+Original photograph of the earth courtesy of the
+Earth Science and Remote Sensing Unit, NASA Johnson Space Center
+
+NASA Photo ID: ISS007-E-10807
+URL: http://eol.jsc.nasa.gov/SearchPhotos/photo.pl?mission=ISS007&roll=E&frame=10807
index 85eda57..9724f40 100644 (file)
Binary files a/gfx/menu/luma/gametype_as.tga and b/gfx/menu/luma/gametype_as.tga differ
index 668b57e..196196e 100644 (file)
Binary files a/gfx/menu/luma/gametype_ca.tga and b/gfx/menu/luma/gametype_ca.tga differ
index 7eb0c8e..eefb2fe 100644 (file)
Binary files a/gfx/menu/luma/gametype_ctf.tga and b/gfx/menu/luma/gametype_ctf.tga differ
index 235da2f..da86fa4 100644 (file)
Binary files a/gfx/menu/luma/gametype_cts.tga and b/gfx/menu/luma/gametype_cts.tga differ
index 0ce1d16..3d0874e 100644 (file)
Binary files a/gfx/menu/luma/gametype_dm.tga and b/gfx/menu/luma/gametype_dm.tga differ
index fcaa2f3..eb6605b 100644 (file)
Binary files a/gfx/menu/luma/gametype_dom.tga and b/gfx/menu/luma/gametype_dom.tga differ
index 8816316..3558725 100644 (file)
Binary files a/gfx/menu/luma/gametype_duel.tga and b/gfx/menu/luma/gametype_duel.tga differ
index 515a3f8..f6228a5 100644 (file)
Binary files a/gfx/menu/luma/gametype_ft.tga and b/gfx/menu/luma/gametype_ft.tga differ
index bcbbd6c..9093837 100644 (file)
Binary files a/gfx/menu/luma/gametype_inf.tga and b/gfx/menu/luma/gametype_inf.tga differ
index bc114f9..d954af1 100644 (file)
Binary files a/gfx/menu/luma/gametype_inv.tga and b/gfx/menu/luma/gametype_inv.tga differ
index 7971be3..e6b35a4 100644 (file)
Binary files a/gfx/menu/luma/gametype_jb.tga and b/gfx/menu/luma/gametype_jb.tga differ
index 3370b5e..38acfc7 100644 (file)
Binary files a/gfx/menu/luma/gametype_ka.tga and b/gfx/menu/luma/gametype_ka.tga differ
index bdca280..df30ff0 100644 (file)
Binary files a/gfx/menu/luma/gametype_kh.tga and b/gfx/menu/luma/gametype_kh.tga differ
index 33e2be7..e14d2a2 100644 (file)
Binary files a/gfx/menu/luma/gametype_lms.tga and b/gfx/menu/luma/gametype_lms.tga differ
index 15d2736..93b021e 100644 (file)
Binary files a/gfx/menu/luma/gametype_nb.tga and b/gfx/menu/luma/gametype_nb.tga differ
index a9a0f17..48a0c5a 100644 (file)
Binary files a/gfx/menu/luma/gametype_ons.tga and b/gfx/menu/luma/gametype_ons.tga differ
index 10d7e41..a032042 100644 (file)
Binary files a/gfx/menu/luma/gametype_rc.tga and b/gfx/menu/luma/gametype_rc.tga differ
index 289641e..3a6c092 100644 (file)
Binary files a/gfx/menu/luma/gametype_tdm.tga and b/gfx/menu/luma/gametype_tdm.tga differ
index 2c9eccc..8a8f7d9 100644 (file)
Binary files a/gfx/menu/luma/gametype_vip.tga and b/gfx/menu/luma/gametype_vip.tga differ
index 77048ee..a9936b9 100644 (file)
Binary files a/models/relics/sign_luck.tga and b/models/relics/sign_luck.tga differ
index d046ce1..d023c14 100644 (file)
Binary files a/models/relics/sign_luck_glow.tga and b/models/relics/sign_luck_glow.tga differ