From: terencehill Date: Thu, 21 Apr 2022 22:30:29 +0000 (+0200) Subject: Add fullbright versions of shadowhead and ignishead (used by 6 player models) X-Git-Tag: xonotic-v0.8.5~7^2~4^2~7 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=1cbe2421acb03ca52d0d7a98ad15f152cc26ef41 Add fullbright versions of shadowhead and ignishead (used by 6 player models) --- diff --git a/models/player/erebus.iqm_0.skin b/models/player/erebus.iqm_0.skin index 4597ceff1e..9f5f7b7dc3 100644 --- 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 4597ceff1e..9f5f7b7dc3 100644 --- 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 4597ceff1e..9f5f7b7dc3 100644 --- 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 2c93e982f5..f31cd8df5c 100644 --- 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 2c93e982f5..f31cd8df5c 100644 --- 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 2c93e982f5..f31cd8df5c 100644 --- 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 eb257cc1d6..a021961610 100644 --- 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 eb257cc1d6..a021961610 100644 --- 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 eb257cc1d6..a021961610 100644 --- 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 4597ceff1e..9f5f7b7dc3 100644 --- a/models/player/megaerebus.iqm_0.skin +++ b/models/player/megaerebus.iqm_0.skin @@ -1,2 +1,2 @@ erebus,erebusfullbright -erebus.001,shadowhead +erebus.001,shadowheadfb diff --git a/models/player/megaerebus_lod1.iqm_0.skin b/models/player/megaerebus_lod1.iqm_0.skin index 4597ceff1e..9f5f7b7dc3 100644 --- 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.001,shadowheadfb diff --git a/models/player/megaerebus_lod2.iqm_0.skin b/models/player/megaerebus_lod2.iqm_0.skin index 4597ceff1e..9f5f7b7dc3 100644 --- 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.001,shadowheadfb diff --git a/models/player/nyx.iqm_0.skin b/models/player/nyx.iqm_0.skin index 19b5fd59b1..2d1096323d 100644 --- 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 19b5fd59b1..2d1096323d 100644 --- 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 19b5fd59b1..2d1096323d 100644 --- 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 7b94ebe4a4..1e69498f9f 100644 --- 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 7b94ebe4a4..1e69498f9f 100644 --- 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 7b94ebe4a4..1e69498f9f 100644 --- 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 01c3e7450a..5da8a5084e 100644 --- a/scripts/player_erebus.shader +++ b/scripts/player_erebus.shader @@ -24,3 +24,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 81fc6fc58a..322463a2d6 100644 --- 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/ignisheadfb.tga b/textures/ignisheadfb.tga new file mode 100644 index 0000000000..096b943f39 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 index 0000000000..37bf376b67 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 index 0000000000..27aec27140 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 index 0000000000..ec4b09519c 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 index 0000000000..2f3fa9465c 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 index 0000000000..de4034f7b7 Binary files /dev/null and b/textures/ignisheadfb_shirt.tga differ diff --git a/textures/shadowheadfb.tga b/textures/shadowheadfb.tga new file mode 100644 index 0000000000..29893e28eb 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 index 0000000000..2abb3f0bca 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 index 0000000000..e7399dd6fd 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 index 0000000000..19dd82c13c 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 index 0000000000..f22a578ffe 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 index 0000000000..cd46cc2cbd Binary files /dev/null and b/textures/shadowheadfb_shirt.tga differ