Make shirt color dominant on fullbright erebus and nyx models, restore original megae...

diff --git a/models/player/megaerebus.iqm_0.skin b/models/player/megaerebus.iqm_0.skin
index 9f5f7b7dc3c00399f1cdede129aa0a2abd775097..977140f6bd996c62d6e85d7729ac2c0757dac9dd 100644 (file)
--- 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 9f5f7b7dc3c00399f1cdede129aa0a2abd775097..977140f6bd996c62d6e85d7729ac2c0757dac9dd 100644 (file)
--- 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 9f5f7b7dc3c00399f1cdede129aa0a2abd775097..977140f6bd996c62d6e85d7729ac2c0757dac9dd 100644 (file)
--- 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 5da8a5084e34e6f27b814dfa9a47357377700197..086d9c449fa1d4c5b1251ed2973ccde71ea8bdfc 100644 (file)
--- 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 ec0f1107263abc183f877be428565fd5b0a01d51..f4f00c6f97409ba06d9f755436aa1208fa5642a2 100644 (file)
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 43b8b7429356525dac2a44524bc673d3f8297f22..2c54e978312bb292a913f4f738529fa8c73ad944 100644 (file)
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 (file)
index 0000000..2ef8341
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 (file)
index 0000000..5004a75
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 (file)
index 0000000..a91959d
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 (file)
index 0000000..007228b
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 (file)
index 0000000..a99f2d6
Binary files /dev/null and b/textures/megaerebus_reflect.tga differ

diff --git a/textures/nyxfullbright_glow.tga b/textures/nyxfullbright_glow.tga
index f94c16a06af1b82dfe2d6c1197ef811a1d353de5..f4f00c6f97409ba06d9f755436aa1208fa5642a2 100644 (file)
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 43b8b7429356525dac2a44524bc673d3f8297f22..2c54e978312bb292a913f4f738529fa8c73ad944 100644 (file)
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 e7399dd6fd43663d89a479afcf935526c1429823..1e69d82e7b0d92b835e751bf0e32f7a4fcf35cfd 100644 (file)
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 cd46cc2cbd70c53e2fb49e7fe74da9781e6aad46..e7399dd6fd43663d89a479afcf935526c1429823 100644 (file)
Binary files a/textures/shadowheadfb_shirt.tga and b/textures/shadowheadfb_shirt.tga differ