Move player textures to a subfolder

diff --git a/data/models/player/vixen.zym_0.skin b/data/models/player/vixen.zym_0.skin
index 6fde13cfc4e16cf645db040326a3091976d1e8f4..93979d3feb65166ad1f902d4a3a8fd179f5a027e 100644 (file)
--- a/data/models/player/vixen.zym_0.skin
+++ b/data/models/player/vixen.zym_0.skin
@@ -1 +1 @@
-vixen, vixen-1
\ No newline at end of file
+vixen, textures/player/vixen-1
\ No newline at end of file

diff --git a/data/models/player/vixen.zym_1.skin b/data/models/player/vixen.zym_1.skin
index ad6222779ddc5482fd497cbc15641c2582c53434..0a5e8edbcd63e960382d16562daea71fea67a426 100644 (file)
--- a/data/models/player/vixen.zym_1.skin
+++ b/data/models/player/vixen.zym_1.skin
@@ -1 +1 @@
-vixen, vixen-2
\ No newline at end of file
+vixen, textures/player/vixen-2
\ No newline at end of file

diff --git a/data/models/player/vixen_state1.zym_0.skin b/data/models/player/vixen_state1.zym_0.skin
index 6fde13cfc4e16cf645db040326a3091976d1e8f4..93979d3feb65166ad1f902d4a3a8fd179f5a027e 100644 (file)
--- a/data/models/player/vixen_state1.zym_0.skin
+++ b/data/models/player/vixen_state1.zym_0.skin
@@ -1 +1 @@
-vixen, vixen-1
\ No newline at end of file
+vixen, textures/player/vixen-1
\ No newline at end of file

diff --git a/data/models/player/vixen_state1.zym_1.skin b/data/models/player/vixen_state1.zym_1.skin
index ad6222779ddc5482fd497cbc15641c2582c53434..0a5e8edbcd63e960382d16562daea71fea67a426 100644 (file)
--- a/data/models/player/vixen_state1.zym_1.skin
+++ b/data/models/player/vixen_state1.zym_1.skin
@@ -1 +1 @@
-vixen, vixen-2
\ No newline at end of file
+vixen, textures/player/vixen-2
\ No newline at end of file

diff --git a/data/models/player/vixen_state2.zym_0.skin b/data/models/player/vixen_state2.zym_0.skin
index 6fde13cfc4e16cf645db040326a3091976d1e8f4..93979d3feb65166ad1f902d4a3a8fd179f5a027e 100644 (file)
--- a/data/models/player/vixen_state2.zym_0.skin
+++ b/data/models/player/vixen_state2.zym_0.skin
@@ -1 +1 @@
-vixen, vixen-1
\ No newline at end of file
+vixen, textures/player/vixen-1
\ No newline at end of file

diff --git a/data/models/player/vixen_state2.zym_1.skin b/data/models/player/vixen_state2.zym_1.skin
index ad6222779ddc5482fd497cbc15641c2582c53434..0a5e8edbcd63e960382d16562daea71fea67a426 100644 (file)
--- a/data/models/player/vixen_state2.zym_1.skin
+++ b/data/models/player/vixen_state2.zym_1.skin
@@ -1 +1 @@
-vixen, vixen-2
\ No newline at end of file
+vixen, textures/player/vixen-2
\ No newline at end of file

diff --git a/data/models/player/vixen_state3.zym_0.skin b/data/models/player/vixen_state3.zym_0.skin
index 6fde13cfc4e16cf645db040326a3091976d1e8f4..93979d3feb65166ad1f902d4a3a8fd179f5a027e 100644 (file)
--- a/data/models/player/vixen_state3.zym_0.skin
+++ b/data/models/player/vixen_state3.zym_0.skin
@@ -1 +1 @@
-vixen, vixen-1
\ No newline at end of file
+vixen, textures/player/vixen-1
\ No newline at end of file

diff --git a/data/models/player/vixen_state3.zym_1.skin b/data/models/player/vixen_state3.zym_1.skin
index ad6222779ddc5482fd497cbc15641c2582c53434..0a5e8edbcd63e960382d16562daea71fea67a426 100644 (file)
--- a/data/models/player/vixen_state3.zym_1.skin
+++ b/data/models/player/vixen_state3.zym_1.skin
@@ -1 +1 @@
-vixen, vixen-2
\ No newline at end of file
+vixen, textures/player/vixen-2
\ No newline at end of file

