Merge branch 'master' into mirceakitsune/player_cubemaps

diff --git a/scripts/player_erebus.shader b/scripts/player_erebus.shader
new file mode 100644 (file)
index 0000000..1499ff1
--- /dev/null
+++ b/scripts/player_erebus.shader
@@ -0,0 +1,26 @@
+erebus
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/erebus.tga
+               rgbgen lightingDiffuse
+       }
+}
+
+erebusfullbright
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/erebusfullbright.tga
+               rgbgen lightingDiffuse
+       }
+}
+
+shadowhead
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/shadowhead.tga
+               rgbgen lightingDiffuse
+       }
+}

diff --git a/scripts/player_gak.shader b/scripts/player_gak.shader
new file mode 100644 (file)
index 0000000..858a758
--- /dev/null
+++ b/scripts/player_gak.shader
@@ -0,0 +1,17 @@
+gak
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/gak.tga
+               rgbgen lightingDiffuse
+       }
+}
+
+gakarmor
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/gakarmor.tga
+               rgbgen lightingDiffuse
+       }
+}

diff --git a/scripts/player_ignis.shader b/scripts/player_ignis.shader
new file mode 100644 (file)
index 0000000..5a14f12
--- /dev/null
+++ b/scripts/player_ignis.shader
@@ -0,0 +1,17 @@
+ignis
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/ignis.tga
+               rgbgen lightingDiffuse
+       }
+}
+
+ignishead
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/ignishead.tga
+               rgbgen lightingDiffuse
+       }
+}

diff --git a/scripts/player_nyx.shader b/scripts/player_nyx.shader
new file mode 100644 (file)
index 0000000..0f21b09
--- /dev/null
+++ b/scripts/player_nyx.shader
@@ -0,0 +1,9 @@
+nyx
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/nyx.tga
+               rgbgen lightingDiffuse
+       }
+}
+

diff --git a/scripts/player_pyria.shader b/scripts/player_pyria.shader
new file mode 100644 (file)
index 0000000..49a54c6
--- /dev/null
+++ b/scripts/player_pyria.shader
@@ -0,0 +1,22 @@
+pyria
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/pyria.tga
+               rgbgen lightingDiffuse
+       }
+}
+
+pyriahair
+{
+
+       surfaceparm trans
+       cull none
+
+       {
+               map textures/pyriahair
+               alphaFunc GE128
+               blendFunc blend
+               rgbGen identity
+       }
+}

diff --git a/scripts/player_seraphina.shader b/scripts/player_seraphina.shader
new file mode 100644 (file)
index 0000000..af5062d
--- /dev/null
+++ b/scripts/player_seraphina.shader
@@ -0,0 +1,8 @@
+seraphina
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/seraphina.tga
+               rgbgen lightingDiffuse
+       }
+}

diff --git a/scripts/player_umbra.shader b/scripts/player_umbra.shader
new file mode 100644 (file)
index 0000000..3f4b5ed
--- /dev/null
+++ b/scripts/player_umbra.shader
@@ -0,0 +1,9 @@
+umbra
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map textures/umbra.tga
+               rgbgen lightingDiffuse
+       }
+}
+

diff --git a/scripts/pyria.shader b/scripts/pyria.shader
deleted file mode 100644 (file)
index 8cc0385..0000000
--- a/scripts/pyria.shader
+++ /dev/null
@@ -1,13 +0,0 @@
-pyriahair
-{
-
-       surfaceparm trans
-       cull none
-
-       {
-               map textures/pyriahair
-               alphaFunc GE128
-               blendFunc blend
-               rgbGen identity
-       }
-}

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

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

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

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

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

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

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

diff --git a/textures/pyria_reflect.jpg b/textures/pyria_reflect.jpg
new file mode 100644 (file)
index 0000000..219469c
Binary files /dev/null and b/textures/pyria_reflect.jpg differ

diff --git a/textures/seraphina_reflect.jpg b/textures/seraphina_reflect.jpg
new file mode 100644 (file)
index 0000000..7b2fb4c
Binary files /dev/null and b/textures/seraphina_reflect.jpg differ

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

diff --git a/textures/umbra_reflect.jpg b/textures/umbra_reflect.jpg
new file mode 100644 (file)
index 0000000..c1fa10e
Binary files /dev/null and b/textures/umbra_reflect.jpg differ