packaging updates

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7074 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2013-01-12 14:27:21 +00:00
parent dbe45dfb0c
commit 8440902ed7
13 changed files with 77 additions and 101 deletions
@@ -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."
@@ -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: [email protected]
-
-by "Nieb"
-Shane Nieb
-[email protected]
-
-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. 
-
-=====================================================================================================
@@ -0,0 +1,57 @@
+LICENSE
+================================================================================
+All files in this folder and their subfolders are by Markus "makkE" Bekel
+	[email protected]
+
+Originally created for the game AssaultCube:
+	http://assault.cubers.net/
+
+Shane Nieb ([email protected]) 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
+
@@ -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
+================================================================================
@@ -1 +0,0 @@
-This is modification made by me (wotwot) for tocas commrack-mapmodel and is based on his original texture.
@@ -1 +0,0 @@
-This is modification made by me (wotwot) for makkEs drainpipe-mapmodel and is based on his original texture.
@@ -1 +0,0 @@
-This is modification made by me (wotwot) for tocas milkcarton-mapmodel and is based on his original texture.
@@ -1 +0,0 @@
-This is modification made by me (wotwot) for tocas monitor-mapmodel and is based on his original texture.
				`@@ -1 +0,0 @@`
				`This is modification made by me (wotwot) for tocas commrack-mapmodel and is based on his original texture.`