From 4e904141085f51f56f74ecefaaa683e1ad6e41e2 Mon Sep 17 00:00:00 2001 From: RandumKiwi Date: Thu, 17 Jan 2013 19:12:02 +0000 Subject: [PATCH] ch-ch-changes... git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7107 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- .../mapmodels/makke/pallet_vert/md3.cfg | 3 ++ .../mapmodels/makke/pallet_vert/tris.md3 | Bin 0 -> 10228 bytes packages/textures/drunkenM/license.txt | 6 ++- packages/textures/makke/license.txt | 43 ++++++++++++------ .../{wotwot/urban => mayang}/airvent1.jpg | Bin .../textures/{makke => mayang}/bricks_2.jpg | Bin .../{wotwot/urban => mayang}/door3.jpg | Bin .../{wotwot/urban => mayang}/grill2_s.jpg | Bin .../{wotwot/urban => mayang}/hatch1.jpg | Bin packages/textures/mayang/license.txt | 28 ++++++++++++ .../{wotwot/urban => mayang}/manhole1.jpg | Bin packages/textures/mitaman/various/license.txt | 2 +- packages/textures/wotwot/urban/license.txt | 8 ++++ 13 files changed, 73 insertions(+), 17 deletions(-) create mode 100644 packages/models/mapmodels/makke/pallet_vert/md3.cfg create mode 100644 packages/models/mapmodels/makke/pallet_vert/tris.md3 rename packages/textures/{wotwot/urban => mayang}/airvent1.jpg (100%) rename packages/textures/{makke => mayang}/bricks_2.jpg (100%) rename packages/textures/{wotwot/urban => mayang}/door3.jpg (100%) rename packages/textures/{wotwot/urban => mayang}/grill2_s.jpg (100%) rename packages/textures/{wotwot/urban => mayang}/hatch1.jpg (100%) create mode 100644 packages/textures/mayang/license.txt rename packages/textures/{wotwot/urban => mayang}/manhole1.jpg (100%) create mode 100644 packages/textures/wotwot/urban/license.txt 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 0000000000000000000000000000000000000000..08e2b028e7e08b3f8904802b30bf18b7c54d8ff7 GIT binary patch literal 10228 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 literal 0 HcmV?d00001 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. +