diff --git a/data/models/player/vixen_stomach.md3_0.skin b/data/models/player/vixen_stomach.md3_0.skin
index 458e2e3d35ecb7da3dcdf4fdef9b678c18342f2b..6d94f53844cf5cf09cd2e16bcb93c3d6eb6ef695 100644 (file)
--- a/data/models/player/vixen_stomach.md3_0.skin
+++ b/data/models/player/vixen_stomach.md3_0.skin
@@ -1 +1 @@
-vixen_stomach,textures/vixen-1_stomach
\ No newline at end of file
+vixen_stomach,textures/player/vixen-1_stomach
\ No newline at end of file

diff --git a/data/models/player/vixen_stomach.md3_1.skin b/data/models/player/vixen_stomach.md3_1.skin
index 5299178961f3410ff6914c7d3c62b07d88add09d..07919b5533e65093751dfac015d177970a207036 100644 (file)
--- a/data/models/player/vixen_stomach.md3_1.skin
+++ b/data/models/player/vixen_stomach.md3_1.skin
@@ -1 +1 @@
-vixen_stomach,textures/vixen-2_stomach
\ No newline at end of file
+vixen_stomach,textures/player/vixen-2_stomach
\ No newline at end of file

diff --git a/data/scripts/vixen.shader b/data/scripts/vixen.shader
index e0c21019ac8e63392e7e47e93c46518a2f274e79..7e6b0d1c93e70bcba14cfe74abd2dae727e8aa39 100644 (file)
--- a/data/scripts/vixen.shader
+++ b/data/scripts/vixen.shader
@@ -1,15 +1,17 @@
-textures/vixen-1_stomach {\r
+textures/player/vixen-1_stomach\r
+{\r

        dpreflectcube cubemaps/default/sky\r
        deformVertexes wave 100 sin 0 2.5 0 3\r
        {\r
        dpreflectcube cubemaps/default/sky\r
        deformVertexes wave 100 sin 0 2.5 0 3\r
        {\r

-               map textures/vixen-1_stomach.tga\r
+               map textures/player/vixen-1_stomach.tga\r

        }\r
 }\r
 \r
        }\r
 }\r
 \r

-textures/vixen-2_stomach {\r
+textures/player/vixen-2_stomach\r
+{\r

        dpreflectcube cubemaps/default/sky\r
        deformVertexes wave 100 sin 0 2.5 0 3\r
        {\r
        dpreflectcube cubemaps/default/sky\r
        deformVertexes wave 100 sin 0 2.5 0 3\r
        {\r

-               map textures/vixen-2_stomach.tga\r
+               map textures/player/vixen-2_stomach.tga\r

        }\r
 }\r
        }\r
 }\r

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

diff --git a/data/textures/player/vixen-1_bump.tga b/data/textures/player/vixen-1_bump.tga
new file mode 100644 (file)
index 0000000..4277cf9
Binary files /dev/null and b/data/textures/player/vixen-1_bump.tga differ

diff --git a/data/textures/player/vixen-1_gloss.tga b/data/textures/player/vixen-1_gloss.tga
new file mode 100644 (file)
index 0000000..5c36db5
Binary files /dev/null and b/data/textures/player/vixen-1_gloss.tga differ

diff --git a/data/textures/player/vixen-1_glow.tga b/data/textures/player/vixen-1_glow.tga
new file mode 100644 (file)
index 0000000..5b7b082
Binary files /dev/null and b/data/textures/player/vixen-1_glow.tga differ

diff --git a/data/textures/player/vixen-1_shirt.tga b/data/textures/player/vixen-1_shirt.tga
new file mode 100644 (file)
index 0000000..e871f1b
Binary files /dev/null and b/data/textures/player/vixen-1_shirt.tga differ

diff --git a/data/textures/player/vixen-1_stomach.tga b/data/textures/player/vixen-1_stomach.tga
new file mode 100644 (file)
index 0000000..23f9380
Binary files /dev/null and b/data/textures/player/vixen-1_stomach.tga differ

