diff --git a/packages/models/mapmodels/makke/pallet_vert/md3.cfg b/packages/models/mapmodels/makke/pallet_vert/md3.cfg new file mode 100644 index 00000000..2388d72a --- /dev/null +++ b/packages/models/mapmodels/makke/pallet_vert/md3.cfg @@ -0,0 +1,3 @@ +md3load tris.md3 +md3skin pallet2 ../pallet/skin.jpg +mdlshadowdist 8 diff --git a/packages/models/mapmodels/makke/pallet_vert/tris.md3 b/packages/models/mapmodels/makke/pallet_vert/tris.md3 new file mode 100644 index 00000000..08e2b028 Binary files /dev/null and b/packages/models/mapmodels/makke/pallet_vert/tris.md3 differ diff --git a/packages/textures/drunkenM/license.txt b/packages/textures/drunkenM/license.txt index 56a3e267..ac6f2fa2 100644 --- a/packages/textures/drunkenM/license.txt +++ b/packages/textures/drunkenM/license.txt @@ -1,3 +1,5 @@ -This texture was lifted from flickr by drunkenM and then modified. It had the below license assigned to it: +This texture was lifted from flickr by drunkenM and then modified. +It had the below license assigned to it: -You are free to use this texture in your own works, as a texture for 3D artwork, for derivative works, for all purposes including commercial. \ No newline at end of file +You are free to use this texture in your own works, as a texture for 3D artwork, +for derivative works, for all purposes including commercial. diff --git a/packages/textures/makke/license.txt b/packages/textures/makke/license.txt index 4561ccce..0389f908 100644 --- a/packages/textures/makke/license.txt +++ b/packages/textures/makke/license.txt @@ -10,24 +10,39 @@ These five textures files: Markus "makkE" Bekel All other textures within this folder have been re-assembled, re-processed, -tiled, etc. by makkE from other various sources. Unfortunately, a list of -which images are from which source is unavailable, however, some of the -sources include: -============================================== +tiled, etc. by makkE from other various sources. Unfortunately, a list of +which images are from which source is unavailable. + +As the original licenses to these other files are unknown, unless you're able to +find the original source and adhere to their license, you MUST assume that the +data is COPYRIGHT and you are NOT allowed to redistribute that data outside +of an UNMODIFIED AssaultCube package(s). + +Some of the sources would have included: +================================================================================ http://www.mayang.com/textures William Smith & Mayang Murni Adnin (will@willsmith.org) -Originally available under the following license: - What can I use the textures for? - You can use the textures in your school projects, to make CD sleeves, - posters, in movies, in videogames etc - anything where you have added - your own artistic effort. +Available under the following license: +These textures are Copyright © Mayang Murni Adnin, 2001-2012. They have all been +taken by our own cameras or created by ourselves. + +Use: +They are free to use for all uses, whether commercial or non-commercial (you may +incorporate them into your derived work with no requirement to pay us any +licensing fee etc). Your derived work must involve significant modification to the +textures. It would be nice if you could credit us. + +Sell: +You may not sell any of these textures in an unmodified form, or any derived works +where the product you are selling is still a texture and is likely to compete with +this website. + +Redistribute: +You may redistribute (give/send to somebody else/display on a web site) up to 30 of +these textures together, but no more. You must credit this website as the original +source (tell them about us). - You cannot use the textures for anything that directly competes with us. - This includes, putting the textures on your own website, selling them, - or giving them away. This restriction includes the textures themselves, - as well as any minor modifications, for example, you may not make our - texture seamless or tileable and then sell them. ============================================== http://www.afflict.net/ Dylan Debusk (dylandebusk@hotmail.com) diff --git a/packages/textures/wotwot/urban/airvent1.jpg b/packages/textures/mayang/airvent1.jpg similarity index 100% rename from packages/textures/wotwot/urban/airvent1.jpg rename to packages/textures/mayang/airvent1.jpg diff --git a/packages/textures/makke/bricks_2.jpg b/packages/textures/mayang/bricks_2.jpg similarity index 100% rename from packages/textures/makke/bricks_2.jpg rename to packages/textures/mayang/bricks_2.jpg diff --git a/packages/textures/wotwot/urban/door3.jpg b/packages/textures/mayang/door3.jpg similarity index 100% rename from packages/textures/wotwot/urban/door3.jpg rename to packages/textures/mayang/door3.jpg diff --git a/packages/textures/wotwot/urban/grill2_s.jpg b/packages/textures/mayang/grill2_s.jpg similarity index 100% rename from packages/textures/wotwot/urban/grill2_s.jpg rename to packages/textures/mayang/grill2_s.jpg diff --git a/packages/textures/wotwot/urban/hatch1.jpg b/packages/textures/mayang/hatch1.jpg similarity index 100% rename from packages/textures/wotwot/urban/hatch1.jpg rename to packages/textures/mayang/hatch1.jpg diff --git a/packages/textures/mayang/license.txt b/packages/textures/mayang/license.txt new file mode 100644 index 00000000..78f7de3f --- /dev/null +++ b/packages/textures/mayang/license.txt @@ -0,0 +1,28 @@ +All files in this folder are from http://www.mayang.com/textures + By: William Smith & Mayang Murni Adnin (will@willsmith.org) + +Available under the following license: +These textures are Copyright © Mayang Murni Adnin, 2001-2012. They have all been +taken by our own cameras or created by ourselves. + +Use: +They are free to use for all uses, whether commercial or non-commercial (you may +incorporate them into your derived work with no requirement to pay us any +licensing fee etc). Your derived work must involve significant modification to the +textures. It would be nice if you could credit us. + +Sell: +You may not sell any of these textures in an unmodified form, or any derived works +where the product you are selling is still a texture and is likely to compete with +this website. + +Redistribute: +You may redistribute (give/send to somebody else/display on a web site) up to 30 of +these textures together, but no more. You must credit this website as the original +source (tell them about us). + + +These files would have been re-processed either by: + Markus "makkE" Bekel + or: + wotwot diff --git a/packages/textures/wotwot/urban/manhole1.jpg b/packages/textures/mayang/manhole1.jpg similarity index 100% rename from packages/textures/wotwot/urban/manhole1.jpg rename to packages/textures/mayang/manhole1.jpg diff --git a/packages/textures/mitaman/various/license.txt b/packages/textures/mitaman/various/license.txt index e1233f32..e81ce92f 100644 --- a/packages/textures/mitaman/various/license.txt +++ b/packages/textures/mitaman/various/license.txt @@ -1,7 +1,7 @@ Files in this folder are from various sources. The following 4 files in this folder are from unknown sources (however, -it may have come from a source listed in this readme). Even though the +it may have come from a source already used in AC). Even though the license of these files is unknown, they were free to use in AssaultCube. * metal_trim_4_v.jpg diff --git a/packages/textures/wotwot/urban/license.txt b/packages/textures/wotwot/urban/license.txt new file mode 100644 index 00000000..d7201fa6 --- /dev/null +++ b/packages/textures/wotwot/urban/license.txt @@ -0,0 +1,8 @@ +All files in this folder by 'wotwot'. + +Unless you can contact him as to otherwise, you MUST assume that the +data is COPYRIGHT and you are NOT allowed to redistribute that data outside +of an UNMODIFIED AssaultCube package(s). + +If wotwot used any sources for these, they would have been free-to-use in AC. +