Add new mortar model by Morphed

diff --git a/models/grenademodel.md3 b/models/grenademodel.md3
index 7758e3e0f3e134e34a90504bc862604a393faf88..2e01ca869aeb581a1aa00d35d49acbb541ddec85 100644 (file)
Binary files a/models/grenademodel.md3 and b/models/grenademodel.md3 differ

diff --git a/models/weapons/g_gl.md3 b/models/weapons/g_gl.md3
index 2e341fbda4c5fb87025ebce96c76ef46e8a0c5df..0fd67bbb766f8e487e4c90be28d5a6604c89cb2e 100644 (file)
Binary files a/models/weapons/g_gl.md3 and b/models/weapons/g_gl.md3 differ

diff --git a/models/weapons/h_gl.iqm b/models/weapons/h_gl.iqm
index 5ddc2784b5e1cb98781b540bca25d4e55f29f97e..63f514b44de4ae43ec5477662960448c53d84f2d 100644 (file)
Binary files a/models/weapons/h_gl.iqm and b/models/weapons/h_gl.iqm differ

diff --git a/models/weapons/h_gl.iqm.framegroups b/models/weapons/h_gl.iqm.framegroups
index 0a59625b6a6aa297525c008a66ba879537a5ac08..c7e79a91a6cc4b9cb82f60c31509121fbec2e504 100644 (file)
--- a/models/weapons/h_gl.iqm.framegroups
+++ b/models/weapons/h_gl.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_gl
+Used by DarkPlaces to simulate frame groups in DPM models.
+*/
+
+1 25 30 0 // h_gl fire
+26 25 30 0 // h_gl fire
+51 101 3 1 // h_gl idle
+152 101 3 1 // h_gl idle

diff --git a/models/weapons/v_gl.md3 b/models/weapons/v_gl.md3
index d705024dd873cc7bd86faacd036f363d5a6559d5..970ca86ce24aa121489318e210490531386c46a7 100644 (file)
Binary files a/models/weapons/v_gl.md3 and b/models/weapons/v_gl.md3 differ

diff --git a/scripts/gl.shader b/scripts/gl.shader
new file mode 100644 (file)
index 0000000..9f0ffb4
--- /dev/null
+++ b/scripts/gl.shader
@@ -0,0 +1,20 @@
+grenadelauncher
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/grenadelauncher.tga
+               rgbgen lightingDiffuse
+       }
+}
+grenadelauncher_sight
+{
+       {
+       
+       animMap 1 textures/glsight01.tga textures/glsight02.tga textures/glsight03.tga
+       blendFunc GL_ONE GL_ONE
+       rgbGen wave sawtooth 0 1 0 10
+       }
+
+}
+
+

diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index 765089e9550fe6f277dd0f8621552d6b5a82b2cf..fcc9d3c64edaf4154ee4420b383cf299d46bdc42 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -2,6 +2,7 @@ domination
 electro
 fireball
 flags
+gl
 hlac
 model-common
 onslaught

diff --git a/scripts/weapons.shader b/scripts/weapons.shader
index 419704fa59d513c277d969d413a36b54b861c22e..491fd052ea30ef866ad703b80667f5d08648c96d 100644 (file)
--- a/scripts/weapons.shader
+++ b/scripts/weapons.shader
@@ -23,14 +23,6 @@ uzi
                rgbgen lightingDiffuse
        }
 }
