Merge branch 'terencehill/player_models_improvements' into 'develop'

Player models improvements

See merge request xonotic/xonotic-data.pk3dir!1013

diff --git a/models/player/erebus.iqm_0.skin b/models/player/erebus.iqm_0.skin
index 4597ceff1e90809a4e999ac1302734e1ef751b9c..9f5f7b7dc3c00399f1cdede129aa0a2abd775097 100644 (file)
--- a/models/player/erebus.iqm_0.skin
+++ b/models/player/erebus.iqm_0.skin
@@ -1,2 +1,2 @@
 erebus,erebusfullbright
-erebus.001,shadowhead
+erebus.001,shadowheadfb

diff --git a/models/player/erebus_lod1.iqm_0.skin b/models/player/erebus_lod1.iqm_0.skin
index 4597ceff1e90809a4e999ac1302734e1ef751b9c..9f5f7b7dc3c00399f1cdede129aa0a2abd775097 100644 (file)
--- a/models/player/erebus_lod1.iqm_0.skin
+++ b/models/player/erebus_lod1.iqm_0.skin
@@ -1,2 +1,2 @@
 erebus,erebusfullbright
-erebus.001,shadowhead
+erebus.001,shadowheadfb

diff --git a/models/player/erebus_lod2.iqm_0.skin b/models/player/erebus_lod2.iqm_0.skin
index 4597ceff1e90809a4e999ac1302734e1ef751b9c..9f5f7b7dc3c00399f1cdede129aa0a2abd775097 100644 (file)
--- a/models/player/erebus_lod2.iqm_0.skin
+++ b/models/player/erebus_lod2.iqm_0.skin
@@ -1,2 +1,2 @@
 erebus,erebusfullbright
-erebus.001,shadowhead
+erebus.001,shadowheadfb

diff --git a/models/player/ignis.iqm_0.skin b/models/player/ignis.iqm_0.skin
index 2c93e982f5c75564477526e1c36af0b4190d3f25..f31cd8df5c8edad2ea9172723db013f435a383f0 100644 (file)
--- a/models/player/ignis.iqm_0.skin
+++ b/models/player/ignis.iqm_0.skin
@@ -1,2 +1,2 @@
 ignis1,ignisfullbright
-ignis1.001,ignishead
+ignis1.001,ignisheadfb

diff --git a/models/player/ignis_lod1.iqm_0.skin b/models/player/ignis_lod1.iqm_0.skin
index 2c93e982f5c75564477526e1c36af0b4190d3f25..f31cd8df5c8edad2ea9172723db013f435a383f0 100644 (file)
--- a/models/player/ignis_lod1.iqm_0.skin
+++ b/models/player/ignis_lod1.iqm_0.skin
@@ -1,2 +1,2 @@
 ignis1,ignisfullbright
-ignis1.001,ignishead
+ignis1.001,ignisheadfb

diff --git a/models/player/ignis_lod2.iqm_0.skin b/models/player/ignis_lod2.iqm_0.skin
index 2c93e982f5c75564477526e1c36af0b4190d3f25..f31cd8df5c8edad2ea9172723db013f435a383f0 100644 (file)
--- a/models/player/ignis_lod2.iqm_0.skin
+++ b/models/player/ignis_lod2.iqm_0.skin
@@ -1,2 +1,2 @@
 ignis1,ignisfullbright
-ignis1.001,ignishead
+ignis1.001,ignisheadfb

diff --git a/models/player/ignismasked.iqm_0.skin b/models/player/ignismasked.iqm_0.skin
index eb257cc1d619d04464532624c435455cf4ee04e9..a02196161086c9ff3b813ecb5261f0118c31d4cc 100644 (file)
--- a/models/player/ignismasked.iqm_0.skin
+++ b/models/player/ignismasked.iqm_0.skin
@@ -1,2 +1,2 @@
 ignis1,ignisfullbright
-ignis3,ignishead
+ignis3,ignisheadfb

diff --git a/models/player/ignismasked_lod1.iqm_0.skin b/models/player/ignismasked_lod1.iqm_0.skin
index eb257cc1d619d04464532624c435455cf4ee04e9..a02196161086c9ff3b813ecb5261f0118c31d4cc 100644 (file)
--- a/models/player/ignismasked_lod1.iqm_0.skin
+++ b/models/player/ignismasked_lod1.iqm_0.skin
@@ -1,2 +1,2 @@
 ignis1,ignisfullbright
