Merge branch 'sev/luma_itemstime' into 'master'

Small icon updates for itemstime panel

I made a few revisions after the merge of the itemstime panel:

- Because HUD icons are inherited from the default theme, it is unnecessary to add identical icons to the luminos theme.
So I removed them to save some space.

- There already are icons for the strength and shield powerups, it is redundant to add second versions.
However, the quality of the new icons is a lot better than the old ones, so I moved
`default/item_shield` and `default/item_strength` to `default/shield` and `default/strength`.

- To match these new powerup icons, I updated the buff and superweapons icons.

- I added new icons to the Luma theme.

See merge request !169

diff --git a/gfx/hud/default/buff_ammo.tga b/gfx/hud/default/buff_ammo.tga
index 3f4b32d0ff6960620070ba2feb08738d56148b19..379aa24a221a667f98b5993b3bb9b9a376681b2f 100644 (file)
Binary files a/gfx/hud/default/buff_ammo.tga and b/gfx/hud/default/buff_ammo.tga differ

diff --git a/gfx/hud/default/buff_bash.tga b/gfx/hud/default/buff_bash.tga
index 543577c64db82ab07a15111b4acfa64d0e8378ac..556a445bf12f31519cfaad3ef814c572d3aefa89 100644 (file)
Binary files a/gfx/hud/default/buff_bash.tga and b/gfx/hud/default/buff_bash.tga differ

diff --git a/gfx/hud/default/buff_blessed.tga b/gfx/hud/default/buff_blessed.tga
index e0af2e28c1216294b25718d2f61b0ff9bc4abb9d..e1fbace3723204bac11552aff8938973f6accfcc 100644 (file)
Binary files a/gfx/hud/default/buff_blessed.tga and b/gfx/hud/default/buff_blessed.tga differ

diff --git a/gfx/hud/default/buff_disability.tga b/gfx/hud/default/buff_disability.tga
index fff4d81946e85bfe450ced96af44e48cbf19e99e..f2c49ba2285d969e68c62e1ebf038ba3c9a330a0 100644 (file)
Binary files a/gfx/hud/default/buff_disability.tga and b/gfx/hud/default/buff_disability.tga differ

diff --git a/gfx/hud/default/buff_flight.tga b/gfx/hud/default/buff_flight.tga
index 7a76175af719169b1936ec0ad0a802b621e14dc3..7ed8aa07a6800ec9c09e0b4fad097f727e2abe27 100644 (file)
Binary files a/gfx/hud/default/buff_flight.tga and b/gfx/hud/default/buff_flight.tga differ

diff --git a/gfx/hud/default/buff_inferno.tga b/gfx/hud/default/buff_inferno.tga
index 76c3d0c38bf630de3c7b81572d80e80d14e4c6ee..08875a217af9399c8110c0d1a0af0d1d781c0cc1 100644 (file)
Binary files a/gfx/hud/default/buff_inferno.tga and b/gfx/hud/default/buff_inferno.tga differ

diff --git a/gfx/hud/default/buff_invisible.tga b/gfx/hud/default/buff_invisible.tga
index edd00a9ebb91de82a059906d5ec0209eeecf5e29..e0e4fed0c9ec03d8bef0458861ee560f9ad77395 100644 (file)
Binary files a/gfx/hud/default/buff_invisible.tga and b/gfx/hud/default/buff_invisible.tga differ

diff --git a/gfx/hud/default/buff_jump.tga b/gfx/hud/default/buff_jump.tga
index 810764a822410e5f4528be8a378a63e9bbae7c4f..126a07cdae80c1a038e187edc54f5ab50b101336 100644 (file)
Binary files a/gfx/hud/default/buff_jump.tga and b/gfx/hud/default/buff_jump.tga differ

diff --git a/gfx/hud/default/buff_magnet.tga b/gfx/hud/default/buff_magnet.tga
index 417efcfce01498b4734b8830693ecdfa3b17c6c9..85b011d68e9894fbac37146d32ead5496cad369a 100644 (file)
Binary files a/gfx/hud/default/buff_magnet.tga and b/gfx/hud/default/buff_magnet.tga differ

diff --git a/gfx/hud/default/buff_medic.tga b/gfx/hud/default/buff_medic.tga
index 05eee7b3050422d3563cd664d7a43dda0cf16838..0792407ad20dbb0752d190bda849f54de83bc1c5 100644 (file)
Binary files a/gfx/hud/default/buff_medic.tga and b/gfx/hud/default/buff_medic.tga differ

diff --git a/gfx/hud/default/buff_resistance.tga b/gfx/hud/default/buff_resistance.tga
index 87d7324718822c63ea6daaa62d1c9853b1cb6ab1..f88ea2a9ba94f97247f42307e933a077342a79c4 100644 (file)
Binary files a/gfx/hud/default/buff_resistance.tga and b/gfx/hud/default/buff_resistance.tga differ

diff --git a/gfx/hud/default/buff_speed.tga b/gfx/hud/default/buff_speed.tga
index 23e93f43b5184672b7452cd24753d9d9adfcb1c6..54a65af38c07a975d1b64e3a0e0b0d600350b5cb 100644 (file)
Binary files a/gfx/hud/default/buff_speed.tga and b/gfx/hud/default/buff_speed.tga differ

