diff --git a/config/default_map_settings.cfg b/config/default_map_settings.cfg index 5235937a..a026b464 100644 --- a/config/default_map_settings.cfg +++ b/config/default_map_settings.cfg @@ -212,6 +212,7 @@ mapmodel 0 0 0 0 "toca/droppedceiling/tiles" //181 mapmodel 0 0 0 0 "toca/droppedceiling/single" //182 mapmodel 0 0 0 0 "toca/droppedceiling/light1" //183 mapmodel 0 0 0 0 "toca/droppedceiling/light2" //184 +mapmodel 0 0 0 0 "cleaner/extinguisher_box" //185 // NOTE: There is a hard-limit maximum of 256 "mapmodel" commands. diff --git a/packages/maps/new.cfg b/packages/maps/new.cfg index 1e82a15b..7f47bac7 100644 --- a/packages/maps/new.cfg +++ b/packages/maps/new.cfg @@ -50,6 +50,7 @@ mapmodel 0 0 0 0 "toca/droppedceiling/single" //44 mapmodel 0 0 0 0 "toca/droppedceiling/light1" //45 mapmodel 0 0 0 0 "toca/droppedceiling/light2" //46 mapmodel 0 2 0 0 "toca/cardboardbox" //47 +mapmodel 0 0 0 0 "cleaner/extinguisher_box" //48 diff --git a/packages/maps/new.cgz b/packages/maps/new.cgz index 2598ff48..0a348960 100644 Binary files a/packages/maps/new.cgz and b/packages/maps/new.cgz differ diff --git a/packages/models/mapmodels/cleaner/extinguisher/license.txt b/packages/models/mapmodels/cleaner/extinguisher/license.txt index b2445487..bf359a00 100644 --- a/packages/models/mapmodels/cleaner/extinguisher/license.txt +++ b/packages/models/mapmodels/cleaner/extinguisher/license.txt @@ -1,5 +1,5 @@ For all materials in these subfolders, if they're used outside of AssaultCube, -please e-mail DES|Cleaner with some screenshots. +please e-mail DES|Cleaner with some screenshots. He'd "pretty much appreciate it". ================================================================================ DES|Cleaner contact details: * http://akimbo.in/forum/ @@ -7,7 +7,7 @@ DES|Cleaner contact details: * http://forums.des-clan.net/ * totally_shameless@hotmail.fr ================================================================================ -All mapmodels in sub-folders: +All files in folder: * "extinguisher.md3" * "skin.jpg" @@ -28,3 +28,23 @@ the work, under the following conditions: To view a copy of the full licenses legal code, visit: http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode +================================================================================ +All mapmodels in sub-folders: + * "minecart" + * "rails" + +Are originally by Sitters (and have been modified for AssaultCube by DES|Cleaner): + - http://www.md2.sitters-electronics.nl/index.htm + +They are licensed, as from http://www.md2.sitters-electronics.nl: +----------------------------------------------------------------- +You may use all these objects for free. The 3D models have a licence under GNU +and CC_attribution /by. Please contact me (info@sitters-electronics.nl) if there +is anything wrong with the models, links or maps. + +Creative-Commons (CC-BY) Attribution 3.0 Unported: + http://creativecommons.org/licenses/by/3.0/ + +GNU GPL: + http://www.gnu.org/licenses/gpl.html +================================================================================ diff --git a/packages/models/mapmodels/cleaner/extinguisher_box/box.png b/packages/models/mapmodels/cleaner/extinguisher_box/box.png new file mode 100644 index 00000000..33d2e90f Binary files /dev/null and b/packages/models/mapmodels/cleaner/extinguisher_box/box.png differ diff --git a/packages/models/mapmodels/cleaner/extinguisher_box/extinguisher_box.md3 b/packages/models/mapmodels/cleaner/extinguisher_box/extinguisher_box.md3 new file mode 100644 index 00000000..1951b865 Binary files /dev/null and b/packages/models/mapmodels/cleaner/extinguisher_box/extinguisher_box.md3 differ diff --git a/packages/models/mapmodels/cleaner/extinguisher_box/license.txt b/packages/models/mapmodels/cleaner/extinguisher_box/license.txt new file mode 100644 index 00000000..974a0b9f --- /dev/null +++ b/packages/models/mapmodels/cleaner/extinguisher_box/license.txt @@ -0,0 +1,50 @@ +For all materials in these subfolders, if they're used outside of AssaultCube, +please e-mail DES|Cleaner with some screenshots. He'd "pretty much appreciate it". +================================================================================ +DES|Cleaner contact details: + * http://akimbo.in/forum/ + * http://assault.cubers.net/forum/user-420.html + * http://forums.des-clan.net/ + * totally_shameless@hotmail.fr +================================================================================ +All files in folder: + * "extinguisher_box.md3" + * "box.png" + +Are originally by "DES|Cleaner" for AssaultCube using MilkShape 3D and PaintShop Pro XII. +They are licensed under the Creative Commons "Attribution-NonCommercial-ShareAlike 3.0 +Unported" (AT-NC-SA) license. + http://creativecommons.org/licenses/by-nc-sa/3.0/ + +This means you are free to share, copy, distribute, transmit & to remix/adapt +the work, under the following conditions: + * Attribution: You must attribute the work in the manner specified by + the author or licensor (but not in any way that suggests that they endorse + you or your use of the work). + * Noncommercial: 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 the same or similar license to + this one. + +To view a copy of the full licenses legal code, visit: + http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode +================================================================================ +All mapmodels in sub-folders: + * "minecart" + * "rails" + +Are originally by Sitters (and have been modified for AssaultCube by DES|Cleaner): + - http://www.md2.sitters-electronics.nl/index.htm + +They are licensed, as from http://www.md2.sitters-electronics.nl: +----------------------------------------------------------------- +You may use all these objects for free. The 3D models have a licence under GNU +and CC_attribution /by. Please contact me (info@sitters-electronics.nl) if there +is anything wrong with the models, links or maps. + +Creative-Commons (CC-BY) Attribution 3.0 Unported: + http://creativecommons.org/licenses/by/3.0/ + +GNU GPL: + http://www.gnu.org/licenses/gpl.html +================================================================================ diff --git a/packages/models/mapmodels/cleaner/extinguisher_box/md3.cfg b/packages/models/mapmodels/cleaner/extinguisher_box/md3.cfg new file mode 100644 index 00000000..bfc4a864 --- /dev/null +++ b/packages/models/mapmodels/cleaner/extinguisher_box/md3.cfg @@ -0,0 +1,5 @@ +md3load extinguisher_box.md3 +md3skin extinguisher ../extinguisher/skin.jpg +md3skin box box.png +mdlscale 250 +mdlcullface 0