-ignis3,ignishead
+ignis3,ignisheadfb

diff --git a/models/player/ignismasked_lod2.iqm_0.skin b/models/player/ignismasked_lod2.iqm_0.skin
index eb257cc1d619d04464532624c435455cf4ee04e9..a02196161086c9ff3b813ecb5261f0118c31d4cc 100644 (file)
--- a/models/player/ignismasked_lod2.iqm_0.skin
+++ b/models/player/ignismasked_lod2.iqm_0.skin
@@ -1,2 +1,2 @@
 ignis1,ignisfullbright
-ignis3,ignishead
+ignis3,ignisheadfb

diff --git a/models/player/megaerebus.iqm_0.skin b/models/player/megaerebus.iqm_0.skin
index 4597ceff1e90809a4e999ac1302734e1ef751b9c..977140f6bd996c62d6e85d7729ac2c0757dac9dd 100644 (file)
--- a/models/player/megaerebus.iqm_0.skin
+++ b/models/player/megaerebus.iqm_0.skin
@@ -1,2 +1,2 @@
-erebus,erebusfullbright
-erebus.001,shadowhead
+erebus,megaerebus
+erebus.001,shadowheadfb

diff --git a/models/player/megaerebus_lod1.iqm_0.skin b/models/player/megaerebus_lod1.iqm_0.skin
index 4597ceff1e90809a4e999ac1302734e1ef751b9c..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.001,shadowhead
+erebus,megaerebus
+erebus.001,shadowheadfb

diff --git a/models/player/megaerebus_lod2.iqm_0.skin b/models/player/megaerebus_lod2.iqm_0.skin
index 4597ceff1e90809a4e999ac1302734e1ef751b9c..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.001,shadowhead
+erebus,megaerebus
+erebus.001,shadowheadfb

diff --git a/models/player/nyx.iqm_0.skin b/models/player/nyx.iqm_0.skin
index 19b5fd59b1380c68a3369bdfdb18ad41d77588b4..2d1096323d0029a08276fee90318e648f626ea90 100644 (file)
--- a/models/player/nyx.iqm_0.skin
+++ b/models/player/nyx.iqm_0.skin
@@ -1,2 +1,2 @@
 nyx,nyxfullbright
-nyx.001,shadowhead
+nyx.001,shadowheadfb

diff --git a/models/player/nyx_lod1.iqm_0.skin b/models/player/nyx_lod1.iqm_0.skin
index 19b5fd59b1380c68a3369bdfdb18ad41d77588b4..2d1096323d0029a08276fee90318e648f626ea90 100644 (file)
--- a/models/player/nyx_lod1.iqm_0.skin
+++ b/models/player/nyx_lod1.iqm_0.skin
@@ -1,2 +1,2 @@
 nyx,nyxfullbright
-nyx.001,shadowhead
+nyx.001,shadowheadfb

diff --git a/models/player/nyx_lod2.iqm_0.skin b/models/player/nyx_lod2.iqm_0.skin
index 19b5fd59b1380c68a3369bdfdb18ad41d77588b4..2d1096323d0029a08276fee90318e648f626ea90 100644 (file)
--- a/models/player/nyx_lod2.iqm_0.skin
+++ b/models/player/nyx_lod2.iqm_0.skin
@@ -1,2 +1,2 @@
 nyx,nyxfullbright
-nyx.001,shadowhead
+nyx.001,shadowheadfb

diff --git a/models/player/seraphinamasked.iqm_0.skin b/models/player/seraphinamasked.iqm_0.skin
index 7b94ebe4a4e61e1d7e0803fb86a91a60fb3ecf4e..1e69498f9f182535a562647f447e95bab549d14a 100644 (file)
--- a/models/player/seraphinamasked.iqm_0.skin
+++ b/models/player/seraphinamasked.iqm_0.skin
@@ -1,2 +1,2 @@
 ignis42,ignisfullbright
-ignis42.002,ignishead
+ignis42.002,ignisheadfb

