From: Severin Meyer Date: Tue, 4 Aug 2015 11:18:28 +0000 (+0200) Subject: Rename buff shaders to match the buff netnames from common/buffs.qh X-Git-Tag: xonotic-v0.8.1~18^2~2^2~9 X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=d004a8a71ab96f58b877d61ac987b01f8dac5b3a;p=xonotic%2Fxonotic-data.pk3dir.git Rename buff shaders to match the buff netnames from common/buffs.qh --- diff --git a/models/relics/relic.md3_1.skin b/models/relics/relic.md3_1.skin index f391db088..cbba2916f 100644 --- a/models/relics/relic.md3_1.skin +++ b/models/relics/relic.md3_1.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,models/relics/sign_regeneration \ No newline at end of file +sign,models/relics/sign_medic \ No newline at end of file diff --git a/models/relics/relic.md3_14.skin b/models/relics/relic.md3_14.skin index c6efd38cc..a8af448f6 100644 --- a/models/relics/relic.md3_14.skin +++ b/models/relics/relic.md3_14.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,models/relics/sign_resurrection \ No newline at end of file +sign,models/relics/sign_blessed \ No newline at end of file diff --git a/models/relics/relic.md3_5.skin b/models/relics/relic.md3_5.skin index a74c20f03..4edbc24b0 100644 --- a/models/relics/relic.md3_5.skin +++ b/models/relics/relic.md3_5.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,models/relics/sign_splashdamage \ No newline at end of file +sign,models/relics/sign_bash \ No newline at end of file diff --git a/models/relics/sign_bash.tga b/models/relics/sign_bash.tga new file mode 100644 index 000000000..228dfc151 Binary files /dev/null and b/models/relics/sign_bash.tga differ diff --git a/models/relics/sign_bash_glow.tga b/models/relics/sign_bash_glow.tga new file mode 100644 index 000000000..482a2b2e0 Binary files /dev/null and b/models/relics/sign_bash_glow.tga differ diff --git a/models/relics/sign_blessed.tga b/models/relics/sign_blessed.tga new file mode 100644 index 000000000..1dbbeb422 Binary files /dev/null and b/models/relics/sign_blessed.tga differ diff --git a/models/relics/sign_blessed_glow.tga b/models/relics/sign_blessed_glow.tga new file mode 100644 index 000000000..0bd6e9358 Binary files /dev/null and b/models/relics/sign_blessed_glow.tga differ diff --git a/models/relics/sign_medic.tga b/models/relics/sign_medic.tga new file mode 100644 index 000000000..318aece37 Binary files /dev/null and b/models/relics/sign_medic.tga differ diff --git a/models/relics/sign_medic_glow.tga b/models/relics/sign_medic_glow.tga new file mode 100644 index 000000000..4da50d888 Binary files /dev/null and b/models/relics/sign_medic_glow.tga differ diff --git a/models/relics/sign_regeneration.tga b/models/relics/sign_regeneration.tga deleted file mode 100644 index 318aece37..000000000 Binary files a/models/relics/sign_regeneration.tga and /dev/null differ diff --git a/models/relics/sign_regeneration_glow.tga b/models/relics/sign_regeneration_glow.tga deleted file mode 100644 index 4da50d888..000000000 Binary files a/models/relics/sign_regeneration_glow.tga and /dev/null differ diff --git a/models/relics/sign_resurrection.tga b/models/relics/sign_resurrection.tga deleted file mode 100644 index 1dbbeb422..000000000 Binary files a/models/relics/sign_resurrection.tga and /dev/null differ diff --git a/models/relics/sign_resurrection_glow.tga b/models/relics/sign_resurrection_glow.tga deleted file mode 100644 index 0bd6e9358..000000000 Binary files a/models/relics/sign_resurrection_glow.tga and /dev/null differ diff --git a/models/relics/sign_splashdamage.tga b/models/relics/sign_splashdamage.tga deleted file mode 100644 index 228dfc151..000000000 Binary files a/models/relics/sign_splashdamage.tga and /dev/null differ diff --git a/models/relics/sign_splashdamage_glow.tga b/models/relics/sign_splashdamage_glow.tga deleted file mode 100644 index 482a2b2e0..000000000 Binary files a/models/relics/sign_splashdamage_glow.tga and /dev/null differ diff --git a/scripts/relics.shader b/scripts/relics.shader index 016ab35ed..83b50df81 100644 --- a/scripts/relics.shader +++ b/scripts/relics.shader @@ -23,11 +23,11 @@ models/relics/sign_resistance rgbgen lightingDiffuse } } -models/relics/sign_regeneration +models/relics/sign_medic { cull none { - map models/relics/sign_regeneration + map models/relics/sign_medic blendfunc add rgbgen lightingDiffuse } @@ -50,11 +50,11 @@ models/relics/sign_ammo rgbgen lightingDiffuse } } -models/relics/sign_splashdamage +models/relics/sign_bash { cull none { - map models/relics/sign_splashdamage + map models/relics/sign_bash blendfunc add rgbgen lightingDiffuse } @@ -104,11 +104,11 @@ models/relics/sign_invisible rgbgen lightingDiffuse } } -models/relics/sign_resurrection +models/relics/sign_blessed { cull none { - map models/relics/sign_resurrection + map models/relics/sign_blessed blendfunc add rgbgen lightingDiffuse }