From: Mario Date: Fri, 22 Jun 2018 09:51:35 +0000 (+1000) Subject: Add the explosives ammo model by Morphed X-Git-Tag: xonotic-v0.8.5~1984^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F572%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git Add the explosives ammo model by Morphed --- diff --git a/models/items/a_rockets.md3 b/models/items/a_rockets.md3 index 3f1a594d0..3e9a8f82c 100644 Binary files a/models/items/a_rockets.md3 and b/models/items/a_rockets.md3 differ diff --git a/scripts/explosiveammo.shader b/scripts/explosiveammo.shader new file mode 100644 index 000000000..d6c3a90d3 --- /dev/null +++ b/scripts/explosiveammo.shader @@ -0,0 +1,20 @@ +explosive_ammo +{ + dpreflectcube cubemaps/default/sky + { + map textures/items/explosiveammo.tga + rgbgen lightingDiffuse + } +} +explosive_ammo_icons +{ + { + + animMap 2 textures/items/explosiveammo_icon_01.tga textures/items/explosiveammo_icon_01.tga textures/items/explosiveammo_icon_01.tga textures/items/explosiveammo_icon_blank.tga textures/items/explosiveammo_icon_02.tga textures/items/explosiveammo_icon_02.tga textures/items/explosiveammo_icon_02.tga textures/items/explosiveammo_icon_blank.tga textures/items/explosiveammo_icon_03.tga textures/items/explosiveammo_icon_03.tga textures/items/explosiveammo_icon_03.tga textures/items/explosiveammo_icon_blank.tga + blendFunc GL_ONE GL_ONE + rgbGen wave sawtooth 0 1 0 10 + } + +} + + diff --git a/textures/items/a_rocket_bottom.jpg b/textures/items/a_rocket_bottom.jpg deleted file mode 100644 index b2db59520..000000000 Binary files a/textures/items/a_rocket_bottom.jpg and /dev/null differ diff --git a/textures/items/a_rocket_box.jpg b/textures/items/a_rocket_box.jpg deleted file mode 100644 index a29505bfe..000000000 Binary files a/textures/items/a_rocket_box.jpg and /dev/null differ diff --git a/textures/items/a_rocket_gre.jpg b/textures/items/a_rocket_gre.jpg deleted file mode 100644 index 66fbc3c5d..000000000 Binary files a/textures/items/a_rocket_gre.jpg and /dev/null differ diff --git a/textures/items/a_rocket_gre_glow.jpg b/textures/items/a_rocket_gre_glow.jpg deleted file mode 100644 index b26e87da7..000000000 Binary files a/textures/items/a_rocket_gre_glow.jpg and /dev/null differ diff --git a/textures/items/a_rocket_roc.jpg b/textures/items/a_rocket_roc.jpg deleted file mode 100644 index 300b2b998..000000000 Binary files a/textures/items/a_rocket_roc.jpg and /dev/null differ diff --git a/textures/items/a_rocket_roc_gloss.jpg b/textures/items/a_rocket_roc_gloss.jpg deleted file mode 100644 index 0e6f937f3..000000000 Binary files a/textures/items/a_rocket_roc_gloss.jpg and /dev/null differ diff --git a/textures/items/a_rocket_roc_glow.jpg b/textures/items/a_rocket_roc_glow.jpg deleted file mode 100644 index 2bb921a72..000000000 Binary files a/textures/items/a_rocket_roc_glow.jpg and /dev/null differ diff --git a/textures/items/a_rocket_roc_norm.jpg b/textures/items/a_rocket_roc_norm.jpg deleted file mode 100644 index 8073764e4..000000000 Binary files a/textures/items/a_rocket_roc_norm.jpg and /dev/null differ diff --git a/textures/items/a_rocket_tag.jpg b/textures/items/a_rocket_tag.jpg deleted file mode 100644 index 13146052d..000000000 Binary files a/textures/items/a_rocket_tag.jpg and /dev/null differ diff --git a/textures/items/explosiveammo.tga b/textures/items/explosiveammo.tga new file mode 100644 index 000000000..45aa786d9 Binary files /dev/null and b/textures/items/explosiveammo.tga differ diff --git a/textures/items/explosiveammo_gloss.tga b/textures/items/explosiveammo_gloss.tga new file mode 100644 index 000000000..22d3f1e37 Binary files /dev/null and b/textures/items/explosiveammo_gloss.tga differ diff --git a/textures/items/explosiveammo_glow.tga b/textures/items/explosiveammo_glow.tga new file mode 100644 index 000000000..0f1bdb161 Binary files /dev/null and b/textures/items/explosiveammo_glow.tga differ diff --git a/textures/items/explosiveammo_icon_01.tga b/textures/items/explosiveammo_icon_01.tga new file mode 100644 index 000000000..e368ea496 Binary files /dev/null and b/textures/items/explosiveammo_icon_01.tga differ diff --git a/textures/items/explosiveammo_icon_01_glow.tga b/textures/items/explosiveammo_icon_01_glow.tga new file mode 100644 index 000000000..22f16247e Binary files /dev/null and b/textures/items/explosiveammo_icon_01_glow.tga differ diff --git a/textures/items/explosiveammo_icon_02.tga b/textures/items/explosiveammo_icon_02.tga new file mode 100644 index 000000000..e368ea496 Binary files /dev/null and b/textures/items/explosiveammo_icon_02.tga differ diff --git a/textures/items/explosiveammo_icon_02_glow.tga b/textures/items/explosiveammo_icon_02_glow.tga new file mode 100644 index 000000000..d1dcd8bd9 Binary files /dev/null and b/textures/items/explosiveammo_icon_02_glow.tga differ diff --git a/textures/items/explosiveammo_icon_03.tga b/textures/items/explosiveammo_icon_03.tga new file mode 100644 index 000000000..e368ea496 Binary files /dev/null and b/textures/items/explosiveammo_icon_03.tga differ diff --git a/textures/items/explosiveammo_icon_03_glow.tga b/textures/items/explosiveammo_icon_03_glow.tga new file mode 100644 index 000000000..44a05dcf4 Binary files /dev/null and b/textures/items/explosiveammo_icon_03_glow.tga differ diff --git a/textures/items/explosiveammo_icon_blank.tga b/textures/items/explosiveammo_icon_blank.tga new file mode 100644 index 000000000..e368ea496 Binary files /dev/null and b/textures/items/explosiveammo_icon_blank.tga differ diff --git a/textures/items/explosiveammo_norm.tga b/textures/items/explosiveammo_norm.tga new file mode 100644 index 000000000..67c93ed77 Binary files /dev/null and b/textures/items/explosiveammo_norm.tga differ diff --git a/textures/items/explosiveammo_reflect.tga b/textures/items/explosiveammo_reflect.tga new file mode 100644 index 000000000..6e2731b90 Binary files /dev/null and b/textures/items/explosiveammo_reflect.tga differ