From: Severin Meyer Date: Tue, 28 Jul 2015 19:35:02 +0000 (+0200) Subject: Update HUD nade icons X-Git-Tag: xonotic-v0.8.1~32^2~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=42ca6bb205c51a8f9b924a32e2f7446f600d4919;p=xonotic%2Fxonotic-data.pk3dir.git Update HUD nade icons --- diff --git a/gfx/hud/default/nade_bg.tga b/gfx/hud/default/nade_bg.tga deleted file mode 100644 index ffe0e0f6bb..0000000000 Binary files a/gfx/hud/default/nade_bg.tga and /dev/null differ diff --git a/gfx/hud/default/nade_heal.tga b/gfx/hud/default/nade_heal.tga new file mode 100644 index 0000000000..5ab82a0970 Binary files /dev/null and b/gfx/hud/default/nade_heal.tga differ diff --git a/gfx/hud/default/nade_ice.tga b/gfx/hud/default/nade_ice.tga new file mode 100644 index 0000000000..51a8dc9970 Binary files /dev/null and b/gfx/hud/default/nade_ice.tga differ diff --git a/gfx/hud/default/nade_monster.tga b/gfx/hud/default/nade_monster.tga new file mode 100644 index 0000000000..fbd516d24b Binary files /dev/null and b/gfx/hud/default/nade_monster.tga differ diff --git a/gfx/hud/default/nade_napalm.tga b/gfx/hud/default/nade_napalm.tga new file mode 100644 index 0000000000..12af433d30 Binary files /dev/null and b/gfx/hud/default/nade_napalm.tga differ diff --git a/gfx/hud/default/nade_nbg.tga b/gfx/hud/default/nade_nbg.tga deleted file mode 100644 index 18683746a9..0000000000 Binary files a/gfx/hud/default/nade_nbg.tga and /dev/null differ diff --git a/gfx/hud/default/nade_normal.png b/gfx/hud/default/nade_normal.png new file mode 100644 index 0000000000..f52dcac3c7 Binary files /dev/null and b/gfx/hud/default/nade_normal.png differ diff --git a/gfx/hud/default/nade_spawn.tga b/gfx/hud/default/nade_spawn.tga new file mode 100644 index 0000000000..91c0bbb2ff Binary files /dev/null and b/gfx/hud/default/nade_spawn.tga differ diff --git a/gfx/hud/default/nade_translocate.tga b/gfx/hud/default/nade_translocate.tga new file mode 100644 index 0000000000..ac2de06526 Binary files /dev/null and b/gfx/hud/default/nade_translocate.tga differ diff --git a/gfx/hud/default/notify_nade.tga b/gfx/hud/default/notify_nade.tga deleted file mode 100644 index 78dd0e2af9..0000000000 Binary files a/gfx/hud/default/notify_nade.tga and /dev/null differ diff --git a/gfx/hud/default/notify_nade_heal.tga b/gfx/hud/default/notify_nade_heal.tga deleted file mode 100644 index 17e240860d..0000000000 Binary files a/gfx/hud/default/notify_nade_heal.tga and /dev/null differ diff --git a/gfx/hud/default/notify_nade_ice.tga b/gfx/hud/default/notify_nade_ice.tga deleted file mode 100644 index f752808883..0000000000 Binary files a/gfx/hud/default/notify_nade_ice.tga and /dev/null differ diff --git a/gfx/hud/default/notify_nade_napalm.tga b/gfx/hud/default/notify_nade_napalm.tga deleted file mode 100644 index bb84101faa..0000000000 Binary files a/gfx/hud/default/notify_nade_napalm.tga and /dev/null differ diff --git a/gfx/hud/luma/nade_bg.tga b/gfx/hud/luma/nade_bg.tga deleted file mode 100644 index 0aa0700143..0000000000 Binary files a/gfx/hud/luma/nade_bg.tga and /dev/null differ diff --git a/gfx/hud/luma/nade_heal.tga b/gfx/hud/luma/nade_heal.tga new file mode 100644 index 0000000000..4a46237945 Binary files /dev/null and b/gfx/hud/luma/nade_heal.tga differ diff --git a/gfx/hud/luma/nade_ice.tga b/gfx/hud/luma/nade_ice.tga new file mode 100644 index 0000000000..24e31ace8d Binary files /dev/null and b/gfx/hud/luma/nade_ice.tga differ diff --git a/gfx/hud/luma/nade_monster.tga b/gfx/hud/luma/nade_monster.tga new file mode 100644 index 0000000000..b042d62458 Binary files /dev/null and b/gfx/hud/luma/nade_monster.tga differ diff --git a/gfx/hud/luma/nade_napalm.tga b/gfx/hud/luma/nade_napalm.tga new file mode 100644 index 0000000000..9fb16bc0a5 Binary files /dev/null and b/gfx/hud/luma/nade_napalm.tga differ diff --git a/gfx/hud/luma/nade_nbg.tga b/gfx/hud/luma/nade_nbg.tga deleted file mode 100644 index 80f19863e5..0000000000 Binary files a/gfx/hud/luma/nade_nbg.tga and /dev/null differ diff --git a/gfx/hud/luma/nade_normal.tga b/gfx/hud/luma/nade_normal.tga new file mode 100644 index 0000000000..ca15dd3974 Binary files /dev/null and b/gfx/hud/luma/nade_normal.tga differ diff --git a/gfx/hud/luma/nade_spawn.tga b/gfx/hud/luma/nade_spawn.tga new file mode 100644 index 0000000000..2b985690e8 Binary files /dev/null and b/gfx/hud/luma/nade_spawn.tga differ diff --git a/gfx/hud/luma/nade_translocate.tga b/gfx/hud/luma/nade_translocate.tga new file mode 100644 index 0000000000..a2736e4e4e Binary files /dev/null and b/gfx/hud/luma/nade_translocate.tga differ diff --git a/gfx/hud/luma/notify_nade.tga b/gfx/hud/luma/notify_nade.tga deleted file mode 100644 index c163e50c70..0000000000 Binary files a/gfx/hud/luma/notify_nade.tga and /dev/null differ diff --git a/gfx/hud/luma/notify_nade_heal.tga b/gfx/hud/luma/notify_nade_heal.tga deleted file mode 100644 index 4a46237945..0000000000 Binary files a/gfx/hud/luma/notify_nade_heal.tga and /dev/null differ diff --git a/gfx/hud/luma/notify_nade_ice.tga b/gfx/hud/luma/notify_nade_ice.tga deleted file mode 100644 index 24e31ace8d..0000000000 Binary files a/gfx/hud/luma/notify_nade_ice.tga and /dev/null differ diff --git a/gfx/hud/luma/notify_nade_napalm.tga b/gfx/hud/luma/notify_nade_napalm.tga deleted file mode 100644 index 9fb16bc0a5..0000000000 Binary files a/gfx/hud/luma/notify_nade_napalm.tga and /dev/null differ diff --git a/qcsrc/common/nades.qh b/qcsrc/common/nades.qh index f9089943cc..7daca159d3 100644 --- a/qcsrc/common/nades.qh +++ b/qcsrc/common/nades.qh @@ -38,10 +38,10 @@ vector Nade_Color(int nadeid) case NADE_TYPE_NORMAL: return '1 1 1'; case NADE_TYPE_NAPALM: return '2 0.5 0'; case NADE_TYPE_ICE: return '0 0.5 2'; - case NADE_TYPE_TRANSLOCATE: return '1 0.0625 1'; - case NADE_TYPE_SPAWN: return '1 0.9 0.06'; + case NADE_TYPE_TRANSLOCATE: return '1 0 1'; + case NADE_TYPE_SPAWN: return '1 0.9 0'; case NADE_TYPE_HEAL: return '1 0 0'; - case NADE_TYPE_MONSTER: return '1 0.5 0'; + case NADE_TYPE_MONSTER: return '0.25 0.75 0'; } return '0 0 0';