From: Mario Date: Thu, 31 May 2018 06:08:18 +0000 (+1000) Subject: Undo the icon change (will redo when we have new icons) X-Git-Tag: xonotic-v0.8.5~2119^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f7adc47f7d4404ce778b9d73128466724fa65bad;p=xonotic%2Fxonotic-data.pk3dir.git Undo the icon change (will redo when we have new icons) --- diff --git a/gfx/hud/luma/weaponokmachinegun.tga b/gfx/hud/luma/weaponokmachinegun.tga deleted file mode 100644 index 5aee32ab5..000000000 Binary files a/gfx/hud/luma/weaponokmachinegun.tga and /dev/null differ diff --git a/gfx/hud/luma/weaponoknex.tga b/gfx/hud/luma/weaponoknex.tga deleted file mode 100644 index e2e83ae75..000000000 Binary files a/gfx/hud/luma/weaponoknex.tga and /dev/null differ diff --git a/gfx/hud/luma/weaponokshotgun.tga b/gfx/hud/luma/weaponokshotgun.tga deleted file mode 100644 index f5fb92e13..000000000 Binary files a/gfx/hud/luma/weaponokshotgun.tga and /dev/null differ diff --git a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh index 5ff4c8689..9279c0c65 100644 --- a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh +++ b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh @@ -13,7 +13,7 @@ CLASS(OverkillMachineGun, Weapon) #endif /* crosshair */ ATTRIB(OverkillMachineGun, w_crosshair, string, "gfx/crosshairuzi"); /* crosshair */ ATTRIB(OverkillMachineGun, w_crosshair_size, float, 0.6); -/* wepimg */ ATTRIB(OverkillMachineGun, model2, string, "weaponokmachinegun"); +/* wepimg */ ATTRIB(OverkillMachineGun, model2, string, "weaponuzi"); /* refname */ ATTRIB(OverkillMachineGun, netname, string, "okmachinegun"); /* wepname */ ATTRIB(OverkillMachineGun, m_name, string, _("Overkill MachineGun")); diff --git a/qcsrc/common/mutators/mutator/overkill/oknex.qh b/qcsrc/common/mutators/mutator/overkill/oknex.qh index 1284dced1..617ce9dc5 100644 --- a/qcsrc/common/mutators/mutator/overkill/oknex.qh +++ b/qcsrc/common/mutators/mutator/overkill/oknex.qh @@ -14,7 +14,7 @@ CLASS(OverkillNex, Weapon) /* crosshair */ ATTRIB(OverkillNex, w_crosshair, string, "gfx/crosshairnex"); /* crosshair */ ATTRIB(OverkillNex, w_crosshair_size, float, 0.65); /* reticle */ ATTRIB(OverkillNex, w_reticle, string, "gfx/reticle_nex"); -/* wepimg */ ATTRIB(OverkillNex, model2, string, "weaponoknex"); +/* wepimg */ ATTRIB(OverkillNex, model2, string, "weaponnex"); /* refname */ ATTRIB(OverkillNex, netname, string, "oknex"); /* wepname */ ATTRIB(OverkillNex, m_name, string, _("Overkill Nex")); diff --git a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh index a0b5ec120..dc6b44ee2 100644 --- a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh +++ b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh @@ -13,7 +13,7 @@ CLASS(OverkillShotgun, Weapon) #endif /* crosshair */ ATTRIB(OverkillShotgun, w_crosshair, string, "gfx/crosshairshotgun"); /* crosshair */ ATTRIB(OverkillShotgun, w_crosshair_size, float, 0.65); -/* wepimg */ ATTRIB(OverkillShotgun, model2, string, "weaponokshotgun"); +/* wepimg */ ATTRIB(OverkillShotgun, model2, string, "weaponshotgun"); /* refname */ ATTRIB(OverkillShotgun, netname, string, "okshotgun"); /* wepname */ ATTRIB(OverkillShotgun, m_name, string, _("Overkill Shotgun")); diff --git a/qcsrc/common/notifications/all.inc b/qcsrc/common/notifications/all.inc index 50d048540..b4d14034d 100644 --- a/qcsrc/common/notifications/all.inc +++ b/qcsrc/common/notifications/all.inc @@ -491,14 +491,14 @@ MSG_INFO_NOTIF(WEAPON_MORTAR_SUICIDE_EXPLODE, N_CONSOLE, 2, 1, "s1 s2loc spree_lost", "s1", "weapongrenadelauncher", _("^BG%s^K1 blew themself up with their own Mortar%s%s"), "") MSG_INFO_NOTIF(WEAPON_OVERKILL_HMG_MURDER_SNIPE, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "weaponhmg", _("^BG%s%s^K1 was sniped by ^BG%s^K1's Overkill Heavy Machine Gun%s%s"), "") MSG_INFO_NOTIF(WEAPON_OVERKILL_HMG_MURDER_SPRAY, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "weaponhmg", _("^BG%s%s^K1 was torn to bits by ^BG%s^K1's Overkill Heavy Machine Gun%s%s"), "") - MSG_INFO_NOTIF(WEAPON_OVERKILL_MACHINEGUN_MURDER, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "weaponokmachinegun", _("^BG%s%s^K1 was riddled full of holes by ^BG%s^K1's Overkill Machine Gun%s%s"), "") - MSG_INFO_NOTIF(WEAPON_OVERKILL_NEX_MURDER, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "weaponoknex", _("^BG%s%s^K1 has been vaporized by ^BG%s^K1's Overkill Nex%s%s"), "") + MSG_INFO_NOTIF(WEAPON_OVERKILL_MACHINEGUN_MURDER, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "weaponuzi", _("^BG%s%s^K1 was riddled full of holes by ^BG%s^K1's Overkill Machine Gun%s%s"), "") + MSG_INFO_NOTIF(WEAPON_OVERKILL_NEX_MURDER, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "weaponnex", _("^BG%s%s^K1 has been vaporized by ^BG%s^K1's Overkill Nex%s%s"), "") MSG_INFO_NOTIF(WEAPON_OVERKILL_RPC_MURDER_DIRECT, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "weaponrpc", _("^BG%s%s^K1 was sawn in half by ^BG%s^K1's Overkill Rocket Propelled Chainsaw%s%s"), "") MSG_INFO_NOTIF(WEAPON_OVERKILL_RPC_MURDER_SPLASH, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "weaponrpc", _("^BG%s%s^K1 almost dodged ^BG%s^K1's Overkill Rocket Propelled Chainsaw%s%s"), "") MSG_INFO_NOTIF(WEAPON_OVERKILL_RPC_SUICIDE_DIRECT, N_CONSOLE, 2, 1, "s1 s2loc spree_lost", "s1", "weaponrpc", _("^BG%s^K1 was sawn in half by their own Overkill Rocket Propelled Chainsaw%s%s"), "") MSG_INFO_NOTIF(WEAPON_OVERKILL_RPC_SUICIDE_SPLASH, N_CONSOLE, 2, 1, "s1 s2loc spree_lost", "s1", "weaponrpc", _("^BG%s^K1 blew themself up with their Overkill Rocket Propelled Chainsaw%s%s"), "") - MSG_INFO_NOTIF(WEAPON_OVERKILL_SHOTGUN_MURDER, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "weaponokshotgun", _("^BG%s%s^K1 was gunned down by ^BG%s^K1's Overkill Shotgun%s%s"), "") + MSG_INFO_NOTIF(WEAPON_OVERKILL_SHOTGUN_MURDER, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "weaponshotgun", _("^BG%s%s^K1 was gunned down by ^BG%s^K1's Overkill Shotgun%s%s"), "") MSG_INFO_NOTIF(WEAPON_RIFLE_MURDER, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "weaponrifle", _("^BG%s%s^K1 was sniped with a Rifle by ^BG%s^K1%s%s"), "") MSG_INFO_NOTIF(WEAPON_RIFLE_MURDER_HAIL, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "weaponrifle", _("^BG%s%s^K1 died in ^BG%s^K1's Rifle bullet hail%s%s"), "") MSG_INFO_NOTIF(WEAPON_RIFLE_MURDER_HAIL_PIERCING, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "weaponrifle", _("^BG%s%s^K1 failed to hide from ^BG%s^K1's Rifle bullet hail%s%s"), "")