diff --git a/data/textures/player/vixen-1_stomach_bump.tga b/data/textures/player/vixen-1_stomach_bump.tga
new file mode 100644 (file)
index 0000000..7ae39f5
Binary files /dev/null and b/data/textures/player/vixen-1_stomach_bump.tga differ

diff --git a/data/textures/player/vixen-1_stomach_gloss.tga b/data/textures/player/vixen-1_stomach_gloss.tga
new file mode 100644 (file)
index 0000000..88f881f
Binary files /dev/null and b/data/textures/player/vixen-1_stomach_gloss.tga differ

diff --git a/data/textures/player/vixen-1_stomach_reflect.tga b/data/textures/player/vixen-1_stomach_reflect.tga
new file mode 100644 (file)
index 0000000..5c694a1
Binary files /dev/null and b/data/textures/player/vixen-1_stomach_reflect.tga differ

diff --git a/data/textures/player/vixen-2.tga b/data/textures/player/vixen-2.tga
new file mode 100644 (file)
index 0000000..857609c
Binary files /dev/null and b/data/textures/player/vixen-2.tga differ

diff --git a/data/textures/player/vixen-2_bump.tga b/data/textures/player/vixen-2_bump.tga
new file mode 100644 (file)
index 0000000..76662de
Binary files /dev/null and b/data/textures/player/vixen-2_bump.tga differ

diff --git a/data/textures/player/vixen-2_gloss.tga b/data/textures/player/vixen-2_gloss.tga
new file mode 100644 (file)
index 0000000..92218a4
Binary files /dev/null and b/data/textures/player/vixen-2_gloss.tga differ

diff --git a/data/textures/player/vixen-2_glow.tga b/data/textures/player/vixen-2_glow.tga
new file mode 100644 (file)
index 0000000..bc474e3
Binary files /dev/null and b/data/textures/player/vixen-2_glow.tga differ

diff --git a/data/textures/player/vixen-2_shirt.tga b/data/textures/player/vixen-2_shirt.tga
new file mode 100644 (file)
index 0000000..1e0c69b
Binary files /dev/null and b/data/textures/player/vixen-2_shirt.tga differ

diff --git a/data/textures/player/vixen-2_stomach.tga b/data/textures/player/vixen-2_stomach.tga
new file mode 100644 (file)
index 0000000..1158dc9
Binary files /dev/null and b/data/textures/player/vixen-2_stomach.tga differ

diff --git a/data/textures/player/vixen-2_stomach_bump.tga b/data/textures/player/vixen-2_stomach_bump.tga
new file mode 100644 (file)
index 0000000..7ae39f5
Binary files /dev/null and b/data/textures/player/vixen-2_stomach_bump.tga differ

diff --git a/data/textures/player/vixen-2_stomach_gloss.tga b/data/textures/player/vixen-2_stomach_gloss.tga
new file mode 100644 (file)
index 0000000..cdd6370
Binary files /dev/null and b/data/textures/player/vixen-2_stomach_gloss.tga differ

diff --git a/data/textures/player/vixen-2_stomach_glow.tga b/data/textures/player/vixen-2_stomach_glow.tga
new file mode 100644 (file)
index 0000000..0f4fff6
Binary files /dev/null and b/data/textures/player/vixen-2_stomach_glow.tga differ

diff --git a/data/textures/player/vixen-2_stomach_reflect.tga b/data/textures/player/vixen-2_stomach_reflect.tga
new file mode 100644 (file)
index 0000000..879c058
Binary files /dev/null and b/data/textures/player/vixen-2_stomach_reflect.tga differ

diff --git a/data/textures/vixen-1.tga b/data/textures/vixen-1.tga
deleted file mode 100644 (file)
index ec5d4c6..0000000
Binary files a/data/textures/vixen-1.tga and /dev/null differ

diff --git a/data/textures/vixen-1_bump.tga b/data/textures/vixen-1_bump.tga
deleted file mode 100644 (file)
index 4277cf9..0000000
Binary files a/data/textures/vixen-1_bump.tga and /dev/null differ

diff --git a/data/textures/vixen-1_gloss.tga b/data/textures/vixen-1_gloss.tga
deleted file mode 100644 (file)
index 5c36db5..0000000
Binary files a/data/textures/vixen-1_gloss.tga and /dev/null differ

