From 8440902ed7763433a55fcd2c5bfb95380f0fe950 Mon Sep 17 00:00:00 2001 From: RandumKiwi Date: Sat, 12 Jan 2013 14:27:21 +0000 Subject: [PATCH] packaging updates git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7074 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- packages/convert_mapcfgs.sh | 6 ++ packages/models/mapmodels/licenses.txt | 97 ------------------ packages/models/mapmodels/makke/license.txt | 57 ++++++++++ packages/models/mapmodels/wotwot/license.txt | 14 +++ .../wotwot/makke_drainpipe_gritty/skin.jpg} | Bin .../wotwot/toca_commrack_dull/skin.jpg} | Bin .../wotwot/toca_guardrail2_dull/skin.jpg} | Bin .../wotwot/toca_milkcarton_dull/skin.jpg} | Bin .../wotwot/toca_monitor_dull/skin.jpg} | Bin .../textures/wotwot/skin/commrack_readme.txt | 1 - .../textures/wotwot/skin/drainpipe_readme.txt | 1 - .../wotwot/skin/milkcarton_readme.txt | 1 - .../textures/wotwot/skin/monitor_readme.txt | 1 - 13 files changed, 77 insertions(+), 101 deletions(-) delete mode 100644 packages/models/mapmodels/licenses.txt create mode 100644 packages/models/mapmodels/makke/license.txt create mode 100644 packages/models/mapmodels/wotwot/license.txt rename packages/{textures/wotwot/skin/drainpipe.jpg => models/mapmodels/wotwot/makke_drainpipe_gritty/skin.jpg} (100%) rename packages/{textures/wotwot/skin/commrack.jpg => models/mapmodels/wotwot/toca_commrack_dull/skin.jpg} (100%) rename packages/{textures/wotwot/skin/guardrail2.jpg => models/mapmodels/wotwot/toca_guardrail2_dull/skin.jpg} (100%) rename packages/{textures/wotwot/skin/milkcarton.jpg => models/mapmodels/wotwot/toca_milkcarton_dull/skin.jpg} (100%) rename packages/{textures/wotwot/skin/monitor.jpg => models/mapmodels/wotwot/toca_monitor_dull/skin.jpg} (100%) delete mode 100644 packages/textures/wotwot/skin/commrack_readme.txt delete mode 100644 packages/textures/wotwot/skin/drainpipe_readme.txt delete mode 100644 packages/textures/wotwot/skin/milkcarton_readme.txt delete mode 100644 packages/textures/wotwot/skin/monitor_readme.txt diff --git a/packages/convert_mapcfgs.sh b/packages/convert_mapcfgs.sh index 51c6d16f..fc10b15f 100644 --- a/packages/convert_mapcfgs.sh +++ b/packages/convert_mapcfgs.sh @@ -86,6 +86,12 @@ while getopts "c:" copt; do sed -i 's/grass02/makke\/grass_long/g' $OPTARG sed -i 's/grass02_d/makke\/grass_long_dry/g' $OPTARG sed -i 's/grass02_s/makke\/grass_long_snow/g' $OPTARG + echo -e "\nConverting textures..." + sed -i 's/wotwot\/skin\/drainpipe.jpg/..\/..\/..\/models\/mapmodels\/wotwot\/makke_drainpipe_gritty\/skin.jpg/g' $OPTARG + sed -i 's/wotwot\/skin\/commrack.jpg/..\/..\/..\/models\/mapmodels\/wotwot\/toca_commrack_dull\/skin.jpg/g' $OPTARG + sed -i 's/wotwot\/skin\/monitor.jpg/..\/..\/..\/models\/mapmodels\/wotwot\/toca_monitor_dull\/skin.jpg/g' $OPTARG + sed -i 's/wotwot\/skin\/milkcarton.jpg/..\/..\/..\/models\/mapmodels\/wotwot\/toca_milkcarton_dull\/skin.jpg/g' $OPTARG + sed -i 's/wotwot\/skin\/guardrail2.jpg/..\/..\/..\/models\/mapmodels\/wotwot\/toca_guardrail2_dull\/skin.jpg/g' $OPTARG echo -e "\a\nConversion finished!" else echo -e "\a\E[31m\033[1mERROR:\E[0m The path you've stated to the map config file is invalid." diff --git a/packages/models/mapmodels/licenses.txt b/packages/models/mapmodels/licenses.txt deleted file mode 100644 index 0b070e2e..00000000 --- a/packages/models/mapmodels/licenses.txt +++ /dev/null @@ -1,97 +0,0 @@ -AssaultCube Mapmodels -__________________________________________________________________________________________________ - -Modelled/Skinned by JCDPC -========================= -Laptop - - © 2004 by JCDPC, all rights reserved. -__________________________________________________________________________________________________ - -Modelled/skinned by Toca -======================== -All files in the folder "Toca" are created by toca. See toca/licence.txt for details. -__________________________________________________________________________________________________ - -Modelled/skinned by RatBoy -========================== -All files in the folder "rattrap" were originally for the map "ac_rattrap". Some of these models -are using resources from other models/textures. Please see rattrap/license.txt for details. -__________________________________________________________________________________________________ - - -These mapmodels have been created for AssaultCube. - - -Modelled by Shane Nieb : -======================== -Chair1 (model+skin) -dumpster -fence -fencegate_closed -fengegate open -fencepost -nothing -picture1 -light01 -roadblocks - -Skinned by makkE unless otherwise noted. -All other models, unless stated below here, are by makkE. - -LICENSE -======= -All files in this folder and their subfolders stated above: - -by "makkE" -Markus Bekel -e-mail: makk_e@web.de - -by "Nieb" -Shane Nieb -nieb_123@hotmail.com - -Toca Folder: -see /mapmodels/toca/license.txt - -=================================================================================================== -These files have been licensed under a the -"Creative Commons Deed / Attribution Non-commercial Share-Alike ( at-nc-sa )" -=================================================================================================== - -You are free: - - * to copy, distribute, display, and perform the work - * to make derivative works - -Under the following conditions: - -"by" - -Attribution. You must give the original author credit. -"nc" - -Non-Commercial. You may not use this work for commercial purposes. -"sa" - -Share Alike. If you alter, transform, or build upon this work, you may distribute the resulting - work only under a licence identical to this one. - - * For any reuse or distribution, you must make clear to others the licence terms of this work. - * Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. - -This is a human-readable summary of the Legal Code (the full licence). - -===================================================================================================== - -See: - -http://creativecommons.org/licenses/by-nc-sa/2.5/deed.en_GB - -for the original "human readable" document. - -http://creativecommons.org/licenses/by-nc-sa/2.5/legalcode - -for the full legal code. - -visit creativecommons.org for general information and translations of the above documents. - -===================================================================================================== diff --git a/packages/models/mapmodels/makke/license.txt b/packages/models/mapmodels/makke/license.txt new file mode 100644 index 00000000..9181b731 --- /dev/null +++ b/packages/models/mapmodels/makke/license.txt @@ -0,0 +1,57 @@ +LICENSE +================================================================================ +All files in this folder and their subfolders are by Markus "makkE" Bekel + makk_e@web.de + +Originally created for the game AssaultCube: + http://assault.cubers.net/ + +Shane Nieb (nieb_123@hotmail.com) modelled (but did not skin) the following: +================================================================================ +office_chair (Nieb did skin this one) +dumpster +fence_chainlink +fence_chainlink_closed_gate +fence_chainlink_no_gate +fence_chainlink_post +nothing_clip +picture +lightbulb +roadblock +roadblock_graffiti + + +All files within this folder and all subfolders (except "platform_shine/skin.jpg") are licensed as follows: + + +Creative Commons Deed / Attribution Non-commercial Share-Alike (AT-NC-SA): +================================================================================ +You are free: + * to copy, distribute, display, and perform the work + * to make derivative works + +Under the following conditions: + - Attribution. You must give the original author credit. + - Non-Commercial. You may not use this work for commercial purposes. + - Share Alike. If you alter, transform, or build upon this work, you may + distribute the resulting work only under a licence identical to this one. + +For any reuse or distribution, you must make clear to others the licence terms of this work. +Any of these conditions can be waived if you get permission from the copyright holder. + +Your fair use and other rights are in no way affected by the above. + +================================================================================ +This is only a human-readable summary of the Legal Code (the full licence), which can be found at: + http://creativecommons.org/licenses/by-nc-sa/2.5/ +The full legal code can be found at: + http://creativecommons.org/licenses/by-nc-sa/2.5/legalcode +================================================================================ +For "platform_shine/skin.jpg", this is made up of two textures. + +One of the textures licenses can be found here: + ../../../textures/dog/license.txt + +The other license can be found here: + ../../../textures/arcitool/license.txt + diff --git a/packages/models/mapmodels/wotwot/license.txt b/packages/models/mapmodels/wotwot/license.txt new file mode 100644 index 00000000..6c9af69a --- /dev/null +++ b/packages/models/mapmodels/wotwot/license.txt @@ -0,0 +1,14 @@ +================================================================================ + * ./makke_drainpipe_gritty/skin.jpg is a modification of ../makke/drainpipe/skin.jpg + +As such, it is licensed the same. Please read this file for its license: + ../makke/license.txt +================================================================================ + * ./toca_commrack_dull/skin.jpg is a modification of ../toca/commrack/skin.jpg + * ./toca_milkcarton_dull/skin.jpg is a modification of ../toca/milkcarton/skin.jpg + * ./toca_guardrail2_dull/skin.jpg is a modification of ../toca/guardrail2/skin.jpg + * ./toca_monitor_dull/skin.jpg is a modification of ../toca/monitor/skin.jpg + +As such, it is licensed the same. Please read this file for its license: + ../toca/license.txt +================================================================================ \ No newline at end of file diff --git a/packages/textures/wotwot/skin/drainpipe.jpg b/packages/models/mapmodels/wotwot/makke_drainpipe_gritty/skin.jpg similarity index 100% rename from packages/textures/wotwot/skin/drainpipe.jpg rename to packages/models/mapmodels/wotwot/makke_drainpipe_gritty/skin.jpg diff --git a/packages/textures/wotwot/skin/commrack.jpg b/packages/models/mapmodels/wotwot/toca_commrack_dull/skin.jpg similarity index 100% rename from packages/textures/wotwot/skin/commrack.jpg rename to packages/models/mapmodels/wotwot/toca_commrack_dull/skin.jpg diff --git a/packages/textures/wotwot/skin/guardrail2.jpg b/packages/models/mapmodels/wotwot/toca_guardrail2_dull/skin.jpg similarity index 100% rename from packages/textures/wotwot/skin/guardrail2.jpg rename to packages/models/mapmodels/wotwot/toca_guardrail2_dull/skin.jpg diff --git a/packages/textures/wotwot/skin/milkcarton.jpg b/packages/models/mapmodels/wotwot/toca_milkcarton_dull/skin.jpg similarity index 100% rename from packages/textures/wotwot/skin/milkcarton.jpg rename to packages/models/mapmodels/wotwot/toca_milkcarton_dull/skin.jpg diff --git a/packages/textures/wotwot/skin/monitor.jpg b/packages/models/mapmodels/wotwot/toca_monitor_dull/skin.jpg similarity index 100% rename from packages/textures/wotwot/skin/monitor.jpg rename to packages/models/mapmodels/wotwot/toca_monitor_dull/skin.jpg diff --git a/packages/textures/wotwot/skin/commrack_readme.txt b/packages/textures/wotwot/skin/commrack_readme.txt deleted file mode 100644 index 4aeabcd9..00000000 --- a/packages/textures/wotwot/skin/commrack_readme.txt +++ /dev/null @@ -1 +0,0 @@ -This is modification made by me (wotwot) for tocas commrack-mapmodel and is based on his original texture. \ No newline at end of file diff --git a/packages/textures/wotwot/skin/drainpipe_readme.txt b/packages/textures/wotwot/skin/drainpipe_readme.txt deleted file mode 100644 index 3d3c98a5..00000000 --- a/packages/textures/wotwot/skin/drainpipe_readme.txt +++ /dev/null @@ -1 +0,0 @@ -This is modification made by me (wotwot) for makkEs drainpipe-mapmodel and is based on his original texture. \ No newline at end of file diff --git a/packages/textures/wotwot/skin/milkcarton_readme.txt b/packages/textures/wotwot/skin/milkcarton_readme.txt deleted file mode 100644 index 2c22e346..00000000 --- a/packages/textures/wotwot/skin/milkcarton_readme.txt +++ /dev/null @@ -1 +0,0 @@ -This is modification made by me (wotwot) for tocas milkcarton-mapmodel and is based on his original texture. \ No newline at end of file diff --git a/packages/textures/wotwot/skin/monitor_readme.txt b/packages/textures/wotwot/skin/monitor_readme.txt deleted file mode 100644 index e6f322e7..00000000 --- a/packages/textures/wotwot/skin/monitor_readme.txt +++ /dev/null @@ -1 +0,0 @@ -This is modification made by me (wotwot) for tocas monitor-mapmodel and is based on his original texture. \ No newline at end of file