diff --git a/models/player/seraphinamasked_lod1.iqm_0.skin b/models/player/seraphinamasked_lod1.iqm_0.skin
index 7b94ebe4a4e61e1d7e0803fb86a91a60fb3ecf4e..1e69498f9f182535a562647f447e95bab549d14a 100644 (file)
--- a/models/player/seraphinamasked_lod1.iqm_0.skin
+++ b/models/player/seraphinamasked_lod1.iqm_0.skin
@@ -1,2 +1,2 @@
 ignis42,ignisfullbright
-ignis42.002,ignishead
+ignis42.002,ignisheadfb

diff --git a/models/player/seraphinamasked_lod2.iqm_0.skin b/models/player/seraphinamasked_lod2.iqm_0.skin
index 7b94ebe4a4e61e1d7e0803fb86a91a60fb3ecf4e..1e69498f9f182535a562647f447e95bab549d14a 100644 (file)
--- a/models/player/seraphinamasked_lod2.iqm_0.skin
+++ b/models/player/seraphinamasked_lod2.iqm_0.skin
@@ -1,2 +1,2 @@
 ignis42,ignisfullbright
-ignis42.002,ignishead
+ignis42.002,ignisheadfb

diff --git a/scripts/player_erebus.shader b/scripts/player_erebus.shader
index 01c3e7450acb74f31d6ba0d6b7012ebf18bd9952..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
@@ -24,3 +33,12 @@ shadowhead
                rgbgen lightingDiffuse
        }
 }
+
+shadowheadfb
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/shadowheadfb.tga
+               rgbgen lightingDiffuse
+       }
+}

diff --git a/scripts/player_ignis.shader b/scripts/player_ignis.shader
index 81fc6fc58afefcc0f2edc236cded4af6f98339fb..322463a2d663aee1b3b40754f7c8816d3ed9e7e5 100644 (file)
--- a/scripts/player_ignis.shader
+++ b/scripts/player_ignis.shader
@@ -6,6 +6,7 @@ ignis
                rgbgen lightingDiffuse
        }
 }
+
 ignisfullbright
 {
        dpreflectcube cubemaps/default/sky
@@ -23,3 +24,12 @@ ignishead
                rgbgen lightingDiffuse
        }
 }
+
+ignisheadfb
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/ignisheadfb.tga
+               rgbgen lightingDiffuse
+       }
+}

diff --git a/textures/erebusfullbright_glow.tga b/textures/erebusfullbright_glow.tga
index 588569f6dd418f009dfeffd34f8960d764aa52ec..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 9aee3c18ac244bb629958d4c4e6d988606c2533a..2c54e978312bb292a913f4f738529fa8c73ad944 100644 (file)
Binary files a/textures/erebusfullbright_shirt.tga and b/textures/erebusfullbright_shirt.tga differ

diff --git a/textures/gakarmor_glow.tga b/textures/gakarmor_glow.tga
index 946e6b555736fecf36484571862f9444c79dbeae..c956996a8a6a5d3c3afb85bc4b119bf84a697576 100644 (file)
Binary files a/textures/gakarmor_glow.tga and b/textures/gakarmor_glow.tga differ

diff --git a/textures/gakarmor_shirt.tga b/textures/gakarmor_shirt.tga
deleted file mode 100644 (file)
index ce4b6d6..0000000
Binary files a/textures/gakarmor_shirt.tga and /dev/null differ

diff --git a/textures/gakarmorfb_glow.tga b/textures/gakarmorfb_glow.tga
index dd873f7d87f0b2c8c3ec186f12ab650c47a13ba8..3e519002304f879ec6842eb8cd6d792370478c6d 100644 (file)
Binary files a/textures/gakarmorfb_glow.tga and b/textures/gakarmorfb_glow.tga differ

diff --git a/textures/gakarmorfb_shirt.tga b/textures/gakarmorfb_shirt.tga
deleted file mode 100644 (file)
index 6bd287d..0000000
Binary files a/textures/gakarmorfb_shirt.tga and /dev/null differ

diff --git a/textures/gakfullbright_glow.tga b/textures/gakfullbright_glow.tga
index edd50b1be4b457e77423f288cb0c2eaf340df376..9aee3c18ac244bb629958d4c4e6d988606c2533a 100644 (file)
Binary files a/textures/gakfullbright_glow.tga and b/textures/gakfullbright_glow.tga differ