diff --git a/data/textures/vixen-1_glow.tga b/data/textures/vixen-1_glow.tga
deleted file mode 100644 (file)
index 5b7b082..0000000
Binary files a/data/textures/vixen-1_glow.tga and /dev/null differ

diff --git a/data/textures/vixen-1_shirt.tga b/data/textures/vixen-1_shirt.tga
deleted file mode 100644 (file)
index e871f1b..0000000
Binary files a/data/textures/vixen-1_shirt.tga and /dev/null differ

diff --git a/data/textures/vixen-1_stomach.tga b/data/textures/vixen-1_stomach.tga
deleted file mode 100644 (file)
index 23f9380..0000000
Binary files a/data/textures/vixen-1_stomach.tga and /dev/null differ

diff --git a/data/textures/vixen-1_stomach_bump.tga b/data/textures/vixen-1_stomach_bump.tga
deleted file mode 100644 (file)
index 7ae39f5..0000000
Binary files a/data/textures/vixen-1_stomach_bump.tga and /dev/null differ

diff --git a/data/textures/vixen-1_stomach_gloss.tga b/data/textures/vixen-1_stomach_gloss.tga
deleted file mode 100644 (file)
index 88f881f..0000000
Binary files a/data/textures/vixen-1_stomach_gloss.tga and /dev/null differ

diff --git a/data/textures/vixen-1_stomach_reflect.tga b/data/textures/vixen-1_stomach_reflect.tga
deleted file mode 100644 (file)
index 5c694a1..0000000
Binary files a/data/textures/vixen-1_stomach_reflect.tga and /dev/null differ

diff --git a/data/textures/vixen-2.tga b/data/textures/vixen-2.tga
deleted file mode 100644 (file)
index 857609c..0000000
Binary files a/data/textures/vixen-2.tga and /dev/null differ

diff --git a/data/textures/vixen-2_bump.tga b/data/textures/vixen-2_bump.tga
deleted file mode 100644 (file)
index 76662de..0000000
Binary files a/data/textures/vixen-2_bump.tga and /dev/null differ

diff --git a/data/textures/vixen-2_gloss.tga b/data/textures/vixen-2_gloss.tga
deleted file mode 100644 (file)
index 92218a4..0000000
Binary files a/data/textures/vixen-2_gloss.tga and /dev/null differ

diff --git a/data/textures/vixen-2_glow.tga b/data/textures/vixen-2_glow.tga
deleted file mode 100644 (file)
index bc474e3..0000000
Binary files a/data/textures/vixen-2_glow.tga and /dev/null differ

diff --git a/data/textures/vixen-2_shirt.tga b/data/textures/vixen-2_shirt.tga
deleted file mode 100644 (file)
index 1e0c69b..0000000
Binary files a/data/textures/vixen-2_shirt.tga and /dev/null differ

diff --git a/data/textures/vixen-2_stomach.tga b/data/textures/vixen-2_stomach.tga
deleted file mode 100644 (file)
index 1158dc9..0000000
Binary files a/data/textures/vixen-2_stomach.tga and /dev/null differ

diff --git a/data/textures/vixen-2_stomach_bump.tga b/data/textures/vixen-2_stomach_bump.tga
deleted file mode 100644 (file)
index 7ae39f5..0000000
Binary files a/data/textures/vixen-2_stomach_bump.tga and /dev/null differ

diff --git a/data/textures/vixen-2_stomach_gloss.tga b/data/textures/vixen-2_stomach_gloss.tga
deleted file mode 100644 (file)
index cdd6370..0000000
Binary files a/data/textures/vixen-2_stomach_gloss.tga and /dev/null differ

diff --git a/data/textures/vixen-2_stomach_glow.tga b/data/textures/vixen-2_stomach_glow.tga
deleted file mode 100644 (file)
index 0f4fff6..0000000
Binary files a/data/textures/vixen-2_stomach_glow.tga and /dev/null differ

diff --git a/data/textures/vixen-2_stomach_reflect.tga b/data/textures/vixen-2_stomach_reflect.tga
deleted file mode 100644 (file)
index 879c058..0000000
Binary files a/data/textures/vixen-2_stomach_reflect.tga and /dev/null differ