]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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 8709b58ccac52e006f6989f6b0248ad0c5ae3585..ecbcf1fa58688c78a93ea2bdabf6b7196411ac97 100644 (file)
Binary files a/gfx/crosshair55.tga and b/gfx/crosshair55.tga differ
index 61adf9a6ee1324786efdd47978b4db03696ebbe2..9cceb82f54cf69d768008855153eef64b6dc0077 100644 (file)
Binary files a/gfx/crosshair56.tga and b/gfx/crosshair56.tga differ
index d0d922084fcc7cbd59aad641b5dc677126cdd009..80f54e31228fdc888412fcdebc6b34188b56d83a 100644 (file)
Binary files a/gfx/crosshair57.tga and b/gfx/crosshair57.tga differ
index 0bdb7f9963c00bc2cdf2ca7aba56bcfd25e9c4d2..e3e784b85e5c3ee77d0e7910e70a85ba23cfb6b8 100644 (file)
Binary files a/gfx/crosshair58.tga and b/gfx/crosshair58.tga differ
index 8e48aa2b1b33c0963385ecaab9b718784b8782ae..70fbf5e7d5391c51dcf2e99ba40768f61e0e4ff5 100644 (file)
Binary files a/gfx/crosshair59.tga and b/gfx/crosshair59.tga differ
index c03e19d2a45b86fed340c5c6401e6ef0b8e535a1..44839755e4af4b773275146527973c2065c2e0fd 100644 (file)
Binary files a/gfx/crosshair60.tga and b/gfx/crosshair60.tga differ
index 507853f77a3f4ae702f97d275cd50d2047a1b832..3ec893d8144980490b75241bf7f0a487f6218984 100644 (file)
Binary files a/gfx/crosshair61.tga and b/gfx/crosshair61.tga differ
index 54031b1dc12c809ab7e585be1a89a76f4b2f14e0..ea84ee5f177810020a77ddd164174143c8491572 100644 (file)
Binary files a/gfx/crosshair62.tga and b/gfx/crosshair62.tga differ
index 1aa5d55d2ffc0588203f31569ec2b555853eb69f..5818a22cb51a5a6601442452c50a4405a7532c71 100644 (file)
Binary files a/gfx/crosshair63.tga and b/gfx/crosshair63.tga differ
index 06893f80794aa479672f070ac902fd8556915c8b..1911f2d0d514c63f49264a366455a2f2e0f44745 100644 (file)
Binary files a/gfx/crosshair64.tga and b/gfx/crosshair64.tga differ
index ebf77c35b3888e750f2c227d864d7f4b2f8e6baa..7205c3af64ebaafab09d6f064bb32a10ab103541 100644 (file)
Binary files a/gfx/crosshair65.tga and b/gfx/crosshair65.tga differ
index ccba58dba0d39ad703d8c86e4578b0efbfa45438..4039e8435917d0301ba17b2b2e8bc48dc7a64619 100644 (file)
Binary files a/gfx/crosshair66.tga and b/gfx/crosshair66.tga differ
index 379aa24a221a667f98b5993b3bb9b9a376681b2f..de3a5fefe1410bb69fb0006fed530ed2f1b18a6f 100644 (file)
Binary files a/gfx/hud/default/buff_ammo.tga and b/gfx/hud/default/buff_ammo.tga differ
index 556a445bf12f31519cfaad3ef814c572d3aefa89..eaf416cf77bb6f633de1bdbd1d296eaffea2a1f9 100644 (file)
Binary files a/gfx/hud/default/buff_bash.tga and b/gfx/hud/default/buff_bash.tga differ
index e1fbace3723204bac11552aff8938973f6accfcc..a6e050de107ed6b32833a09042d9e4266d2fc81f 100644 (file)
Binary files a/gfx/hud/default/buff_blessed.tga and b/gfx/hud/default/buff_blessed.tga differ
index f2c49ba2285d969e68c62e1ebf038ba3c9a330a0..8abb6f65b6b8878883dbc6a80a23aa2554804e57 100644 (file)
Binary files a/gfx/hud/default/buff_disability.tga and b/gfx/hud/default/buff_disability.tga differ
index 7ed8aa07a6800ec9c09e0b4fad097f727e2abe27..b0a85cd49e253ed35641855129a3ec9671539bba 100644 (file)
Binary files a/gfx/hud/default/buff_flight.tga and b/gfx/hud/default/buff_flight.tga differ
index 08875a217af9399c8110c0d1a0af0d1d781c0cc1..11d432a6fd404081b3f570fdf01c49b836b502fe 100644 (file)
Binary files a/gfx/hud/default/buff_inferno.tga and b/gfx/hud/default/buff_inferno.tga differ
index e0e4fed0c9ec03d8bef0458861ee560f9ad77395..6bbe648a4e28c0a9b6e2973f39a1737ef6b02074 100644 (file)
Binary files a/gfx/hud/default/buff_invisible.tga and b/gfx/hud/default/buff_invisible.tga differ
index 126a07cdae80c1a038e187edc54f5ab50b101336..05b519fa0a531968278a9e13b35007d08b8af9cf 100644 (file)
Binary files a/gfx/hud/default/buff_jump.tga and b/gfx/hud/default/buff_jump.tga differ
index 74655cfb91780cc9bc554b38e69aa28f9a96a4db..288ae074f33c9d230f3f6486905ab47c1b56f452 100644 (file)
Binary files a/gfx/hud/default/buff_luck.tga and b/gfx/hud/default/buff_luck.tga differ
index 85b011d68e9894fbac37146d32ead5496cad369a..242fd8ea366c5c6f32bb9d9318d66b76c81a4477 100644 (file)
Binary files a/gfx/hud/default/buff_magnet.tga and b/gfx/hud/default/buff_magnet.tga differ
index 0792407ad20dbb0752d190bda849f54de83bc1c5..4d926d36f557de5fc5c3d4fbf77f6648055f4f92 100644 (file)
Binary files a/gfx/hud/default/buff_medic.tga and b/gfx/hud/default/buff_medic.tga differ
index f88ea2a9ba94f97247f42307e933a077342a79c4..d7e2524b1bb11ed0d111deb62f3ec22d17472958 100644 (file)
Binary files a/gfx/hud/default/buff_resistance.tga and b/gfx/hud/default/buff_resistance.tga differ
index 54a65af38c07a975d1b64e3a0e0b0d600350b5cb..b9651ce304dfe4f4998955de8ff8316ab0912b8a 100644 (file)
Binary files a/gfx/hud/default/buff_speed.tga and b/gfx/hud/default/buff_speed.tga differ
index c5b97ceb0ee9748d8eeb3db8a228ab1cb0cd25e8..ab9659c0b6f5d2166b3cb4a035d1b6ceb11aebeb 100644 (file)
Binary files a/gfx/hud/default/buff_swapper.tga and b/gfx/hud/default/buff_swapper.tga differ
index 1d60e6b8628fc5e0b59f8655a394a6a23e7bd545..2bae31b01b784001b8986515dc623cef52d1d106 100644 (file)
Binary files a/gfx/hud/default/buff_vampire.tga and b/gfx/hud/default/buff_vampire.tga differ
index 1da8e7fc32fb371b940a58d15f5253b18fe26039..5cf9127d4b115f5a88d72865f1974004034a2464 100644 (file)
Binary files a/gfx/hud/default/buff_vengeance.tga and b/gfx/hud/default/buff_vengeance.tga differ
index 4f085801eedaeaf5770b4aec58871b27bfbfc42e..6c789ef42bb732ecc42405155935950fc594ec80 100644 (file)
Binary files a/gfx/hud/luma/buff_ammo.tga and b/gfx/hud/luma/buff_ammo.tga differ
index 05ec43c62b7bd39be402fa8cfe590b8295e344db..c193a1565b7f0805202d2b7da4a402ab8c1fe652 100644 (file)
Binary files a/gfx/hud/luma/buff_bash.tga and b/gfx/hud/luma/buff_bash.tga differ
index 9ff048e4bf1f66f3813b45fa4ca7d83826623d0f..5e5d2b6960e681ba093a26724204847f3c4794be 100644 (file)
Binary files a/gfx/hud/luma/buff_blessed.tga and b/gfx/hud/luma/buff_blessed.tga differ
index 8d04da05cc2ae55b00fd8bb453285504835e160c..b03ea298167291eec849be2e482867eef98a7883 100644 (file)
Binary files a/gfx/hud/luma/buff_disability.tga and b/gfx/hud/luma/buff_disability.tga differ
index 1f1e59d24745bdd0e8ddee63a2666e6a46d0ab63..863c39ebdb02e864ab9bc6bfe84c7b3aec2836ed 100644 (file)
Binary files a/gfx/hud/luma/buff_flight.tga and b/gfx/hud/luma/buff_flight.tga differ
index 1661e3bbf9611e4055da82660108b50761631b71..e5977f985afad1edd45dbf1d1c91659845604eea 100644 (file)
Binary files a/gfx/hud/luma/buff_inferno.tga and b/gfx/hud/luma/buff_inferno.tga differ
index 34adf173c873ad90d4784961c47ea8ca98fbe086..8e65dc48101d0080af13acc4b506036bc27fcaf0 100644 (file)
Binary files a/gfx/hud/luma/buff_invisible.tga and b/gfx/hud/luma/buff_invisible.tga differ
index a6cd9e0271ff7b05fd3126d2fbea2369cf57bbb9..c8475ac0706764ddb2613c8fd7ad465828e2d0f6 100644 (file)
Binary files a/gfx/hud/luma/buff_jump.tga and b/gfx/hud/luma/buff_jump.tga differ
index e258e9f5141b5dcb2a1fea97b379e3031eb0112f..746e9e5bb10ebf624dd5f92a76cfa6e72a8a5a8b 100644 (file)
Binary files a/gfx/hud/luma/buff_luck.tga and b/gfx/hud/luma/buff_luck.tga differ
index e1b1587d753e69f367df47018276756ba8f61aa4..0788ee47f45cf5a192048f9a2b4294aa2bbada19 100644 (file)
Binary files a/gfx/hud/luma/buff_magnet.tga and b/gfx/hud/luma/buff_magnet.tga differ
index d2b039c02f9cd4dee4d50f7963724f1c857c5649..29513b80165b3f69dea2384fc36aa6bc1699649a 100644 (file)
Binary files a/gfx/hud/luma/buff_medic.tga and b/gfx/hud/luma/buff_medic.tga differ
index 066747287587aeb7a017aaa31f05d3a3ff9c21bf..046c22a9165a527277bed28139ef02312191ea93 100644 (file)
Binary files a/gfx/hud/luma/buff_resistance.tga and b/gfx/hud/luma/buff_resistance.tga differ
index 14ae3c37669f8fa58e11326aaf4f9632276e19f5..ab2506974c74696df535e48713c7fbdcc43a152a 100644 (file)
Binary files a/gfx/hud/luma/buff_speed.tga and b/gfx/hud/luma/buff_speed.tga differ
index 5cb620c8607df6281b8ea63df2b66d537bcbb6aa..02ca7b02f368f6fc1fb27676e8cadd99b2d5f561 100644 (file)
Binary files a/gfx/hud/luma/buff_swapper.tga and b/gfx/hud/luma/buff_swapper.tga differ
index 229c5adcc2bbcc6d71d24a6828ade2374b165f33..f214d733575da9409a8925df7176c336fce0649f 100644 (file)
Binary files a/gfx/hud/luma/buff_vampire.tga and b/gfx/hud/luma/buff_vampire.tga differ
index 64d7468a61b583b1a1d42522ec1b74b81c626be3..53842ea589ddeb10d895efe161546e4743f64080 100644 (file)
Binary files a/gfx/hud/luma/buff_vengeance.tga and b/gfx/hud/luma/buff_vengeance.tga differ
index 7497ddc52b928aa2da40ed85118a8953ed86257c..b5b7623b1c405017c7d1616a4a10679f852bfb11 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 85eda570f90efc1ef44b0e3e3a9cf66dc5d48d80..9724f4049782003d45d38640f2db83d01447c717 100644 (file)
Binary files a/gfx/menu/luma/gametype_as.tga and b/gfx/menu/luma/gametype_as.tga differ
index 668b57e047cb480521ba6c97746b50f2bc96796c..196196e5ecd984d8c09e5f87a6036f0a157fc01b 100644 (file)
Binary files a/gfx/menu/luma/gametype_ca.tga and b/gfx/menu/luma/gametype_ca.tga differ
index 7eb0c8e171a76c6b913780672e81f2727a550a78..eefb2fe0b547d40627a159400a52ec55fbb69b86 100644 (file)
Binary files a/gfx/menu/luma/gametype_ctf.tga and b/gfx/menu/luma/gametype_ctf.tga differ
index 235da2f1665f25a8f50602d7f737671099de5372..da86fa4faf0e27bd33a85a84fc80098bfc534d0f 100644 (file)
Binary files a/gfx/menu/luma/gametype_cts.tga and b/gfx/menu/luma/gametype_cts.tga differ
index 0ce1d16fa52e9b57888acacd40b5f5f615ac3b84..3d0874ead11edefab9c321165bfa0c802d4a2c12 100644 (file)
Binary files a/gfx/menu/luma/gametype_dm.tga and b/gfx/menu/luma/gametype_dm.tga differ
index fcaa2f3ab239ec57f9607104c0bf3613630763f5..eb6605b5b3db89f84af354e07c7d88538a3986e4 100644 (file)
Binary files a/gfx/menu/luma/gametype_dom.tga and b/gfx/menu/luma/gametype_dom.tga differ
index 88163164c564a0658723cfcec0c262176865b839..3558725a542264919c9bf01d0b82b2bcab56b942 100644 (file)
Binary files a/gfx/menu/luma/gametype_duel.tga and b/gfx/menu/luma/gametype_duel.tga differ
index 515a3f870050417bf67baeb5dc9c0543b61ece69..f6228a5106a1fdfa9fe4013e63e63e7c2e629b0f 100644 (file)
Binary files a/gfx/menu/luma/gametype_ft.tga and b/gfx/menu/luma/gametype_ft.tga differ
index bcbbd6c3cf797a3779e9bfbc26719251011c1f37..90938379725a60b477a751d3ea770965673d2879 100644 (file)
Binary files a/gfx/menu/luma/gametype_inf.tga and b/gfx/menu/luma/gametype_inf.tga differ
index bc114f9b55078c41bae9380e57f5e600619b24a7..d954af1ebc99a0e6c6b94a665f79362f6ac08d02 100644 (file)
Binary files a/gfx/menu/luma/gametype_inv.tga and b/gfx/menu/luma/gametype_inv.tga differ
index 7971be376f9928cfd6d225ae7291c912d2e601d5..e6b35a4e1c40f2ef36b49876ac088901086388db 100644 (file)
Binary files a/gfx/menu/luma/gametype_jb.tga and b/gfx/menu/luma/gametype_jb.tga differ
index 3370b5e59b806c3c9d713daf2948e94a46e7c992..38acfc705e989236e7bbe6e259b985cd0017b289 100644 (file)
Binary files a/gfx/menu/luma/gametype_ka.tga and b/gfx/menu/luma/gametype_ka.tga differ
index bdca280501a6f26d0e3371fd1bd7be6edecdc2ca..df30ff0ea18f5630c3e1f1a3247bc11dcbc39555 100644 (file)
Binary files a/gfx/menu/luma/gametype_kh.tga and b/gfx/menu/luma/gametype_kh.tga differ
index 33e2be70d4fffaf88f80fc8ce9f2c88820010912..e14d2a2f9bb58407b2d328c12322cf8ae6e032f5 100644 (file)
Binary files a/gfx/menu/luma/gametype_lms.tga and b/gfx/menu/luma/gametype_lms.tga differ
index 15d273634fa1caa6a8471eeaae9370f422e456e3..93b021e4555aacef4889d76b5384addc99715edc 100644 (file)
Binary files a/gfx/menu/luma/gametype_nb.tga and b/gfx/menu/luma/gametype_nb.tga differ
index a9a0f175249d02aa1d8752032a01e60e9a989ff1..48a0c5a13a37e5ce40de8579fb2f3c0b8d302ecd 100644 (file)
Binary files a/gfx/menu/luma/gametype_ons.tga and b/gfx/menu/luma/gametype_ons.tga differ
index 10d7e41ed0e360f258c49cffdb050e1815e1b792..a03204238f00dfe439f0b62fc8bbf991a9a4d879 100644 (file)
Binary files a/gfx/menu/luma/gametype_rc.tga and b/gfx/menu/luma/gametype_rc.tga differ
index 289641e902e5f5787982fec84a8f267c50fba78d..3a6c0922f4b047a54f7137e430f499745032aedd 100644 (file)
Binary files a/gfx/menu/luma/gametype_tdm.tga and b/gfx/menu/luma/gametype_tdm.tga differ
index 2c9eccc26349f1aaae5b8d269d06330feb2ba3bc..8a8f7d984d9ca4e25cae4a32082aa0455557727c 100644 (file)
Binary files a/gfx/menu/luma/gametype_vip.tga and b/gfx/menu/luma/gametype_vip.tga differ
index 77048eef75e08a246176019d9df17c9239ce93ba..a9936b99e0e9fe17bf1c5bfecb06da31d5631233 100644 (file)
Binary files a/models/relics/sign_luck.tga and b/models/relics/sign_luck.tga differ
index d046ce1ad72f2923c9b0d558653ec98e9b9e06cb..d023c14c0b09524b5924bf5f42840ae11a469947 100644 (file)
Binary files a/models/relics/sign_luck_glow.tga and b/models/relics/sign_luck_glow.tga differ