diff --git a/textures/gakfullbright_shirt.tga b/textures/gakfullbright_shirt.tga
index 9aee3c18ac244bb629958d4c4e6d988606c2533a..71b570f168e7ce0dcb57b6f427ad3c38e10887b6 100644 (file)
Binary files a/textures/gakfullbright_shirt.tga and b/textures/gakfullbright_shirt.tga differ

diff --git a/textures/ignis.tga b/textures/ignis.tga
index 768ac8896785298506a16740b2f4eaae7f06893c..bcd9f66eb907a98c80a9b516be5e3c5bbfee1234 100644 (file)
Binary files a/textures/ignis.tga and b/textures/ignis.tga differ

diff --git a/textures/ignisfullbright.tga b/textures/ignisfullbright.tga
index 768ac8896785298506a16740b2f4eaae7f06893c..bcd9f66eb907a98c80a9b516be5e3c5bbfee1234 100644 (file)
Binary files a/textures/ignisfullbright.tga and b/textures/ignisfullbright.tga differ

diff --git a/textures/ignisfullbright_glow.tga b/textures/ignisfullbright_glow.tga
index c97fb7f4d404e20d00fe9c274e654ef691fc1869..7bcace5b80249d7e4f6fe4d740ed6c6db8ef64ff 100644 (file)
Binary files a/textures/ignisfullbright_glow.tga and b/textures/ignisfullbright_glow.tga differ

diff --git a/textures/ignisfullbright_shirt.tga b/textures/ignisfullbright_shirt.tga
index 9aee3c18ac244bb629958d4c4e6d988606c2533a..f7fbf008171a2bc8a2139622aa8269cf783b4f19 100644 (file)
Binary files a/textures/ignisfullbright_shirt.tga and b/textures/ignisfullbright_shirt.tga differ

diff --git a/textures/ignishead.tga b/textures/ignishead.tga
index 096b943f39d32f5c415f9d0e7759e9ec8e72469c..c95d1635a2b6206c8ba977b967f3ef4e5d0947d9 100644 (file)
Binary files a/textures/ignishead.tga and b/textures/ignishead.tga differ

diff --git a/textures/ignisheadfb.tga b/textures/ignisheadfb.tga
new file mode 100644 (file)
index 0000000..5cb7c56
Binary files /dev/null and b/textures/ignisheadfb.tga differ

diff --git a/textures/ignisheadfb_gloss.tga b/textures/ignisheadfb_gloss.tga
new file mode 100644 (file)
index 0000000..37bf376
Binary files /dev/null and b/textures/ignisheadfb_gloss.tga differ

diff --git a/textures/ignisheadfb_glow.tga b/textures/ignisheadfb_glow.tga
new file mode 100644 (file)
index 0000000..27aec27
Binary files /dev/null and b/textures/ignisheadfb_glow.tga differ

diff --git a/textures/ignisheadfb_norm.tga b/textures/ignisheadfb_norm.tga
new file mode 100644 (file)
index 0000000..ec4b095
Binary files /dev/null and b/textures/ignisheadfb_norm.tga differ

diff --git a/textures/ignisheadfb_reflect.tga b/textures/ignisheadfb_reflect.tga
new file mode 100644 (file)
index 0000000..2f3fa94
Binary files /dev/null and b/textures/ignisheadfb_reflect.tga differ

diff --git a/textures/ignisheadfb_shirt.tga b/textures/ignisheadfb_shirt.tga
new file mode 100644 (file)
index 0000000..de4034f
Binary files /dev/null and b/textures/ignisheadfb_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 033e27402ab3b425d57807648dd7ad467d2edf49..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 9aee3c18ac244bb629958d4c4e6d988606c2533a..2c54e978312bb292a913f4f738529fa8c73ad944 100644 (file)
Binary files a/textures/nyxfullbright_shirt.tga and b/textures/nyxfullbright_shirt.tga differ

