From: Rudolf Polzer Date: Thu, 28 Apr 2011 12:51:25 +0000 (+0200) Subject: relics client support, attempt 2 ;) X-Git-Tag: xonotic-v0.5.0~264^2~5^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f864a616df97b4ac28cf2f2e83a00154c0659baa;p=xonotic%2Fxonotic-data.pk3dir.git relics client support, attempt 2 ;) --- diff --git a/models/relics/relic.md3 b/models/relics/relic.md3 new file mode 100644 index 000000000..7e65e4c3c Binary files /dev/null and b/models/relics/relic.md3 differ diff --git a/models/relics/relic.md3.framegroups b/models/relics/relic.md3.framegroups new file mode 100644 index 000000000..4e33f6f0d --- /dev/null +++ b/models/relics/relic.md3.framegroups @@ -0,0 +1 @@ +0 99 30 1 \ No newline at end of file diff --git a/models/relics/relic.md3_0.skin b/models/relics/relic.md3_0.skin new file mode 100644 index 000000000..f4d914fa2 --- /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_resistance \ No newline at end of file diff --git a/models/relics/relic.md3_1.skin b/models/relics/relic.md3_1.skin new file mode 100644 index 000000000..f391db088 --- /dev/null +++ b/models/relics/relic.md3_1.skin @@ -0,0 +1,3 @@ +ring,models/relics/relic_ring +mesh,models/relics/relic +sign,models/relics/sign_regeneration \ No newline at end of file diff --git a/models/relics/relic.md3_10.skin b/models/relics/relic.md3_10.skin new file mode 100644 index 000000000..8276637c0 --- /dev/null +++ b/models/relics/relic.md3_10.skin @@ -0,0 +1,3 @@ +ring,models/relics/relic_ring +mesh,models/relics/relic +sign,models/relics/sign_jump \ No newline at end of file diff --git a/models/relics/relic.md3_11.skin b/models/relics/relic.md3_11.skin new file mode 100644 index 000000000..4b88dde04 --- /dev/null +++ b/models/relics/relic.md3_11.skin @@ -0,0 +1,3 @@ +ring,models/relics/relic_ring +mesh,models/relics/relic +sign,models/relics/sign_flight \ No newline at end of file diff --git a/models/relics/relic.md3_12.skin b/models/relics/relic.md3_12.skin new file mode 100644 index 000000000..9f2525884 --- /dev/null +++ b/models/relics/relic.md3_12.skin @@ -0,0 +1,3 @@ +ring,models/relics/relic_ring +mesh,models/relics/relic +sign,models/relics/sign_invisible \ No newline at end of file diff --git a/models/relics/relic.md3_13.skin b/models/relics/relic.md3_13.skin new file mode 100644 index 000000000..8fb743571 --- /dev/null +++ b/models/relics/relic.md3_13.skin @@ -0,0 +1,3 @@ +ring,models/relics/relic_ring +mesh,models/relics/relic +sign,models/relics/sign_radioactive \ No newline at end of file diff --git a/models/relics/relic.md3_14.skin b/models/relics/relic.md3_14.skin new file mode 100644 index 000000000..c6efd38cc --- /dev/null +++ b/models/relics/relic.md3_14.skin @@ -0,0 +1,3 @@ +ring,models/relics/relic_ring +mesh,models/relics/relic +sign,models/relics/sign_resurrection \ No newline at end of file diff --git a/models/relics/relic.md3_15.skin b/models/relics/relic.md3_15.skin new file mode 100644 index 000000000..5b188bebc --- /dev/null +++ b/models/relics/relic.md3_15.skin @@ -0,0 +1,3 @@ +ring,models/relics/relic_ring +mesh,models/relics/relic +sign,models/relics/sign_vengeance \ No newline at end of file diff --git a/models/relics/relic.md3_2.skin b/models/relics/relic.md3_2.skin new file mode 100644 index 000000000..299176685 --- /dev/null +++ b/models/relics/relic.md3_2.skin @@ -0,0 +1,3 @@ +ring,models/relics/relic_ring +mesh,models/relics/relic +sign,models/relics/sign_vampire \ No newline at end of file diff --git a/models/relics/relic.md3_3.skin b/models/relics/relic.md3_3.skin new file mode 100644 index 000000000..5a2a694c5 --- /dev/null +++ b/models/relics/relic.md3_3.skin @@ -0,0 +1,3 @@ +ring,models/relics/relic_ring +mesh,models/relics/relic +sign,models/relics/sign_ammo \ No newline at end of file diff --git a/models/relics/relic.md3_4.skin b/models/relics/relic.md3_4.skin new file mode 100644 index 000000000..d9c45c322 --- /dev/null +++ b/models/relics/relic.md3_4.skin @@ -0,0 +1,3 @@ +ring,models/relics/relic_ring +mesh,models/relics/relic +sign,models/relics/sign_damage \ No newline at end of file diff --git a/models/relics/relic.md3_5.skin b/models/relics/relic.md3_5.skin new file mode 100644 index 000000000..a74c20f03 --- /dev/null +++ b/models/relics/relic.md3_5.skin @@ -0,0 +1,3 @@ +ring,models/relics/relic_ring +mesh,models/relics/relic +sign,models/relics/sign_splashdamage \ No newline at end of file diff --git a/models/relics/relic.md3_6.skin b/models/relics/relic.md3_6.skin new file mode 100644 index 000000000..5ebfd3fed --- /dev/null +++ b/models/relics/relic.md3_6.skin @@ -0,0 +1,3 @@ +ring,models/relics/relic_ring +mesh,models/relics/relic +sign,models/relics/sign_firingspeed \ No newline at end of file diff --git a/models/relics/relic.md3_7.skin b/models/relics/relic.md3_7.skin new file mode 100644 index 000000000..ce6fb9f41 --- /dev/null +++ b/models/relics/relic.md3_7.skin @@ -0,0 +1,3 @@ +ring,models/relics/relic_ring +mesh,models/relics/relic +sign,models/relics/sign_disability \ No newline at end of file diff --git a/models/relics/relic.md3_8.skin b/models/relics/relic.md3_8.skin new file mode 100644 index 000000000..2381a4cab --- /dev/null +++ b/models/relics/relic.md3_8.skin @@ -0,0 +1,3 @@ +ring,models/relics/relic_ring +mesh,models/relics/relic +sign,models/relics/sign_teamboost \ No newline at end of file diff --git a/models/relics/relic.md3_9.skin b/models/relics/relic.md3_9.skin new file mode 100644 index 000000000..3358e23f7 --- /dev/null +++ b/models/relics/relic.md3_9.skin @@ -0,0 +1,3 @@ +ring,models/relics/relic_ring +mesh,models/relics/relic +sign,models/relics/sign_speed \ No newline at end of file diff --git a/models/relics/relic.tga b/models/relics/relic.tga new file mode 100644 index 000000000..be9b7470e Binary files /dev/null and b/models/relics/relic.tga differ diff --git a/models/relics/relic_gloss.tga b/models/relics/relic_gloss.tga new file mode 100644 index 000000000..975cd2dd6 Binary files /dev/null and b/models/relics/relic_gloss.tga differ diff --git a/models/relics/relic_glow.tga b/models/relics/relic_glow.tga new file mode 100644 index 000000000..aba79cf23 Binary files /dev/null and b/models/relics/relic_glow.tga differ diff --git a/models/relics/relic_norm.tga b/models/relics/relic_norm.tga new file mode 100644 index 000000000..5712ac4ca Binary files /dev/null and b/models/relics/relic_norm.tga differ diff --git a/models/relics/relic_reflect.tga b/models/relics/relic_reflect.tga new file mode 100644 index 000000000..eb867b54a Binary files /dev/null and b/models/relics/relic_reflect.tga differ diff --git a/models/relics/relic_ring.tga b/models/relics/relic_ring.tga new file mode 100644 index 000000000..612c819c3 Binary files /dev/null and b/models/relics/relic_ring.tga differ diff --git a/models/relics/relic_ring_glow.tga b/models/relics/relic_ring_glow.tga new file mode 100644 index 000000000..4c30f89db Binary files /dev/null and b/models/relics/relic_ring_glow.tga differ diff --git a/models/relics/sign_ammo.tga b/models/relics/sign_ammo.tga new file mode 100644 index 000000000..b6227f632 Binary files /dev/null and b/models/relics/sign_ammo.tga differ diff --git a/models/relics/sign_ammo_glow.tga b/models/relics/sign_ammo_glow.tga new file mode 100644 index 000000000..8849e924c Binary files /dev/null and b/models/relics/sign_ammo_glow.tga differ diff --git a/models/relics/sign_damage.tga b/models/relics/sign_damage.tga new file mode 100644 index 000000000..a5658aa3f Binary files /dev/null and b/models/relics/sign_damage.tga differ diff --git a/models/relics/sign_damage_glow.tga b/models/relics/sign_damage_glow.tga new file mode 100644 index 000000000..b595139cd Binary files /dev/null and b/models/relics/sign_damage_glow.tga differ diff --git a/models/relics/sign_disability.tga b/models/relics/sign_disability.tga new file mode 100644 index 000000000..e858a8a1a Binary files /dev/null and b/models/relics/sign_disability.tga differ diff --git a/models/relics/sign_disability_glow.tga b/models/relics/sign_disability_glow.tga new file mode 100644 index 000000000..e858a8a1a Binary files /dev/null and b/models/relics/sign_disability_glow.tga differ diff --git a/models/relics/sign_firingspeed.tga b/models/relics/sign_firingspeed.tga new file mode 100644 index 000000000..5d975bcec Binary files /dev/null and b/models/relics/sign_firingspeed.tga differ diff --git a/models/relics/sign_firingspeed_glow.tga b/models/relics/sign_firingspeed_glow.tga new file mode 100644 index 000000000..61e24b58a Binary files /dev/null and b/models/relics/sign_firingspeed_glow.tga differ diff --git a/models/relics/sign_flight.tga b/models/relics/sign_flight.tga new file mode 100644 index 000000000..790bfe17e Binary files /dev/null and b/models/relics/sign_flight.tga differ diff --git a/models/relics/sign_flight_glow.tga b/models/relics/sign_flight_glow.tga new file mode 100644 index 000000000..b3f45a927 Binary files /dev/null and b/models/relics/sign_flight_glow.tga differ diff --git a/models/relics/sign_invisible.tga b/models/relics/sign_invisible.tga new file mode 100644 index 000000000..1388f49bd Binary files /dev/null and b/models/relics/sign_invisible.tga differ diff --git a/models/relics/sign_invisible_glow.tga b/models/relics/sign_invisible_glow.tga new file mode 100644 index 000000000..4def2fa19 Binary files /dev/null and b/models/relics/sign_invisible_glow.tga differ diff --git a/models/relics/sign_jump.tga b/models/relics/sign_jump.tga new file mode 100644 index 000000000..c17e35ae2 Binary files /dev/null and b/models/relics/sign_jump.tga differ diff --git a/models/relics/sign_jump_glow.tga b/models/relics/sign_jump_glow.tga new file mode 100644 index 000000000..c17e35ae2 Binary files /dev/null and b/models/relics/sign_jump_glow.tga differ diff --git a/models/relics/sign_radioactive.tga b/models/relics/sign_radioactive.tga new file mode 100644 index 000000000..463149c78 Binary files /dev/null and b/models/relics/sign_radioactive.tga differ diff --git a/models/relics/sign_radioactive_glow.tga b/models/relics/sign_radioactive_glow.tga new file mode 100644 index 000000000..86c014c68 Binary files /dev/null and b/models/relics/sign_radioactive_glow.tga differ diff --git a/models/relics/sign_regeneration.tga b/models/relics/sign_regeneration.tga new file mode 100644 index 000000000..318aece37 Binary files /dev/null and b/models/relics/sign_regeneration.tga differ diff --git a/models/relics/sign_regeneration_glow.tga b/models/relics/sign_regeneration_glow.tga new file mode 100644 index 000000000..4da50d888 Binary files /dev/null and b/models/relics/sign_regeneration_glow.tga differ diff --git a/models/relics/sign_resistance.tga b/models/relics/sign_resistance.tga new file mode 100644 index 000000000..e494857a1 Binary files /dev/null and b/models/relics/sign_resistance.tga differ diff --git a/models/relics/sign_resistance_glow.tga b/models/relics/sign_resistance_glow.tga new file mode 100644 index 000000000..cdacba8c7 Binary files /dev/null and b/models/relics/sign_resistance_glow.tga differ diff --git a/models/relics/sign_resurrection.tga b/models/relics/sign_resurrection.tga new file mode 100644 index 000000000..1dbbeb422 Binary files /dev/null and b/models/relics/sign_resurrection.tga differ diff --git a/models/relics/sign_resurrection_glow.tga b/models/relics/sign_resurrection_glow.tga new file mode 100644 index 000000000..0bd6e9358 Binary files /dev/null and b/models/relics/sign_resurrection_glow.tga differ diff --git a/models/relics/sign_speed.tga b/models/relics/sign_speed.tga new file mode 100644 index 000000000..ca84dbe09 Binary files /dev/null and b/models/relics/sign_speed.tga differ diff --git a/models/relics/sign_speed_glow.tga b/models/relics/sign_speed_glow.tga new file mode 100644 index 000000000..ca84dbe09 Binary files /dev/null and b/models/relics/sign_speed_glow.tga differ diff --git a/models/relics/sign_splashdamage.tga b/models/relics/sign_splashdamage.tga new file mode 100644 index 000000000..228dfc151 Binary files /dev/null and b/models/relics/sign_splashdamage.tga differ diff --git a/models/relics/sign_splashdamage_glow.tga b/models/relics/sign_splashdamage_glow.tga new file mode 100644 index 000000000..482a2b2e0 Binary files /dev/null and b/models/relics/sign_splashdamage_glow.tga differ diff --git a/models/relics/sign_teamboost.tga b/models/relics/sign_teamboost.tga new file mode 100644 index 000000000..b7961d08d Binary files /dev/null and b/models/relics/sign_teamboost.tga differ diff --git a/models/relics/sign_teamboost_glow.tga b/models/relics/sign_teamboost_glow.tga new file mode 100644 index 000000000..60bbbab96 Binary files /dev/null and b/models/relics/sign_teamboost_glow.tga differ diff --git a/models/relics/sign_vampire.tga b/models/relics/sign_vampire.tga new file mode 100644 index 000000000..2f070c977 Binary files /dev/null and b/models/relics/sign_vampire.tga differ diff --git a/models/relics/sign_vampire_glow.tga b/models/relics/sign_vampire_glow.tga new file mode 100644 index 000000000..abb8ede82 Binary files /dev/null and b/models/relics/sign_vampire_glow.tga differ diff --git a/models/relics/sign_vengeance.tga b/models/relics/sign_vengeance.tga new file mode 100644 index 000000000..bb142d430 Binary files /dev/null and b/models/relics/sign_vengeance.tga differ diff --git a/models/relics/sign_vengeance_glow.tga b/models/relics/sign_vengeance_glow.tga new file mode 100644 index 000000000..bb142d430 Binary files /dev/null and b/models/relics/sign_vengeance_glow.tga differ diff --git a/scripts/relics.shader b/scripts/relics.shader new file mode 100644 index 000000000..4a8523c94 --- /dev/null +++ b/scripts/relics.shader @@ -0,0 +1,160 @@ +models/relics/relic +{ + dpreflectcube cubemaps/default/sky + { + map models/relics/relic.tga + rgbgen lightingDiffuse + } +} +models/relics/relic_ring +{ + { + map models/relics/relic_ring.tga + blendfunc add + rgbgen lightingDiffuse + } +} +models/relics/sign_resistance +{ + cull none + { + map models/relics/sign_resistance.tga + blendfunc add + rgbgen lightingDiffuse + } +} +models/relics/sign_regeneration +{ + cull none + { + map models/relics/sign_regeneration.tga + blendfunc add + rgbgen lightingDiffuse + } +} +models/relics/sign_vampire +{ + cull none + { + map models/relics/sign_vampire.tga + blendfunc add + rgbgen lightingDiffuse + } +} +models/relics/sign_ammo +{ + cull none + { + map models/relics/sign_ammo.tga + blendfunc add + rgbgen lightingDiffuse + } +} +models/relics/sign_damage +{ + cull none + { + map models/relics/sign_damage.tga + blendfunc add + rgbgen lightingDiffuse + } +} +models/relics/sign_splashdamage +{ + cull none + { + map models/relics/sign_splashdamage.tga + blendfunc add + rgbgen lightingDiffuse + } +} +models/relics/sign_firingspeed +{ + cull none + { + map models/relics/sign_firingspeed.tga + blendfunc add + rgbgen lightingDiffuse + } +} +models/relics/sign_disability +{ + cull none + { + map models/relics/sign_disability.tga + blendfunc add + rgbgen lightingDiffuse + } +} +models/relics/sign_teamboost +{ + cull none + { + map models/relics/sign_teamboost.tga + blendfunc add + rgbgen lightingDiffuse + } +} +models/relics/sign_speed +{ + cull none + { + map models/relics/sign_speed.tga + blendfunc add + rgbgen lightingDiffuse + } +} +models/relics/sign_jump +{ + cull none + { + map models/relics/sign_jump.tga + blendfunc add + rgbgen lightingDiffuse + } +} +models/relics/sign_flight +{ + cull none + { + map models/relics/sign_flight.tga + blendfunc add + rgbgen lightingDiffuse + } +} +models/relics/sign_invisible +{ + cull none + { + map models/relics/sign_invisible.tga + blendfunc add + rgbgen lightingDiffuse + } +} +models/relics/sign_radioactive +{ + cull none + { + map models/relics/sign_radioactive.tga + blendfunc add + rgbgen lightingDiffuse + } +} +models/relics/sign_resurrection +{ + cull none + { + map models/relics/sign_resurrection.tga + blendfunc add + rgbgen lightingDiffuse + } +} +models/relics/sign_vengeance +{ + cull none + { + map models/relics/sign_vengeance.tga + blendfunc add + rgbgen lightingDiffuse + } +} \ No newline at end of file diff --git a/sound/relics/relic_effect.wav b/sound/relics/relic_effect.wav new file mode 100644 index 000000000..b78cebaee Binary files /dev/null and b/sound/relics/relic_effect.wav differ