From 13f88b232b48d65598283cb5236bdcb969b8949c Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Sat, 9 Jul 2011 00:18:45 +0300 Subject: [PATCH] Move player textures to a subfolder --- data/models/player/vixen.zym_0.skin | 2 +- data/models/player/vixen.zym_1.skin | 2 +- data/models/player/vixen_state1.zym_0.skin | 2 +- data/models/player/vixen_state1.zym_1.skin | 2 +- data/models/player/vixen_state2.zym_0.skin | 2 +- data/models/player/vixen_state2.zym_1.skin | 2 +- data/models/player/vixen_state3.zym_0.skin | 2 +- data/models/player/vixen_state3.zym_1.skin | 2 +- data/models/player/vixen_stomach.md3_0.skin | 2 +- data/models/player/vixen_stomach.md3_1.skin | 2 +- data/scripts/vixen.shader | 10 ++++++---- data/textures/{ => player}/vixen-1.tga | Bin data/textures/{ => player}/vixen-1_bump.tga | Bin data/textures/{ => player}/vixen-1_gloss.tga | Bin data/textures/{ => player}/vixen-1_glow.tga | Bin data/textures/{ => player}/vixen-1_shirt.tga | Bin data/textures/{ => player}/vixen-1_stomach.tga | Bin data/textures/{ => player}/vixen-1_stomach_bump.tga | Bin .../textures/{ => player}/vixen-1_stomach_gloss.tga | Bin .../{ => player}/vixen-1_stomach_reflect.tga | Bin data/textures/{ => player}/vixen-2.tga | Bin data/textures/{ => player}/vixen-2_bump.tga | Bin data/textures/{ => player}/vixen-2_gloss.tga | Bin data/textures/{ => player}/vixen-2_glow.tga | Bin data/textures/{ => player}/vixen-2_shirt.tga | Bin data/textures/{ => player}/vixen-2_stomach.tga | Bin data/textures/{ => player}/vixen-2_stomach_bump.tga | Bin .../textures/{ => player}/vixen-2_stomach_gloss.tga | Bin data/textures/{ => player}/vixen-2_stomach_glow.tga | Bin .../{ => player}/vixen-2_stomach_reflect.tga | Bin 30 files changed, 16 insertions(+), 14 deletions(-) rename data/textures/{ => player}/vixen-1.tga (100%) rename data/textures/{ => player}/vixen-1_bump.tga (100%) rename data/textures/{ => player}/vixen-1_gloss.tga (100%) rename data/textures/{ => player}/vixen-1_glow.tga (100%) rename data/textures/{ => player}/vixen-1_shirt.tga (100%) rename data/textures/{ => player}/vixen-1_stomach.tga (100%) rename data/textures/{ => player}/vixen-1_stomach_bump.tga (100%) rename data/textures/{ => player}/vixen-1_stomach_gloss.tga (100%) rename data/textures/{ => player}/vixen-1_stomach_reflect.tga (100%) rename data/textures/{ => player}/vixen-2.tga (100%) rename data/textures/{ => player}/vixen-2_bump.tga (100%) rename data/textures/{ => player}/vixen-2_gloss.tga (100%) rename data/textures/{ => player}/vixen-2_glow.tga (100%) rename data/textures/{ => player}/vixen-2_shirt.tga (100%) rename data/textures/{ => player}/vixen-2_stomach.tga (100%) rename data/textures/{ => player}/vixen-2_stomach_bump.tga (100%) rename data/textures/{ => player}/vixen-2_stomach_gloss.tga (100%) rename data/textures/{ => player}/vixen-2_stomach_glow.tga (100%) rename data/textures/{ => player}/vixen-2_stomach_reflect.tga (100%) 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/vixen-1.tga b/data/textures/player/vixen-1.tga similarity index 100% rename from data/textures/vixen-1.tga rename to data/textures/player/vixen-1.tga diff --git a/data/textures/vixen-1_bump.tga b/data/textures/player/vixen-1_bump.tga similarity index 100% rename from data/textures/vixen-1_bump.tga rename to data/textures/player/vixen-1_bump.tga diff --git a/data/textures/vixen-1_gloss.tga b/data/textures/player/vixen-1_gloss.tga similarity index 100% rename from data/textures/vixen-1_gloss.tga rename to data/textures/player/vixen-1_gloss.tga diff --git a/data/textures/vixen-1_glow.tga b/data/textures/player/vixen-1_glow.tga similarity index 100% rename from data/textures/vixen-1_glow.tga rename to data/textures/player/vixen-1_glow.tga diff --git a/data/textures/vixen-1_shirt.tga b/data/textures/player/vixen-1_shirt.tga similarity index 100% rename from data/textures/vixen-1_shirt.tga rename to data/textures/player/vixen-1_shirt.tga diff --git a/data/textures/vixen-1_stomach.tga b/data/textures/player/vixen-1_stomach.tga similarity index 100% rename from data/textures/vixen-1_stomach.tga rename to data/textures/player/vixen-1_stomach.tga diff --git a/data/textures/vixen-1_stomach_bump.tga b/data/textures/player/vixen-1_stomach_bump.tga similarity index 100% rename from data/textures/vixen-1_stomach_bump.tga rename to data/textures/player/vixen-1_stomach_bump.tga diff --git a/data/textures/vixen-1_stomach_gloss.tga b/data/textures/player/vixen-1_stomach_gloss.tga similarity index 100% rename from data/textures/vixen-1_stomach_gloss.tga rename to data/textures/player/vixen-1_stomach_gloss.tga diff --git a/data/textures/vixen-1_stomach_reflect.tga b/data/textures/player/vixen-1_stomach_reflect.tga similarity index 100% rename from data/textures/vixen-1_stomach_reflect.tga rename to data/textures/player/vixen-1_stomach_reflect.tga diff --git a/data/textures/vixen-2.tga b/data/textures/player/vixen-2.tga similarity index 100% rename from data/textures/vixen-2.tga rename to data/textures/player/vixen-2.tga diff --git a/data/textures/vixen-2_bump.tga b/data/textures/player/vixen-2_bump.tga similarity index 100% rename from data/textures/vixen-2_bump.tga rename to data/textures/player/vixen-2_bump.tga diff --git a/data/textures/vixen-2_gloss.tga b/data/textures/player/vixen-2_gloss.tga similarity index 100% rename from data/textures/vixen-2_gloss.tga rename to data/textures/player/vixen-2_gloss.tga diff --git a/data/textures/vixen-2_glow.tga b/data/textures/player/vixen-2_glow.tga similarity index 100% rename from data/textures/vixen-2_glow.tga rename to data/textures/player/vixen-2_glow.tga diff --git a/data/textures/vixen-2_shirt.tga b/data/textures/player/vixen-2_shirt.tga similarity index 100% rename from data/textures/vixen-2_shirt.tga rename to data/textures/player/vixen-2_shirt.tga diff --git a/data/textures/vixen-2_stomach.tga b/data/textures/player/vixen-2_stomach.tga similarity index 100% rename from data/textures/vixen-2_stomach.tga rename to data/textures/player/vixen-2_stomach.tga diff --git a/data/textures/vixen-2_stomach_bump.tga b/data/textures/player/vixen-2_stomach_bump.tga similarity index 100% rename from data/textures/vixen-2_stomach_bump.tga rename to data/textures/player/vixen-2_stomach_bump.tga diff --git a/data/textures/vixen-2_stomach_gloss.tga b/data/textures/player/vixen-2_stomach_gloss.tga similarity index 100% rename from data/textures/vixen-2_stomach_gloss.tga rename to data/textures/player/vixen-2_stomach_gloss.tga diff --git a/data/textures/vixen-2_stomach_glow.tga b/data/textures/player/vixen-2_stomach_glow.tga similarity index 100% rename from data/textures/vixen-2_stomach_glow.tga rename to data/textures/player/vixen-2_stomach_glow.tga diff --git a/data/textures/vixen-2_stomach_reflect.tga b/data/textures/player/vixen-2_stomach_reflect.tga similarity index 100% rename from data/textures/vixen-2_stomach_reflect.tga rename to data/textures/player/vixen-2_stomach_reflect.tga -- 2.39.2