Include new devastator model by Morphed 410/head
authorMario <mario@smbclan.net>
Mon, 20 Feb 2017 01:47:10 +0000 (11:47 +1000)
committerMario <mario@smbclan.net>
Mon, 20 Feb 2017 01:47:10 +0000 (11:47 +1000)
24 files changed:
models/rocket.md3
models/weapons/g_rl.md3
models/weapons/h_rl.iqm
models/weapons/h_rl.iqm.framegroups
models/weapons/v_rl.md3
scripts/rl.shader [new file with mode: 0644]
scripts/shaderlist.txt
scripts/weapons.shader
textures/rl.tga [deleted file]
textures/rl_gloss.jpg [deleted file]
textures/rl_glow.tga [deleted file]
textures/rl_new.tga [new file with mode: 0644]
textures/rl_new_gloss.tga [new file with mode: 0644]
textures/rl_new_glow.tga [new file with mode: 0644]
textures/rl_new_norm.tga [new file with mode: 0644]
textures/rl_new_reflect.tga [new file with mode: 0644]
textures/rl_new_shirt.tga [new file with mode: 0644]
textures/rl_norm.tga [deleted file]
textures/rl_reflect.tga [deleted file]
textures/rl_shirt.tga [deleted file]
textures/rl_trust01.tga [new file with mode: 0644]
textures/rl_trust02.tga [new file with mode: 0644]
textures/rl_trust03.tga [new file with mode: 0644]
textures/rl_trust04.tga [new file with mode: 0644]

index 2efad34..a1434fb 100644 (file)
Binary files a/models/rocket.md3 and b/models/rocket.md3 differ
index 1333930..b158d1b 100644 (file)
Binary files a/models/weapons/g_rl.md3 and b/models/weapons/g_rl.md3 differ
index ffcb1a6..1868b2c 100644 (file)
Binary files a/models/weapons/h_rl.iqm and b/models/weapons/h_rl.iqm differ
index 0a59625..c4f4127 100644 (file)
@@ -1,4 +1,9 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
+/*
+Generated framegroups file for h_rl
+Used by DarkPlaces to simulate frame groups in DPM models.
+*/
+
+1 31 30 0 // h_rl fire
+32 31 30 0 // h_rl fire
+63 101 3 1 // h_rl idle
+164 101 3 1 // h_rl idle
index 022b52d..534e616 100644 (file)
Binary files a/models/weapons/v_rl.md3 and b/models/weapons/v_rl.md3 differ
diff --git a/scripts/rl.shader b/scripts/rl.shader
new file mode 100644 (file)
index 0000000..a8a030b
--- /dev/null
@@ -0,0 +1,21 @@
+RL
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/rl_new.tga
+               rgbgen lightingDiffuse
+       }
+}
+RocketThrust
+{
+       cull none
+       {
+       
+       animMap 50 textures/rl_trust01.tga textures/rl_trust02.tga textures/rl_trust03.tga textures/rl_trust04.tga
+       blendFunc GL_ONE GL_ONE
+       rgbGen wave sawtooth 0 1 0 10
+       }
+
+}
+
+
index 0a391e6..765089e 100644 (file)
@@ -7,6 +7,7 @@ model-common
 onslaught
 portals
 pyria
+rl
 shotgun
 spiderbot
 teamfx
index bef3183..419704f 100644 (file)
@@ -55,14 +55,6 @@ shotgun2
                rgbgen lightingDiffuse
        }
 }
-rl
-{
-       dpreflectcube cubemaps/default/sky
-       {
-               map textures/rl.tga
-               rgbgen lightingDiffuse
-       }
-}
 models/weapons/laser
 {
        dpreflectcube cubemaps/default/sky
diff --git a/textures/rl.tga b/textures/rl.tga
deleted file mode 100644 (file)
index 67fdf6b..0000000
Binary files a/textures/rl.tga and /dev/null differ
diff --git a/textures/rl_gloss.jpg b/textures/rl_gloss.jpg
deleted file mode 100644 (file)
index 269fb58..0000000
Binary files a/textures/rl_gloss.jpg and /dev/null differ
diff --git a/textures/rl_glow.tga b/textures/rl_glow.tga
deleted file mode 100644 (file)
index 755f96a..0000000
Binary files a/textures/rl_glow.tga and /dev/null differ
diff --git a/textures/rl_new.tga b/textures/rl_new.tga
new file mode 100644 (file)
index 0000000..447a12f
Binary files /dev/null and b/textures/rl_new.tga differ
diff --git a/textures/rl_new_gloss.tga b/textures/rl_new_gloss.tga
new file mode 100644 (file)
index 0000000..894ae82
Binary files /dev/null and b/textures/rl_new_gloss.tga differ
diff --git a/textures/rl_new_glow.tga b/textures/rl_new_glow.tga
new file mode 100644 (file)
index 0000000..b5c6677
Binary files /dev/null and b/textures/rl_new_glow.tga differ
diff --git a/textures/rl_new_norm.tga b/textures/rl_new_norm.tga
new file mode 100644 (file)
index 0000000..3c2d1fa
Binary files /dev/null and b/textures/rl_new_norm.tga differ
diff --git a/textures/rl_new_reflect.tga b/textures/rl_new_reflect.tga
new file mode 100644 (file)
index 0000000..07792b3
Binary files /dev/null and b/textures/rl_new_reflect.tga differ
diff --git a/textures/rl_new_shirt.tga b/textures/rl_new_shirt.tga
new file mode 100644 (file)
index 0000000..3a5bce0
Binary files /dev/null and b/textures/rl_new_shirt.tga differ
diff --git a/textures/rl_norm.tga b/textures/rl_norm.tga
deleted file mode 100644 (file)
index cdb53f8..0000000
Binary files a/textures/rl_norm.tga and /dev/null differ
diff --git a/textures/rl_reflect.tga b/textures/rl_reflect.tga
deleted file mode 100644 (file)
index 3f5ee49..0000000
Binary files a/textures/rl_reflect.tga and /dev/null differ
diff --git a/textures/rl_shirt.tga b/textures/rl_shirt.tga
deleted file mode 100644 (file)
index 9735bcf..0000000
Binary files a/textures/rl_shirt.tga and /dev/null differ
diff --git a/textures/rl_trust01.tga b/textures/rl_trust01.tga
new file mode 100644 (file)
index 0000000..db5f23d
Binary files /dev/null and b/textures/rl_trust01.tga differ
diff --git a/textures/rl_trust02.tga b/textures/rl_trust02.tga
new file mode 100644 (file)
index 0000000..9699685
Binary files /dev/null and b/textures/rl_trust02.tga differ
diff --git a/textures/rl_trust03.tga b/textures/rl_trust03.tga
new file mode 100644 (file)
index 0000000..1d728d9
Binary files /dev/null and b/textures/rl_trust03.tga differ
diff --git a/textures/rl_trust04.tga b/textures/rl_trust04.tga
new file mode 100644 (file)
index 0000000..25147f9
Binary files /dev/null and b/textures/rl_trust04.tga differ