]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Add the explosives ammo model by Morphed 572/head
authorMario <mario@smbclan.net>
Fri, 22 Jun 2018 09:51:35 +0000 (19:51 +1000)
committerMario <mario@smbclan.net>
Fri, 22 Jun 2018 09:51:35 +0000 (19:51 +1000)
23 files changed:
models/items/a_rockets.md3
scripts/explosiveammo.shader [new file with mode: 0644]
textures/items/a_rocket_bottom.jpg [deleted file]
textures/items/a_rocket_box.jpg [deleted file]
textures/items/a_rocket_gre.jpg [deleted file]
textures/items/a_rocket_gre_glow.jpg [deleted file]
textures/items/a_rocket_roc.jpg [deleted file]
textures/items/a_rocket_roc_gloss.jpg [deleted file]
textures/items/a_rocket_roc_glow.jpg [deleted file]
textures/items/a_rocket_roc_norm.jpg [deleted file]
textures/items/a_rocket_tag.jpg [deleted file]
textures/items/explosiveammo.tga [new file with mode: 0644]
textures/items/explosiveammo_gloss.tga [new file with mode: 0644]
textures/items/explosiveammo_glow.tga [new file with mode: 0644]
textures/items/explosiveammo_icon_01.tga [new file with mode: 0644]
textures/items/explosiveammo_icon_01_glow.tga [new file with mode: 0644]
textures/items/explosiveammo_icon_02.tga [new file with mode: 0644]
textures/items/explosiveammo_icon_02_glow.tga [new file with mode: 0644]
textures/items/explosiveammo_icon_03.tga [new file with mode: 0644]
textures/items/explosiveammo_icon_03_glow.tga [new file with mode: 0644]
textures/items/explosiveammo_icon_blank.tga [new file with mode: 0644]
textures/items/explosiveammo_norm.tga [new file with mode: 0644]
textures/items/explosiveammo_reflect.tga [new file with mode: 0644]

index 3f1a594d0692979666b44cc660ac2493adf01597..3e9a8f82cb4290cb31780635013b9b5dde6f8dcc 100644 (file)
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 (file)
index 0000000..d6c3a90
--- /dev/null
@@ -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 (file)
index b2db595..0000000
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 (file)
index a29505b..0000000
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 (file)
index 66fbc3c..0000000
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 (file)
index b26e87d..0000000
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 (file)
index 300b2b9..0000000
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 (file)
index 0e6f937..0000000
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 (file)
index 2bb921a..0000000
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 (file)
index 8073764..0000000
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 (file)
index 1314605..0000000
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 (file)
index 0000000..45aa786
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 (file)
index 0000000..22d3f1e
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 (file)
index 0000000..0f1bdb1
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 (file)
index 0000000..e368ea4
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 (file)
index 0000000..22f1624
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 (file)
index 0000000..e368ea4
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 (file)
index 0000000..d1dcd8b
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 (file)
index 0000000..e368ea4
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 (file)
index 0000000..44a05dc
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 (file)
index 0000000..e368ea4
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 (file)
index 0000000..67c93ed
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 (file)
index 0000000..6e2731b
Binary files /dev/null and b/textures/items/explosiveammo_reflect.tga differ