From: Mario Date: Sat, 1 Apr 2017 01:23:39 +0000 (+1000) Subject: Add new mortar model by Morphed X-Git-Tag: xonotic-v0.8.2~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=811fa46fa186f80345ec5b15d1a8b474d073580a;p=xonotic%2Fxonotic-data.pk3dir.git Add new mortar model by Morphed --- diff --git a/models/grenademodel.md3 b/models/grenademodel.md3 index 7758e3e0f..2e01ca869 100644 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 2e341fbda..0fd67bbb7 100644 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 5ddc2784b..63f514b44 100644 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 0a59625b6..c7e79a91a 100644 --- 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 d705024dd..970ca86ce 100644 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 index 000000000..9f0ffb462 --- /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 765089e95..fcc9d3c64 100644 --- 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 419704fa5..491fd052e 100644 --- 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 index 12a331a95..000000000 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 index c6add3e60..000000000 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 index bd9367337..000000000 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 index 910eaa1e7..000000000 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 index fbe2c8121..000000000 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 index 853e50b69..000000000 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 index 22c345637..000000000 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 index 22c345637..000000000 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 index 000000000..00cdb5bc2 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 index 000000000..5ae1d2b76 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 index 000000000..00cdb5bc2 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 index 000000000..4171f104e 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 index 000000000..00cdb5bc2 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 index 000000000..b0fd6d9e3 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 index 000000000..e94b454f6 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 index 000000000..ebee5b3dc 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 index 000000000..ff46da371 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 index 000000000..f6486e129 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 index 000000000..2a53919f1 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 index 000000000..8d51e3657 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 index 110df2519..000000000 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 index b26e87da7..000000000 Binary files a/textures/grenademodelskin_glow.jpg and /dev/null differ