From 694416c141b0262b91f6e415b9e094dd91434e88 Mon Sep 17 00:00:00 2001 From: RandumKiwi Date: Thu, 17 Jan 2013 19:39:22 +0000 Subject: [PATCH] ch-ch-changes git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7108 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- .../{rattrap => golgotha}/rb_trim_03.jpg | Bin packages/textures/makke/rattrap/license.txt | 14 +++++ .../{ => makke}/rattrap/rb_box_01.jpg | Bin .../{ => makke}/rattrap/rb_box_02.jpg | Bin .../{ => makke}/rattrap/rb_box_03.jpg | Bin .../{ => makke}/rattrap/rb_box_04.jpg | Bin .../{ => makke}/rattrap/rb_box_05.jpg | Bin .../{ => makke}/rattrap/rb_box_06.jpg | Bin .../{ => makke}/rattrap/rb_bricks_01.jpg | Bin .../{ => makke}/rattrap/rb_bricks_02.jpg | Bin .../{ => makke}/rattrap/rb_bricks_03.jpg | Bin .../{ => makke}/rattrap/rb_concrete.jpg | Bin .../{ => makke}/rattrap/rb_planks02_trim.jpg | Bin .../{rattrap => makke}/rb_trim_02.jpg | Bin .../textures/{rattrap => makke}/rb_window.jpg | Bin .../{rattrap => makke}/rb_window2.jpg | Bin .../{rattrap => noctua/ground}/rb_trim_01.jpg | Bin packages/textures/noctua/license.txt | 3 ++ packages/textures/rattrap/license.txt | 51 ------------------ 19 files changed, 17 insertions(+), 51 deletions(-) rename packages/textures/{rattrap => golgotha}/rb_trim_03.jpg (100%) create mode 100644 packages/textures/makke/rattrap/license.txt rename packages/textures/{ => makke}/rattrap/rb_box_01.jpg (100%) rename packages/textures/{ => makke}/rattrap/rb_box_02.jpg (100%) rename packages/textures/{ => makke}/rattrap/rb_box_03.jpg (100%) rename packages/textures/{ => makke}/rattrap/rb_box_04.jpg (100%) rename packages/textures/{ => makke}/rattrap/rb_box_05.jpg (100%) rename packages/textures/{ => makke}/rattrap/rb_box_06.jpg (100%) rename packages/textures/{ => makke}/rattrap/rb_bricks_01.jpg (100%) rename packages/textures/{ => makke}/rattrap/rb_bricks_02.jpg (100%) rename packages/textures/{ => makke}/rattrap/rb_bricks_03.jpg (100%) rename packages/textures/{ => makke}/rattrap/rb_concrete.jpg (100%) rename packages/textures/{ => makke}/rattrap/rb_planks02_trim.jpg (100%) rename packages/textures/{rattrap => makke}/rb_trim_02.jpg (100%) rename packages/textures/{rattrap => makke}/rb_window.jpg (100%) rename packages/textures/{rattrap => makke}/rb_window2.jpg (100%) rename packages/textures/{rattrap => noctua/ground}/rb_trim_01.jpg (100%) delete mode 100644 packages/textures/rattrap/license.txt diff --git a/packages/textures/rattrap/rb_trim_03.jpg b/packages/textures/golgotha/rb_trim_03.jpg similarity index 100% rename from packages/textures/rattrap/rb_trim_03.jpg rename to packages/textures/golgotha/rb_trim_03.jpg diff --git a/packages/textures/makke/rattrap/license.txt b/packages/textures/makke/rattrap/license.txt new file mode 100644 index 00000000..007c0f11 --- /dev/null +++ b/packages/textures/makke/rattrap/license.txt @@ -0,0 +1,14 @@ +* rb_box_01.jpg +* rb_box_02.jpg +* rb_box_03.jpg +* rb_box_04.jpg +* rb_box_05.jpg +* rb_box_06.jpg +* rb_bricks_01.jpg +* rb_bricks_02.jpg +* rb_bricks_03.jpg +* rb_concrete.jpg + +These are re-assembled from: packages/textures/makke +Please adhere to the license(s) specified for the textures +these derive from, in that folder. \ No newline at end of file diff --git a/packages/textures/rattrap/rb_box_01.jpg b/packages/textures/makke/rattrap/rb_box_01.jpg similarity index 100% rename from packages/textures/rattrap/rb_box_01.jpg rename to packages/textures/makke/rattrap/rb_box_01.jpg diff --git a/packages/textures/rattrap/rb_box_02.jpg b/packages/textures/makke/rattrap/rb_box_02.jpg similarity index 100% rename from packages/textures/rattrap/rb_box_02.jpg rename to packages/textures/makke/rattrap/rb_box_02.jpg diff --git a/packages/textures/rattrap/rb_box_03.jpg b/packages/textures/makke/rattrap/rb_box_03.jpg similarity index 100% rename from packages/textures/rattrap/rb_box_03.jpg rename to packages/textures/makke/rattrap/rb_box_03.jpg diff --git a/packages/textures/rattrap/rb_box_04.jpg b/packages/textures/makke/rattrap/rb_box_04.jpg similarity index 100% rename from packages/textures/rattrap/rb_box_04.jpg rename to packages/textures/makke/rattrap/rb_box_04.jpg diff --git a/packages/textures/rattrap/rb_box_05.jpg b/packages/textures/makke/rattrap/rb_box_05.jpg similarity index 100% rename from packages/textures/rattrap/rb_box_05.jpg rename to packages/textures/makke/rattrap/rb_box_05.jpg diff --git a/packages/textures/rattrap/rb_box_06.jpg b/packages/textures/makke/rattrap/rb_box_06.jpg similarity index 100% rename from packages/textures/rattrap/rb_box_06.jpg rename to packages/textures/makke/rattrap/rb_box_06.jpg diff --git a/packages/textures/rattrap/rb_bricks_01.jpg b/packages/textures/makke/rattrap/rb_bricks_01.jpg similarity index 100% rename from packages/textures/rattrap/rb_bricks_01.jpg rename to packages/textures/makke/rattrap/rb_bricks_01.jpg diff --git a/packages/textures/rattrap/rb_bricks_02.jpg b/packages/textures/makke/rattrap/rb_bricks_02.jpg similarity index 100% rename from packages/textures/rattrap/rb_bricks_02.jpg rename to packages/textures/makke/rattrap/rb_bricks_02.jpg diff --git a/packages/textures/rattrap/rb_bricks_03.jpg b/packages/textures/makke/rattrap/rb_bricks_03.jpg similarity index 100% rename from packages/textures/rattrap/rb_bricks_03.jpg rename to packages/textures/makke/rattrap/rb_bricks_03.jpg diff --git a/packages/textures/rattrap/rb_concrete.jpg b/packages/textures/makke/rattrap/rb_concrete.jpg similarity index 100% rename from packages/textures/rattrap/rb_concrete.jpg rename to packages/textures/makke/rattrap/rb_concrete.jpg diff --git a/packages/textures/rattrap/rb_planks02_trim.jpg b/packages/textures/makke/rattrap/rb_planks02_trim.jpg similarity index 100% rename from packages/textures/rattrap/rb_planks02_trim.jpg rename to packages/textures/makke/rattrap/rb_planks02_trim.jpg diff --git a/packages/textures/rattrap/rb_trim_02.jpg b/packages/textures/makke/rb_trim_02.jpg similarity index 100% rename from packages/textures/rattrap/rb_trim_02.jpg rename to packages/textures/makke/rb_trim_02.jpg diff --git a/packages/textures/rattrap/rb_window.jpg b/packages/textures/makke/rb_window.jpg similarity index 100% rename from packages/textures/rattrap/rb_window.jpg rename to packages/textures/makke/rb_window.jpg diff --git a/packages/textures/rattrap/rb_window2.jpg b/packages/textures/makke/rb_window2.jpg similarity index 100% rename from packages/textures/rattrap/rb_window2.jpg rename to packages/textures/makke/rb_window2.jpg diff --git a/packages/textures/rattrap/rb_trim_01.jpg b/packages/textures/noctua/ground/rb_trim_01.jpg similarity index 100% rename from packages/textures/rattrap/rb_trim_01.jpg rename to packages/textures/noctua/ground/rb_trim_01.jpg diff --git a/packages/textures/noctua/license.txt b/packages/textures/noctua/license.txt index 0c0a782e..26342cc0 100755 --- a/packages/textures/noctua/license.txt +++ b/packages/textures/noctua/license.txt @@ -11,3 +11,6 @@ They are distributed under the following license: permission and you strictly may NOT offer them as textures for sale in any way. + +FYI: + ./ground/rb_trim_01.jpg was edited by Ratboy for AC. \ No newline at end of file diff --git a/packages/textures/rattrap/license.txt b/packages/textures/rattrap/license.txt deleted file mode 100644 index db8521ba..00000000 --- a/packages/textures/rattrap/license.txt +++ /dev/null @@ -1,51 +0,0 @@ -* rb_box_01.jpg -* rb_box_02.jpg -* rb_box_03.jpg -* rb_box_04.jpg -* rb_box_05.jpg -* rb_box_06.jpg -* rb_bricks_01.jpg -* rb_bricks_02.jpg -* rb_bricks_03.jpg -* rb_concrete.jpg - -These are re-assembled from: packages/textures/makke -Please adhere to the license(s) specified for the textures -these derive from, in that folder. -__________________________________________________________ - -* rb_box_07.jpg - -This is re-assembled from: packages/textures/zastrow -Please adhere to the license(s) specified for the textures -these derive from, in that folder. -__________________________________________________________ - -* rb_trim_03.jpg - -This is re-assembled from: packages/textures/mitaman/various -Please adhere to the license(s) specified for the textures -these derive from, in that folder. -__________________________________________________________ - -* rb_trim_01.jpg - -This uses a texture from: packages/textures/noctua/ground -Please adhere to the license(s) specified for the textures -these derive from, in that folder. -__________________________________________________________ - -* rb_trim_02.jpg - -This uses a skin from: packages/models/mapmodels/comp_bridge -Please adhere to the license(s) specified for the textures -these derive from, in that folder. -__________________________________________________________ - -* rb_window.jpg -* rb_window2.jpg - -These 2 textures "rb_window.jpg" and "rb_window2.jpg" -were created specifically for ac_rattrap and are -© Copyright by Markus "makkE" Bekel. -