diff --git a/gfx/hud/default/buff_swapper.tga b/gfx/hud/default/buff_swapper.tga
index c4d23a233b475ca9a8bb2396ecf2c9aacbbfcb4f..c5b97ceb0ee9748d8eeb3db8a228ab1cb0cd25e8 100644 (file)
Binary files a/gfx/hud/default/buff_swapper.tga and b/gfx/hud/default/buff_swapper.tga differ

diff --git a/gfx/hud/default/buff_vampire.tga b/gfx/hud/default/buff_vampire.tga
index fb9e71da752420f1a9522df3629678d4925ddcf6..1d60e6b8628fc5e0b59f8655a394a6a23e7bd545 100644 (file)
Binary files a/gfx/hud/default/buff_vampire.tga and b/gfx/hud/default/buff_vampire.tga differ

diff --git a/gfx/hud/default/buff_vengeance.tga b/gfx/hud/default/buff_vengeance.tga
index 84ff7f2c03450d1016015912f29078268dc194db..1da8e7fc32fb371b940a58d15f5253b18fe26039 100644 (file)
Binary files a/gfx/hud/default/buff_vengeance.tga and b/gfx/hud/default/buff_vengeance.tga differ

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

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

diff --git a/gfx/hud/default/shield.tga b/gfx/hud/default/shield.tga
index f13f0b4d84124f0c5e0f1c02f594edc852f30bdb..4b479d5ecf08d631ead3b67f47d41d8178e8c1d7 100644 (file)
Binary files a/gfx/hud/default/shield.tga and b/gfx/hud/default/shield.tga differ

diff --git a/gfx/hud/default/strength.tga b/gfx/hud/default/strength.tga
index b19019d5d7e5c6f81ea7f08f3cd5342299a941c9..d47464de62d22d988b4cd0fad8860c9347fe54e0 100644 (file)
Binary files a/gfx/hud/default/strength.tga and b/gfx/hud/default/strength.tga differ

diff --git a/gfx/hud/default/superweapons.tga b/gfx/hud/default/superweapons.tga
index 740019e82c5e2abb799ca75b329e00b714271647..accba53cd6a43dda3de4b367664b804870fad381 100644 (file)
Binary files a/gfx/hud/default/superweapons.tga and b/gfx/hud/default/superweapons.tga differ

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

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

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

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

diff --git a/gfx/hud/luminos/fuelregen.tga b/gfx/hud/luminos/fuelregen.tga
deleted file mode 100644 (file)
index 3f3a891..0000000
Binary files a/gfx/hud/luminos/fuelregen.tga and /dev/null differ

diff --git a/gfx/hud/luminos/item_large_armor.tga b/gfx/hud/luminos/item_large_armor.tga
deleted file mode 100644 (file)
index 6d84530..0000000
Binary files a/gfx/hud/luminos/item_large_armor.tga and /dev/null differ

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

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

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

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

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

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

diff --git a/gfx/hud/old/item_shield.tga b/gfx/hud/old/item_shield.tga
deleted file mode 100644 (file)
index 58cb73b..0000000
Binary files a/gfx/hud/old/item_shield.tga and /dev/null differ

diff --git a/gfx/hud/old/item_strength.tga b/gfx/hud/old/item_strength.tga
deleted file mode 100644 (file)
index 0f7689d..0000000
Binary files a/gfx/hud/old/item_strength.tga and /dev/null differ

diff --git a/gfx/hud/old/superweapons.tga b/gfx/hud/old/superweapons.tga
new file mode 100644 (file)
index 0000000..740019e
Binary files /dev/null and b/gfx/hud/old/superweapons.tga differ

diff --git a/models/items/g_fuelregen_luma.tga b/models/items/g_fuelregen_luma.tga
index 1edef473ecc6e42b6a4a0cafd26dbe559819afc4..2a2c451c233a50b33bfd1edcd5b713c81c6adf25 100644 (file)
Binary files a/models/items/g_fuelregen_luma.tga and b/models/items/g_fuelregen_luma.tga differ

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index c422892ea3cb0baea1593245a19eb9477f9a980b..83ea11b2b27663fc0c4936d8d62e5f8849d87f21 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -4615,11 +4615,11 @@ string GetItemsTimePicture(float i)
        {
                case 0: return "item_large_armor";
                case 1: return "item_mega_health";
-               case 2: return "item_strength";
-               case 3: return "item_shield";
+               case 2: return "strength";
+               case 3: return "shield";
                case 4: return "item_mega_health";
-               case 5: return "item_strength";
-               case 6: return "item_shield";
+               case 5: return "strength";
+               case 6: return "shield";
                case 7: return "fuelregen";
                case 8: return "jetpack";
                case 9: return "superweapons";
@@ -4643,7 +4643,7 @@ void DrawItemsTimeItem(vector myPos, vector mySize, float ar, float itemcode, fl
                picalpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ);
        }
        else
-               picalpha = 0.3;
+               picalpha = 0.5;
        t = floor(item_time - time + 0.999);
        if(t < 5)
                color = '0.7 0 0';