-glauncher
-{
-       dpreflectcube cubemaps/default/sky
-       {
-               map textures/glauncher.tga
-               rgbgen lightingDiffuse
-       }
-}
 hagar
 {
        dpreflectcube cubemaps/default/sky

diff --git a/textures/glauncher.tga b/textures/glauncher.tga
deleted file mode 100644 (file)
index 12a331a..0000000
Binary files a/textures/glauncher.tga and /dev/null differ

diff --git a/textures/glauncher_gloss.tga b/textures/glauncher_gloss.tga
deleted file mode 100644 (file)
index c6add3e..0000000
Binary files a/textures/glauncher_gloss.tga and /dev/null differ

diff --git a/textures/glauncher_glow.tga b/textures/glauncher_glow.tga
deleted file mode 100644 (file)
index bd93673..0000000
Binary files a/textures/glauncher_glow.tga and /dev/null differ

diff --git a/textures/glauncher_norm.tga b/textures/glauncher_norm.tga
deleted file mode 100644 (file)
index 910eaa1..0000000
Binary files a/textures/glauncher_norm.tga and /dev/null differ

diff --git a/textures/glauncher_reflect.tga b/textures/glauncher_reflect.tga
deleted file mode 100644 (file)
index fbe2c81..0000000
Binary files a/textures/glauncher_reflect.tga and /dev/null differ

diff --git a/textures/glauncher_shirt.tga b/textures/glauncher_shirt.tga
deleted file mode 100644 (file)
index 853e50b..0000000
Binary files a/textures/glauncher_shirt.tga and /dev/null differ

diff --git a/textures/glscope.tga b/textures/glscope.tga
deleted file mode 100644 (file)
index 22c3456..0000000
Binary files a/textures/glscope.tga and /dev/null differ

diff --git a/textures/glscope_glow.tga b/textures/glscope_glow.tga
deleted file mode 100644 (file)
index 22c3456..0000000
Binary files a/textures/glscope_glow.tga and /dev/null differ

diff --git a/textures/glsight01.tga b/textures/glsight01.tga
new file mode 100644 (file)
index 0000000..00cdb5b
Binary files /dev/null and b/textures/glsight01.tga differ

diff --git a/textures/glsight01_glow.tga b/textures/glsight01_glow.tga
new file mode 100644 (file)
index 0000000..5ae1d2b
Binary files /dev/null and b/textures/glsight01_glow.tga differ

diff --git a/textures/glsight02.tga b/textures/glsight02.tga
new file mode 100644 (file)
index 0000000..00cdb5b
Binary files /dev/null and b/textures/glsight02.tga differ

diff --git a/textures/glsight02_glow.tga b/textures/glsight02_glow.tga
new file mode 100644 (file)
index 0000000..4171f10
Binary files /dev/null and b/textures/glsight02_glow.tga differ

diff --git a/textures/glsight03.tga b/textures/glsight03.tga
new file mode 100644 (file)
index 0000000..00cdb5b
Binary files /dev/null and b/textures/glsight03.tga differ

diff --git a/textures/glsight03_glow.tga b/textures/glsight03_glow.tga
new file mode 100644 (file)
index 0000000..b0fd6d9
Binary files /dev/null and b/textures/glsight03_glow.tga differ

diff --git a/textures/grenadelauncher.tga b/textures/grenadelauncher.tga
new file mode 100644 (file)
index 0000000..e94b454
Binary files /dev/null and b/textures/grenadelauncher.tga differ

diff --git a/textures/grenadelauncher_gloss.tga b/textures/grenadelauncher_gloss.tga
new file mode 100644 (file)
index 0000000..ebee5b3
Binary files /dev/null and b/textures/grenadelauncher_gloss.tga differ

diff --git a/textures/grenadelauncher_glow.tga b/textures/grenadelauncher_glow.tga
new file mode 100644 (file)
index 0000000..ff46da3
Binary files /dev/null and b/textures/grenadelauncher_glow.tga differ

diff --git a/textures/grenadelauncher_norm.tga b/textures/grenadelauncher_norm.tga
new file mode 100644 (file)
index 0000000..f6486e1
Binary files /dev/null and b/textures/grenadelauncher_norm.tga differ

diff --git a/textures/grenadelauncher_reflect.tga b/textures/grenadelauncher_reflect.tga
new file mode 100644 (file)
index 0000000..2a53919
Binary files /dev/null and b/textures/grenadelauncher_reflect.tga differ

diff --git a/textures/grenadelauncher_shirt.tga b/textures/grenadelauncher_shirt.tga
new file mode 100644 (file)
index 0000000..8d51e36
Binary files /dev/null and b/textures/grenadelauncher_shirt.tga differ

diff --git a/textures/grenademodelskin.jpg b/textures/grenademodelskin.jpg
deleted file mode 100644 (file)
index 110df25..0000000
Binary files a/textures/grenademodelskin.jpg and /dev/null differ

diff --git a/textures/grenademodelskin_glow.jpg b/textures/grenademodelskin_glow.jpg
deleted file mode 100644 (file)
index b26e87d..0000000
Binary files a/textures/grenademodelskin_glow.jpg and /dev/null differ