From: MirceaKitsune Date: Fri, 8 Jul 2011 21:18:45 +0000 (+0300) Subject: Move player textures to a subfolder X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=13f88b232b48d65598283cb5236bdcb969b8949c;ds=sidebyside 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 6fde13cf..93979d3f 100644 --- 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 ad622277..0a5e8edb 100644 --- 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 6fde13cf..93979d3f 100644 --- 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 ad622277..0a5e8edb 100644 --- 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 6fde13cf..93979d3f 100644 --- 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 ad622277..0a5e8edb 100644 --- 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 6fde13cf..93979d3f 100644 --- 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 ad622277..0a5e8edb 100644 --- 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 458e2e3d..6d94f538 100644 --- 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 52991789..07919b55 100644 --- 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 e0c21019..7e6b0d1c 100644 --- a/data/scripts/vixen.shader +++ b/data/scripts/vixen.shader @@ -1,15 +1,17 @@ -textures/vixen-1_stomach { +textures/player/vixen-1_stomach +{ dpreflectcube cubemaps/default/sky deformVertexes wave 100 sin 0 2.5 0 3 { - map textures/vixen-1_stomach.tga + map textures/player/vixen-1_stomach.tga } } -textures/vixen-2_stomach { +textures/player/vixen-2_stomach +{ dpreflectcube cubemaps/default/sky deformVertexes wave 100 sin 0 2.5 0 3 { - map textures/vixen-2_stomach.tga + map textures/player/vixen-2_stomach.tga } } diff --git a/data/textures/player/vixen-1.tga b/data/textures/player/vixen-1.tga new file mode 100644 index 00000000..ec5d4c6b 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 index 00000000..4277cf90 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 index 00000000..5c36db59 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 index 00000000..5b7b0824 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 index 00000000..e871f1b0 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 index 00000000..23f93807 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 index 00000000..7ae39f50 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 index 00000000..88f881fe 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 index 00000000..5c694a1a 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 index 00000000..857609cd 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 index 00000000..76662de5 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 index 00000000..92218a4f 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 index 00000000..bc474e3f 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 index 00000000..1e0c69b0 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 index 00000000..1158dc92 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 index 00000000..7ae39f50 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 index 00000000..cdd63708 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 index 00000000..0f4fff67 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 index 00000000..879c0588 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 index ec5d4c6b..00000000 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 index 4277cf90..00000000 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 index 5c36db59..00000000 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 index 5b7b0824..00000000 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 index e871f1b0..00000000 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 index 23f93807..00000000 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 index 7ae39f50..00000000 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 index 88f881fe..00000000 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 index 5c694a1a..00000000 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 index 857609cd..00000000 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 index 76662de5..00000000 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 index 92218a4f..00000000 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 index bc474e3f..00000000 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 index 1e0c69b0..00000000 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 index 1158dc92..00000000 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 index 7ae39f50..00000000 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 index cdd63708..00000000 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 index 0f4fff67..00000000 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 index 879c0588..00000000 Binary files a/data/textures/vixen-2_stomach_reflect.tga and /dev/null differ