From: terencehill Date: Sun, 24 Apr 2022 18:08:55 +0000 (+0200) Subject: Make shirt color dominant on fullbright erebus and nyx models, restore original megae... X-Git-Tag: xonotic-v0.8.5~7^2~4^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=68dccc949236f85336af0255e135a1b40571dd01;p=xonotic%2Fxonotic-data.pk3dir.git Make shirt color dominant on fullbright erebus and nyx models, restore original megaerebus colors (except shirt color on the head that now is brighter) by using dedicated textures --- diff --git a/models/player/megaerebus.iqm_0.skin b/models/player/megaerebus.iqm_0.skin index 9f5f7b7dc..977140f6b 100644 --- a/models/player/megaerebus.iqm_0.skin +++ b/models/player/megaerebus.iqm_0.skin @@ -1,2 +1,2 @@ -erebus,erebusfullbright +erebus,megaerebus erebus.001,shadowheadfb diff --git a/models/player/megaerebus_lod1.iqm_0.skin b/models/player/megaerebus_lod1.iqm_0.skin index 9f5f7b7dc..977140f6b 100644 --- a/models/player/megaerebus_lod1.iqm_0.skin +++ b/models/player/megaerebus_lod1.iqm_0.skin @@ -1,2 +1,2 @@ -erebus,erebusfullbright +erebus,megaerebus erebus.001,shadowheadfb diff --git a/models/player/megaerebus_lod2.iqm_0.skin b/models/player/megaerebus_lod2.iqm_0.skin index 9f5f7b7dc..977140f6b 100644 --- a/models/player/megaerebus_lod2.iqm_0.skin +++ b/models/player/megaerebus_lod2.iqm_0.skin @@ -1,2 +1,2 @@ -erebus,erebusfullbright +erebus,megaerebus erebus.001,shadowheadfb diff --git a/scripts/player_erebus.shader b/scripts/player_erebus.shader index 5da8a5084..086d9c449 100644 --- a/scripts/player_erebus.shader +++ b/scripts/player_erebus.shader @@ -16,6 +16,15 @@ erebusfullbright } } +megaerebus +{ + dpreflectcube cubemaps/default/sky + { + map textures/megaerebus.tga + rgbgen lightingDiffuse + } +} + shadowhead { dpreflectcube cubemaps/default/sky diff --git a/textures/erebusfullbright_glow.tga b/textures/erebusfullbright_glow.tga index ec0f11072..f4f00c6f9 100644 Binary files a/textures/erebusfullbright_glow.tga and b/textures/erebusfullbright_glow.tga differ diff --git a/textures/erebusfullbright_shirt.tga b/textures/erebusfullbright_shirt.tga index 43b8b7429..2c54e9783 100644 Binary files a/textures/erebusfullbright_shirt.tga and b/textures/erebusfullbright_shirt.tga differ diff --git a/textures/megaerebus.tga b/textures/megaerebus.tga new file mode 100644 index 000000000..2ef83416e Binary files /dev/null and b/textures/megaerebus.tga differ diff --git a/textures/megaerebus_gloss.tga b/textures/megaerebus_gloss.tga new file mode 100644 index 000000000..5004a7550 Binary files /dev/null and b/textures/megaerebus_gloss.tga differ diff --git a/textures/megaerebus_glow.tga b/textures/megaerebus_glow.tga new file mode 100644 index 000000000..a91959d36 Binary files /dev/null and b/textures/megaerebus_glow.tga differ diff --git a/textures/megaerebus_norm.tga b/textures/megaerebus_norm.tga new file mode 100644 index 000000000..007228b7e Binary files /dev/null and b/textures/megaerebus_norm.tga differ diff --git a/textures/megaerebus_reflect.tga b/textures/megaerebus_reflect.tga new file mode 100644 index 000000000..a99f2d672 Binary files /dev/null and b/textures/megaerebus_reflect.tga differ diff --git a/textures/nyxfullbright_glow.tga b/textures/nyxfullbright_glow.tga index f94c16a06..f4f00c6f9 100644 Binary files a/textures/nyxfullbright_glow.tga and b/textures/nyxfullbright_glow.tga differ diff --git a/textures/nyxfullbright_shirt.tga b/textures/nyxfullbright_shirt.tga index 43b8b7429..2c54e9783 100644 Binary files a/textures/nyxfullbright_shirt.tga and b/textures/nyxfullbright_shirt.tga differ diff --git a/textures/shadowheadfb_glow.tga b/textures/shadowheadfb_glow.tga index e7399dd6f..1e69d82e7 100644 Binary files a/textures/shadowheadfb_glow.tga and b/textures/shadowheadfb_glow.tga differ diff --git a/textures/shadowheadfb_shirt.tga b/textures/shadowheadfb_shirt.tga index cd46cc2cb..e7399dd6f 100644 Binary files a/textures/shadowheadfb_shirt.tga and b/textures/shadowheadfb_shirt.tga differ