From: LegendaryGuard Date: Mon, 28 Nov 2022 02:14:26 +0000 (+0100) Subject: Remove invisible and speed skins, reorganize relic buff skins X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=aa44463539cbedb8958a4d68e46419f41493ac94;p=xonotic%2Fxonotic-data.pk3dir.git Remove invisible and speed skins, reorganize relic buff skins --- diff --git a/models/relics/relic.md3_0.skin b/models/relics/relic.md3_0.skin new file mode 100644 index 000000000..cbba2916f --- /dev/null +++ b/models/relics/relic.md3_0.skin @@ -0,0 +1,3 @@ +ring,models/relics/relic_ring +mesh,models/relics/relic +sign,models/relics/sign_medic \ No newline at end of file diff --git a/models/relics/relic.md3_1.skin b/models/relics/relic.md3_1.skin index cbba2916f..299176685 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_medic \ No newline at end of file +sign,models/relics/sign_vampire \ No newline at end of file diff --git a/models/relics/relic.md3_10.skin b/models/relics/relic.md3_10.skin index 4b88dde04..a8af448f6 100644 --- a/models/relics/relic.md3_10.skin +++ b/models/relics/relic.md3_10.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,models/relics/sign_flight \ No newline at end of file +sign,models/relics/sign_blessed \ No newline at end of file diff --git a/models/relics/relic.md3_11.skin b/models/relics/relic.md3_11.skin index 9f2525884..5b188bebc 100644 --- a/models/relics/relic.md3_11.skin +++ b/models/relics/relic.md3_11.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,models/relics/sign_invisible \ No newline at end of file +sign,models/relics/sign_vengeance \ No newline at end of file diff --git a/models/relics/relic.md3_12.skin b/models/relics/relic.md3_12.skin index cfcb99896..5c30ed67c 100644 --- a/models/relics/relic.md3_12.skin +++ b/models/relics/relic.md3_12.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,textures/common/nodraw \ No newline at end of file +sign,models/relics/sign_inferno \ No newline at end of file diff --git a/models/relics/relic.md3_13.skin b/models/relics/relic.md3_13.skin index a8af448f6..30fba072e 100644 --- a/models/relics/relic.md3_13.skin +++ b/models/relics/relic.md3_13.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,models/relics/sign_blessed \ No newline at end of file +sign,models/relics/sign_swapper \ No newline at end of file diff --git a/models/relics/relic.md3_14.skin b/models/relics/relic.md3_14.skin index 5b188bebc..b89d51cec 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_vengeance \ No newline at end of file +sign,models/relics/sign_magnet \ No newline at end of file diff --git a/models/relics/relic.md3_15.skin b/models/relics/relic.md3_15.skin index 5c30ed67c..7401d28f9 100644 --- a/models/relics/relic.md3_15.skin +++ b/models/relics/relic.md3_15.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,models/relics/sign_inferno \ No newline at end of file +sign,models/relics/sign_luck \ No newline at end of file diff --git a/models/relics/relic.md3_16.skin b/models/relics/relic.md3_16.skin deleted file mode 100644 index 30fba072e..000000000 --- a/models/relics/relic.md3_16.skin +++ /dev/null @@ -1,3 +0,0 @@ -ring,models/relics/relic_ring -mesh,models/relics/relic -sign,models/relics/sign_swapper \ No newline at end of file diff --git a/models/relics/relic.md3_17.skin b/models/relics/relic.md3_17.skin deleted file mode 100644 index b89d51cec..000000000 --- a/models/relics/relic.md3_17.skin +++ /dev/null @@ -1,3 +0,0 @@ -ring,models/relics/relic_ring -mesh,models/relics/relic -sign,models/relics/sign_magnet \ No newline at end of file diff --git a/models/relics/relic.md3_18.skin b/models/relics/relic.md3_18.skin deleted file mode 100644 index 7401d28f9..000000000 --- a/models/relics/relic.md3_18.skin +++ /dev/null @@ -1,3 +0,0 @@ -ring,models/relics/relic_ring -mesh,models/relics/relic -sign,models/relics/sign_luck \ No newline at end of file diff --git a/models/relics/relic.md3_2.skin b/models/relics/relic.md3_2.skin index 299176685..5a2a694c5 100644 --- a/models/relics/relic.md3_2.skin +++ b/models/relics/relic.md3_2.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,models/relics/sign_vampire \ No newline at end of file +sign,models/relics/sign_ammo \ No newline at end of file diff --git a/models/relics/relic.md3_3.skin b/models/relics/relic.md3_3.skin index 5a2a694c5..cfcb99896 100644 --- a/models/relics/relic.md3_3.skin +++ b/models/relics/relic.md3_3.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,models/relics/sign_ammo \ No newline at end of file +sign,textures/common/nodraw \ No newline at end of file diff --git a/models/relics/relic.md3_5.skin b/models/relics/relic.md3_5.skin index cfcb99896..ce6fb9f41 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,textures/common/nodraw \ No newline at end of file +sign,models/relics/sign_disability \ No newline at end of file diff --git a/models/relics/relic.md3_6.skin b/models/relics/relic.md3_6.skin index ce6fb9f41..cfcb99896 100644 --- a/models/relics/relic.md3_6.skin +++ b/models/relics/relic.md3_6.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,models/relics/sign_disability \ No newline at end of file +sign,textures/common/nodraw \ No newline at end of file diff --git a/models/relics/relic.md3_7.skin b/models/relics/relic.md3_7.skin index cfcb99896..8276637c0 100644 --- a/models/relics/relic.md3_7.skin +++ b/models/relics/relic.md3_7.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,textures/common/nodraw \ No newline at end of file +sign,models/relics/sign_jump \ No newline at end of file diff --git a/models/relics/relic.md3_8.skin b/models/relics/relic.md3_8.skin index 3358e23f7..4b88dde04 100644 --- a/models/relics/relic.md3_8.skin +++ b/models/relics/relic.md3_8.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,models/relics/sign_speed \ No newline at end of file +sign,models/relics/sign_flight \ No newline at end of file diff --git a/models/relics/relic.md3_9.skin b/models/relics/relic.md3_9.skin index 8276637c0..cfcb99896 100644 --- a/models/relics/relic.md3_9.skin +++ b/models/relics/relic.md3_9.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,models/relics/sign_jump \ No newline at end of file +sign,textures/common/nodraw \ No newline at end of file diff --git a/models/relics/sign_invisible.tga b/models/relics/sign_invisible.tga deleted file mode 100644 index de1745b09..000000000 Binary files a/models/relics/sign_invisible.tga and /dev/null differ diff --git a/models/relics/sign_invisible_glow.tga b/models/relics/sign_invisible_glow.tga deleted file mode 100644 index 929965fb5..000000000 Binary files a/models/relics/sign_invisible_glow.tga and /dev/null differ diff --git a/models/relics/sign_speed.tga b/models/relics/sign_speed.tga deleted file mode 100644 index bca096825..000000000 Binary files a/models/relics/sign_speed.tga and /dev/null differ diff --git a/models/relics/sign_speed_glow.tga b/models/relics/sign_speed_glow.tga deleted file mode 100644 index 11db4c4ca..000000000 Binary files a/models/relics/sign_speed_glow.tga and /dev/null differ diff --git a/scripts/relics.shader b/scripts/relics.shader index e0cf9ad90..d2b44b1dd 100644 --- a/scripts/relics.shader +++ b/scripts/relics.shader @@ -71,17 +71,6 @@ models/relics/sign_inferno } } -models/relics/sign_invisible -{ - deformVertexes autosprite - cull none - nopicmip - { - map models/relics/sign_invisible - blendfunc add - } -} - models/relics/sign_jump { deformVertexes autosprite @@ -115,17 +104,6 @@ models/relics/sign_medic } } -models/relics/sign_speed -{ - deformVertexes autosprite - cull none - nopicmip - { - map models/relics/sign_speed - blendfunc add - } -} - models/relics/sign_swapper { deformVertexes autosprite