From: Mario Date: Mon, 20 Feb 2017 01:47:10 +0000 (+1000) Subject: Include new devastator model by Morphed X-Git-Tag: xonotic-v0.8.2~188^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F410%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git Include new devastator model by Morphed --- diff --git a/models/rocket.md3 b/models/rocket.md3 index 2efad347c..a1434fbf4 100644 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 133393059..b158d1ba3 100644 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 ffcb1a69e..1868b2c02 100644 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 0a59625b6..c4f4127e7 100644 --- 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 022b52de7..534e616ac 100644 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 index 000000000..a8a030bfe --- /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 0a391e6b6..765089e95 100644 --- 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 bef318392..419704fa5 100644 --- 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 index 67fdf6b20..000000000 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 index 269fb58d9..000000000 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 index 755f96a22..000000000 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 index 000000000..447a12f76 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 index 000000000..894ae82cd 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 index 000000000..b5c667743 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 index 000000000..3c2d1fab5 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 index 000000000..07792b3bb 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 index 000000000..3a5bce001 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 index cdb53f8b4..000000000 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 index 3f5ee49b7..000000000 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 index 9735bcfd2..000000000 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 index 000000000..db5f23dea 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 index 000000000..96996850d 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 index 000000000..1d728d9fb 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 index 000000000..25147f950 Binary files /dev/null and b/textures/rl_trust04.tga differ