Include new devastator model by Morphed

diff --git a/models/rocket.md3 b/models/rocket.md3
index 2efad347c3f6ebc857e6d9d793f3bb090869a30e..a1434fbf4d98a48efa9cd79873f9745bd5162358 100644 (file)
Binary files a/models/rocket.md3 and b/models/rocket.md3 differ

diff --git a/models/weapons/g_rl.md3 b/models/weapons/g_rl.md3
index 13339305982e66177d06e039f24e50947f1a94c0..b158d1ba3dcad20b792ae6e81ee2e0a3687dc001 100644 (file)
Binary files a/models/weapons/g_rl.md3 and b/models/weapons/g_rl.md3 differ

diff --git a/models/weapons/h_rl.iqm b/models/weapons/h_rl.iqm
index ffcb1a69e61740d89357801c28a32e2f110da7cc..1868b2c0208123b44bac64fedf034b18d085cf1c 100644 (file)
Binary files a/models/weapons/h_rl.iqm and b/models/weapons/h_rl.iqm differ

diff --git a/models/weapons/h_rl.iqm.framegroups b/models/weapons/h_rl.iqm.framegroups
index 0a59625b6a6aa297525c008a66ba879537a5ac08..c4f4127e7349300ab620878c32a2120e9d503823 100644 (file)
--- a/models/weapons/h_rl.iqm.framegroups
+++ b/models/weapons/h_rl.iqm.framegroups
@@ -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

diff --git a/models/weapons/v_rl.md3 b/models/weapons/v_rl.md3
index 022b52de7a908a7ace020a7837dfd537ad99e38d..534e616aca9d58c9b9ad090550e9c4fe47b50132 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
+++ b/scripts/rl.shader
@@ -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
+       }
+
+}
+
+

diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index 0a391e6b697384621a9417557652b6ffbec2ef8d..765089e9550fe6f277dd0f8621552d6b5a82b2cf 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -7,6 +7,7 @@ model-common
 onslaught
 portals
 pyria
+rl
 shotgun
 spiderbot
 teamfx

diff --git a/scripts/weapons.shader b/scripts/weapons.shader
index bef31839299fda9518ad081b2e51b2d06af7c29a..419704fa59d513c277d969d413a36b54b861c22e 100644 (file)
--- a/scripts/weapons.shader
+++ b/scripts/weapons.shader
@@ -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