diff --git a/textures/pyria_shirt.tga b/textures/pyria_shirt.tga
index 62ca44604f4d9736719c222be9223426f44df80c..e8e6a47acc29e2b7fdec84e4ddf79d417782fb4e 100644 (file)
Binary files a/textures/pyria_shirt.tga and b/textures/pyria_shirt.tga differ

diff --git a/textures/pyriafullbright_glow.tga b/textures/pyriafullbright_glow.tga
index c3f1e781cc12d1518587693952ba80b523bdafba..a4611f2859127d8a7a8e34d43a0bb7883bebc957 100644 (file)
Binary files a/textures/pyriafullbright_glow.tga and b/textures/pyriafullbright_glow.tga differ

diff --git a/textures/pyriafullbright_shirt.tga b/textures/pyriafullbright_shirt.tga
index 9aee3c18ac244bb629958d4c4e6d988606c2533a..0e934d6464731b7c0804c414e167bcb9c66ae9a3 100644 (file)
Binary files a/textures/pyriafullbright_shirt.tga and b/textures/pyriafullbright_shirt.tga differ

diff --git a/textures/shadowhead_shirt.tga b/textures/shadowhead_shirt.tga
index aa1f645787227e6815ae01062a259a267a4f4d8f..648d9007641d56f3590404cb7d8daf46ce3e76c0 100644 (file)
Binary files a/textures/shadowhead_shirt.tga and b/textures/shadowhead_shirt.tga differ

diff --git a/textures/shadowheadfb.tga b/textures/shadowheadfb.tga
new file mode 100644 (file)
index 0000000..29893e2
Binary files /dev/null and b/textures/shadowheadfb.tga differ

diff --git a/textures/shadowheadfb_gloss.tga b/textures/shadowheadfb_gloss.tga
new file mode 100644 (file)
index 0000000..2abb3f0
Binary files /dev/null and b/textures/shadowheadfb_gloss.tga differ

diff --git a/textures/shadowheadfb_glow.tga b/textures/shadowheadfb_glow.tga
new file mode 100644 (file)
index 0000000..1e69d82
Binary files /dev/null and b/textures/shadowheadfb_glow.tga differ

diff --git a/textures/shadowheadfb_norm.tga b/textures/shadowheadfb_norm.tga
new file mode 100644 (file)
index 0000000..19dd82c
Binary files /dev/null and b/textures/shadowheadfb_norm.tga differ

diff --git a/textures/shadowheadfb_reflect.tga b/textures/shadowheadfb_reflect.tga
new file mode 100644 (file)
index 0000000..f22a578
Binary files /dev/null and b/textures/shadowheadfb_reflect.tga differ

diff --git a/textures/shadowheadfb_shirt.tga b/textures/shadowheadfb_shirt.tga
new file mode 100644 (file)
index 0000000..f49ef02
Binary files /dev/null and b/textures/shadowheadfb_shirt.tga differ

diff --git a/textures/umbra_glow.tga b/textures/umbra_glow.tga
index dc6031ef11d64fdf0c2d08e200b07474ce8e17e0..aeef8deaf4af0275ca706a5bc2f6514e876c97a2 100644 (file)
Binary files a/textures/umbra_glow.tga and b/textures/umbra_glow.tga differ

diff --git a/textures/umbra_shirt.tga b/textures/umbra_shirt.tga
index 8d04c364cc12551c79bb65cbf9d313e6150eeae1..2898c6917ed0b681d2d531337bbb9c457719d72d 100644 (file)
Binary files a/textures/umbra_shirt.tga and b/textures/umbra_shirt.tga differ

diff --git a/textures/umbrafullbright_glow.tga b/textures/umbrafullbright_glow.tga
index adc75ee3fa786a475d9d1f643db87b8be5473a3c..1d32c01e51f2b01e3819feb75d019c0fe58b4004 100644 (file)
Binary files a/textures/umbrafullbright_glow.tga and b/textures/umbrafullbright_glow.tga differ

diff --git a/textures/umbrafullbright_shirt.tga b/textures/umbrafullbright_shirt.tga
index 9aee3c18ac244bb629958d4c4e6d988606c2533a..7555385145b0c80e3d0769034d2efcc253d11baf 100644 (file)
Binary files a/textures/umbrafullbright_shirt.tga and b/textures/umbrafullbright_shirt.tga differ