From: Mario Date: Tue, 24 Jul 2018 15:39:07 +0000 (+1000) Subject: Add the new crylink, cell and electro models by Morphed X-Git-Tag: xonotic-v0.8.5~1922^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ce3adab0baa8193739bff82fdefbc4f02ba533ca;p=xonotic%2Fxonotic-data.pk3dir.git Add the new crylink, cell and electro models by Morphed --- diff --git a/models/items/a_cells.md3 b/models/items/a_cells.md3 index 04f6afed4..792d14536 100644 Binary files a/models/items/a_cells.md3 and b/models/items/a_cells.md3 differ diff --git a/models/weapons/g_crylink.md3 b/models/weapons/g_crylink.md3 index b325c9c2b..be0ea1770 100644 Binary files a/models/weapons/g_crylink.md3 and b/models/weapons/g_crylink.md3 differ diff --git a/models/weapons/g_electro.md3 b/models/weapons/g_electro.md3 index 76c2e8962..022891a97 100644 Binary files a/models/weapons/g_electro.md3 and b/models/weapons/g_electro.md3 differ diff --git a/models/weapons/h_crylink.iqm b/models/weapons/h_crylink.iqm index d8de4644f..62d571bd2 100644 Binary files a/models/weapons/h_crylink.iqm and b/models/weapons/h_crylink.iqm differ diff --git a/models/weapons/h_crylink.iqm.framegroups b/models/weapons/h_crylink.iqm.framegroups index 0a59625b6..92a05ebf3 100644 --- a/models/weapons/h_crylink.iqm.framegroups +++ b/models/weapons/h_crylink.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_crylink +Used by DarkPlaces to simulate frame groups in DPM models. +*/ + +1 26 30 0 // h_crylink fire +27 26 30 0 // h_crylink fire +53 101 3 1 // h_crylink idle +154 101 3 1 // h_crylink idle diff --git a/models/weapons/h_electro.iqm b/models/weapons/h_electro.iqm index a726b33f2..df0d79506 100644 Binary files a/models/weapons/h_electro.iqm and b/models/weapons/h_electro.iqm differ diff --git a/models/weapons/h_electro.iqm.framegroups b/models/weapons/h_electro.iqm.framegroups index 0a59625b6..f6df25a71 100644 --- a/models/weapons/h_electro.iqm.framegroups +++ b/models/weapons/h_electro.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_electro +Used by DarkPlaces to simulate frame groups in DPM models. +*/ + +1 36 30 0 // h_electro fire +37 36 30 0 // h_electro fire +73 101 3 1 // h_electro idle +174 101 3 1 // h_electro idle diff --git a/models/weapons/v_crylink.md3 b/models/weapons/v_crylink.md3 index c3b9f3ca8..dc73d47dc 100644 Binary files a/models/weapons/v_crylink.md3 and b/models/weapons/v_crylink.md3 differ diff --git a/models/weapons/v_electro.md3 b/models/weapons/v_electro.md3 index 67105bcf6..2e45a6786 100644 Binary files a/models/weapons/v_electro.md3 and b/models/weapons/v_electro.md3 differ diff --git a/scripts/cellammo.Shader b/scripts/cellammo.Shader new file mode 100644 index 000000000..94b1c8878 --- /dev/null +++ b/scripts/cellammo.Shader @@ -0,0 +1,9 @@ +cellammo +{ + dpreflectcube cubemaps/default/sky + dpoffsetmapping - 0.5 match8 128 + { + map textures/items/cellammo + rgbgen lightingDiffuse + } +} \ No newline at end of file diff --git a/scripts/crylink.shader b/scripts/crylink.shader new file mode 100644 index 000000000..ab59f84aa --- /dev/null +++ b/scripts/crylink.shader @@ -0,0 +1,9 @@ +crylink_new +{ + dpreflectcube cubemaps/default/sky + { + map textures/crylink_new.tga + rgbgen lightingDiffuse + } +} + diff --git a/scripts/electro.shader b/scripts/electro.shader index 84fa24050..f87b86c8d 100644 --- a/scripts/electro.shader +++ b/scripts/electro.shader @@ -14,3 +14,12 @@ electro_plasma_hull rgbGen Vertex } } + +electro +{ + dpreflectcube cubemaps/default/sky + { + map textures/electronew.tga + rgbgen lightingDiffuse + } +} \ No newline at end of file diff --git a/textures/cellammoskin.jpg b/textures/cellammoskin.jpg deleted file mode 100644 index 116ba9d6a..000000000 Binary files a/textures/cellammoskin.jpg and /dev/null differ diff --git a/textures/cellammoskin_glow.jpg b/textures/cellammoskin_glow.jpg deleted file mode 100644 index 274913ccc..000000000 Binary files a/textures/cellammoskin_glow.jpg and /dev/null differ diff --git a/textures/crylink.tga b/textures/crylink.tga deleted file mode 100644 index c07f02a70..000000000 Binary files a/textures/crylink.tga and /dev/null differ diff --git a/textures/crylink_bump.tga b/textures/crylink_bump.tga deleted file mode 100644 index bae1984cf..000000000 Binary files a/textures/crylink_bump.tga and /dev/null differ diff --git a/textures/crylink_gloss.tga b/textures/crylink_gloss.tga deleted file mode 100644 index 84e2c17c7..000000000 Binary files a/textures/crylink_gloss.tga and /dev/null differ diff --git a/textures/crylink_glow.jpg b/textures/crylink_glow.jpg deleted file mode 100644 index de4be8ef2..000000000 Binary files a/textures/crylink_glow.jpg and /dev/null differ diff --git a/textures/crylink_new.tga b/textures/crylink_new.tga new file mode 100644 index 000000000..877f08e27 Binary files /dev/null and b/textures/crylink_new.tga differ diff --git a/textures/crylink_new_gloss.tga b/textures/crylink_new_gloss.tga new file mode 100644 index 000000000..871a1b353 Binary files /dev/null and b/textures/crylink_new_gloss.tga differ diff --git a/textures/crylink_new_glow.tga b/textures/crylink_new_glow.tga new file mode 100644 index 000000000..933ddcf45 Binary files /dev/null and b/textures/crylink_new_glow.tga differ diff --git a/textures/crylink_new_norm.tga b/textures/crylink_new_norm.tga new file mode 100644 index 000000000..026bf1da6 Binary files /dev/null and b/textures/crylink_new_norm.tga differ diff --git a/textures/crylink_new_reflect.tga b/textures/crylink_new_reflect.tga new file mode 100644 index 000000000..70d35c0cd Binary files /dev/null and b/textures/crylink_new_reflect.tga differ diff --git a/textures/crylink_new_shirt.tga b/textures/crylink_new_shirt.tga new file mode 100644 index 000000000..630dadaf3 Binary files /dev/null and b/textures/crylink_new_shirt.tga differ diff --git a/textures/crylink_reflect.tga b/textures/crylink_reflect.tga deleted file mode 100644 index ec7857b19..000000000 Binary files a/textures/crylink_reflect.tga and /dev/null differ diff --git a/textures/crylink_shirt.tga b/textures/crylink_shirt.tga deleted file mode 100644 index ae10eccf5..000000000 Binary files a/textures/crylink_shirt.tga and /dev/null differ diff --git a/textures/electro.tga b/textures/electro.tga deleted file mode 100644 index adf55c2ed..000000000 Binary files a/textures/electro.tga and /dev/null differ diff --git a/textures/electro_gloss.tga b/textures/electro_gloss.tga deleted file mode 100644 index d506dcbb0..000000000 Binary files a/textures/electro_gloss.tga and /dev/null differ diff --git a/textures/electro_glow.tga b/textures/electro_glow.tga deleted file mode 100644 index 9c6a5bfff..000000000 Binary files a/textures/electro_glow.tga and /dev/null differ diff --git a/textures/electro_norm.tga b/textures/electro_norm.tga deleted file mode 100644 index 019abc9ce..000000000 Binary files a/textures/electro_norm.tga and /dev/null differ diff --git a/textures/electro_reflect.tga b/textures/electro_reflect.tga deleted file mode 100644 index 95cc2badd..000000000 Binary files a/textures/electro_reflect.tga and /dev/null differ diff --git a/textures/electronew.tga b/textures/electronew.tga new file mode 100644 index 000000000..54e370619 Binary files /dev/null and b/textures/electronew.tga differ diff --git a/textures/electronew_gloss.tga b/textures/electronew_gloss.tga new file mode 100644 index 000000000..a59c0805b Binary files /dev/null and b/textures/electronew_gloss.tga differ diff --git a/textures/electronew_glow.tga b/textures/electronew_glow.tga new file mode 100644 index 000000000..f5399689e Binary files /dev/null and b/textures/electronew_glow.tga differ diff --git a/textures/electronew_norm.tga b/textures/electronew_norm.tga new file mode 100644 index 000000000..8341b474a Binary files /dev/null and b/textures/electronew_norm.tga differ diff --git a/textures/electronew_reflect.tga b/textures/electronew_reflect.tga new file mode 100644 index 000000000..073600b78 Binary files /dev/null and b/textures/electronew_reflect.tga differ diff --git a/textures/electronew_shirt.tga b/textures/electronew_shirt.tga new file mode 100644 index 000000000..38d99d6aa Binary files /dev/null and b/textures/electronew_shirt.tga differ diff --git a/textures/items/cellammo.tga b/textures/items/cellammo.tga new file mode 100644 index 000000000..50b648343 Binary files /dev/null and b/textures/items/cellammo.tga differ diff --git a/textures/items/cellammo_gloss.tga b/textures/items/cellammo_gloss.tga new file mode 100644 index 000000000..64b22bc5f Binary files /dev/null and b/textures/items/cellammo_gloss.tga differ diff --git a/textures/items/cellammo_glow.tga b/textures/items/cellammo_glow.tga new file mode 100644 index 000000000..b44ff6fc5 Binary files /dev/null and b/textures/items/cellammo_glow.tga differ diff --git a/textures/items/cellammo_norm.tga b/textures/items/cellammo_norm.tga new file mode 100644 index 000000000..f7cd35288 Binary files /dev/null and b/textures/items/cellammo_norm.tga differ diff --git a/textures/items/cellammo_reflect.tga b/textures/items/cellammo_reflect.tga new file mode 100644 index 000000000..96c0759d4 Binary files /dev/null and b/textures/items/cellammo_reflect.tga differ