Swapped makkE's fences with Boeufmironton's new ones, added 4 extra models to fencing set, added alternative fences skins in 'Textures', fixed default_map_settings.cfg accordingly.

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7550 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2013-09-24 04:43:01 +00:00
parent c7c6c26e1e
commit 7d904bdc31
13 changed files with 113 additions and 3 deletions
@@ -215,14 +215,17 @@ mapmodel 0 0 0 0 "cleaner/alarm_bell"		// 184
 mapmodel 0 0 0 0 "cleaner/worldmap"		// 185
 mapmodel 1 5 0 0 "cleaner/elecbox/elecbox1"	// 186
 mapmodel 1 5 0 0 "cleaner/elecbox/elecbox2"	// 187
-mapmodel 0 0 0 0 "cleaner/shovels/shovel1"	// 188
+mapmodel 1 3 0 0 "cleaner/shovels/shovel1"	// 188
 mapmodel 0 0 0 0 "cleaner/shovels/shovel2"	// 189
 mapmodel 0 0 0 0 "cleaner/shovels/shovel3"	// 190
 mapmodel 0 0 0 0 "cleaner/arab_lamps/arab_lamp_1" //191
 mapmodel 0 0 0 0 "cleaner/arab_lamps/arab_lamp_2" //192
 mapmodel 0 0 0 0 "cleaner/arab_lamps/arab_lamp_3" //193
 mapmodel 0 0 0 0 "cleaner/gunshop"  //194
-
+mapmodel 0 0 0 0 "cleaner/fence_chainlink_gate_down"  //195
+mapmodel 1 1 0 0 "boeufmironton/fence_chainlink_hor_post"  //196
+mapmodel 0 0 0 0 "boeufmironton/fence_chainlink_open_gate"  //197
+mapmodel 4 1 0 0 "cleaner/fence_chainlink_down"  //198

 // NOTE: There is a hard-limit maximum of 256 "mapmodel" commands.

@@ -745,7 +748,7 @@ texture 0 "makke/rb_window.jpg"
 // texture 0 "toca/droppedceiling.jpg"
 // texture 0 "jamz/new_bricks_3.jpg"
 // texture 0 "makke/box_2_1.jpg"
-
+// texture 0 "boeufmironton/fence_rusty.jpg"	// alternative texture for "fence_chainlink" mapmodels set

 mapsoundreset	// Ambient sounds. Leave this command here, or else your sounds will mess up!

@@ -0,0 +1,2 @@
+md3load tris.md3
+md3skin uppercylinder ../../makke/fence_chainlink/skin.jpg
@@ -0,0 +1,2 @@
+md3load tris.md3
+md3skin opendoor ../../makke/fence_chainlink/skin.jpg
@@ -0,0 +1,41 @@
+LICENSE
+=====================================================================
+All files in this folder and their subfolders are by Boeufmironton
+[email protected]
+
+Originally created for the game AssaultCube:
+	http://assault.cubers.net/
+
+* These 2 models have been made using makkE's "fence_chainlink_closed_gate" as template:
+- "fence_chainlink_open_gate"
+- "fence_chainlink_hor_post"
+
+* Models "fence_chainlink" "fence_chainlink_closed_gate" "fence_chainlink_no_gate" and "fence_chainlink_post" in makkE's folder have been reworked by Boeufmironton to get rid of z-figthing and fix axis.
+Texture was also modified to fit these changes.
+The full set of models share the same license.
+
+
+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
@@ -0,0 +1,2 @@
+md3load tris.md3
+md3skin fence_down ../../makke/fence_chainlink/skin.jpg
@@ -0,0 +1,2 @@
+md3load tris.md3
+md3skin gate_down ../../makke/fence_chainlink/skin.jpg
@@ -8,6 +8,14 @@ Originally created for the game AssaultCube:

 * Model "street_light_broken" is a modified version of "street_light" made by Cleaner to replace a redundant line in default_map_settings.cfg

+* Models "fence_chainlink" "fence_chainlink_closed_gate" "fence_chainlink_no_gate" and "fence_chainlink_post" have been reworked by Boeufmironton to get rid of z-figthing and fix axis.
+Texture was also modified to fit changes.
+Note that 4 other models have been made using "fence_chainlink_closed_gate" as template to complete this nice set of fencing and can be found in their respective folders.
+By Boeufmironton: "fence_chainlink_open_gate" and 
+"fence_chainlink_hor_post"
+By Cleaner: "fence_chainlink_down" and "fence_chainlink_gate_down"
+The full set of models share the same license.
+
 Shane Nieb ([email protected]) modelled (but did not skin) the following:
 ================================================================================
 office_chair (Nieb did skin this one)
@@ -0,0 +1,50 @@
+LICENSE
+=====================================================================
+All files in this folder and their subfolders are by Boeufmironton
+[email protected]
+
+Originally created for the game AssaultCube:
+	http://assault.cubers.net/
+
+- "fence_rusty" alternative texture for the following "fence_chainlink" mapmodels set:
+
+In makke folder:
+* "fence_chainlink"
+* "fence_chainlink_closed_gate"
+* "fence_chainlink_no_gate"
+* "fence_chainlink_post"
+In boeufmironton folder:
+* "fence_chainlink_hor_post"
+* "fence_chainlink_open_gate"
+In cleaner folder:
+* "fence_chainlink_down"
+* "fence_chainlink_gate_down"
+
+
+
+
+
+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