From f78afb375d01cc2e379655c528e89ba2da535378 Mon Sep 17 00:00:00 2001 From: RandumKiwi Date: Sat, 20 Aug 2011 20:55:14 +0000 Subject: [PATCH] updates git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6603 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- docs/package_copyrights.txt | 14 ----- packages/textures/skymaps/iceflow/license.txt | 47 +++++++++++++++++ packages/textures/skymaps/iceflow/readme.txt | 6 --- .../skymaps/ladynighthawk/license.txt | 48 ++++++++++------- packages/textures/skymaps/makke/license.txt | 2 + packages/textures/skymaps/socksky/license.txt | 51 ++++++++++++++++--- packages/textures/skymaps/steini/license.txt | 1 + 7 files changed, 122 insertions(+), 47 deletions(-) create mode 100644 packages/textures/skymaps/iceflow/license.txt delete mode 100644 packages/textures/skymaps/iceflow/readme.txt create mode 100644 packages/textures/skymaps/makke/license.txt create mode 100644 packages/textures/skymaps/steini/license.txt diff --git a/docs/package_copyrights.txt b/docs/package_copyrights.txt index d64dad38..ec572701 100644 --- a/docs/package_copyrights.txt +++ b/docs/package_copyrights.txt @@ -1,17 +1,3 @@ -------------SKYBOXES------------------ - -(../packages/textures/skymaps) - -Skyboxes (c) 2004 by steini, makkE. -(Feel free to use the sykboxes in "makke" for whatever you want, read PD). - - -SimonOC Nightball skymap \ -LadyNightHawk InhCanyons skymap |--> All under CC license. See the readme in their folders. -Sock Iceflow skymap / - - - ------------SOUNDS-------------------- Recorded by makkE and/or partially reprocessed from various royalty free or free to modify samples (thanks to diff --git a/packages/textures/skymaps/iceflow/license.txt b/packages/textures/skymaps/iceflow/license.txt new file mode 100644 index 00000000..dfd14175 --- /dev/null +++ b/packages/textures/skymaps/iceflow/license.txt @@ -0,0 +1,47 @@ +Skymaps within this folder were originally by: + Simon "sock" O'Callaghan (mememe@simonoc.com) + +The files were obtained from here: + http://www.simonoc.com/pages/materials.htm + +The website allowed usage under the following terms: + All use of my digital work is covered by this Creative Commons + Deed: http://creativecommons.org/licenses/by-nc-sa/3.0/ Please + do not use any of my work for commercial purposes, thank you. + +The following is a copy of the Creative Commons license link above: + +=========================================================================== +Attribution-NonCommercial-ShareAlike 3.0 Unported (CC BY-NC-SA 3.0) + +You are free: + * to Share — to copy, distribute and transmit the work + * to Remix — to 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. + +With the understanding that: + * Waiver — Any of the above conditions can be waived if you get + permission from the copyright holder. + * Public Domain — Where the work or any of its elements is in the + public domain under applicable law, that status is in no way affected + by the license. + * Other Rights — In no way are any of the following rights affected by + the license: + o Your fair dealing or fair use rights, or other applicable + copyright exceptions and limitations; + o The author's moral rights; + o Rights other persons may have either in the work itself or in + how the work is used, such as publicity or privacy rights. + * Notice — For any reuse or distribution, you must make clear to others + the license terms of this work. The best way to do this is with a + link to this web page. + diff --git a/packages/textures/skymaps/iceflow/readme.txt b/packages/textures/skymaps/iceflow/readme.txt deleted file mode 100644 index dfa93c46..00000000 --- a/packages/textures/skymaps/iceflow/readme.txt +++ /dev/null @@ -1,6 +0,0 @@ -======================================================= -Date: 8th of January 2001. -file: sb-iceflowjpg.zip -author: Sock -email address: sock@planetquake.com -URL: http://www.planetquake.com/simland diff --git a/packages/textures/skymaps/ladynighthawk/license.txt b/packages/textures/skymaps/ladynighthawk/license.txt index 990c2065..a290d07b 100644 --- a/packages/textures/skymaps/ladynighthawk/license.txt +++ b/packages/textures/skymaps/ladynighthawk/license.txt @@ -1,27 +1,37 @@ -Credit for this skymap (inhcanyons1) goes to Lady NightHawk of http://www.alusion-fr.com/an1ffa3.htm +This skymap is created by and copyright to: + Deb "Lady NightHawk" Murtagh (dmurtagh27@hotmail.com) + * http://www.alusion-fr.com/an1ffa3.htm -This skymap is distributed with the below CC license. - - - -You are free: +This skymap was made available under the following Creative Commons license: + Attribution-NonCommercial-ShareAlike 3.0 Unported (CC BY-NC-SA 3.0) +This means you are free: * to Share — to copy, distribute and transmit the work * to Remix — to 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. - 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). - - Attribute this work: - What does "Attribute this work" mean? - The page you came from contained embedded licensing metadata, including how the creator wishes to be attributed for re-use. You can use the HTML here to cite the work. Doing so will also include metadata on your page so that others can find the original work as well. - - 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. - - * For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link to this web page. - * Any of the above conditions can be waived if you get permission from the copyright holder. - * Nothing in this license impairs or restricts the author's moral rights. +With the understanding that: + * Waiver — Any of the above conditions can be waived if you get + permission from the copyright holder. + * Public Domain — Where the work or any of its elements is in the + public domain under applicable law, that status is in no way + affected by the license. + * Other Rights — In no way are any of the following rights affected + by the license: + o Your fair dealing or fair use rights, or other applicable + copyright exceptions and limitations; + o The author's moral rights; + o Rights other persons may have either in the work itself or + in how the work is used, such as publicity or privacy rights. + * Notice — For any reuse or distribution, you must make clear to + others the license terms of this work. The best way to do this is + with a link to this web page. diff --git a/packages/textures/skymaps/makke/license.txt b/packages/textures/skymaps/makke/license.txt new file mode 100644 index 00000000..3e9d6cd9 --- /dev/null +++ b/packages/textures/skymaps/makke/license.txt @@ -0,0 +1,2 @@ +Copyright (all rights reserved) by: + Markus "makkE" Bekel \ No newline at end of file diff --git a/packages/textures/skymaps/socksky/license.txt b/packages/textures/skymaps/socksky/license.txt index a5564c37..dfd14175 100644 --- a/packages/textures/skymaps/socksky/license.txt +++ b/packages/textures/skymaps/socksky/license.txt @@ -1,12 +1,47 @@ -These skymaps are by SimonOC, which can be found here: - - http://www.simonoc.com/pages/materials/skybox +Skymaps within this folder were originally by: + Simon "sock" O'Callaghan (mememe@simonoc.com) -From the site: -_____________ +The files were obtained from here: + http://www.simonoc.com/pages/materials.htm -All use of my digital work is covered by this Creative Commons Deed +The website allowed usage under the following terms: + All use of my digital work is covered by this Creative Commons + Deed: http://creativecommons.org/licenses/by-nc-sa/3.0/ Please + do not use any of my work for commercial purposes, thank you. -http://creativecommons.org/licenses/by-nc-sa/3.0/ +The following is a copy of the Creative Commons license link above: + +=========================================================================== +Attribution-NonCommercial-ShareAlike 3.0 Unported (CC BY-NC-SA 3.0) + +You are free: + * to Share — to copy, distribute and transmit the work + * to Remix — to 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. + +With the understanding that: + * Waiver — Any of the above conditions can be waived if you get + permission from the copyright holder. + * Public Domain — Where the work or any of its elements is in the + public domain under applicable law, that status is in no way affected + by the license. + * Other Rights — In no way are any of the following rights affected by + the license: + o Your fair dealing or fair use rights, or other applicable + copyright exceptions and limitations; + o The author's moral rights; + o Rights other persons may have either in the work itself or in + how the work is used, such as publicity or privacy rights. + * Notice — For any reuse or distribution, you must make clear to others + the license terms of this work. The best way to do this is with a + link to this web page. -Please do not use any of my work for commercial purposes, thank you. \ No newline at end of file diff --git a/packages/textures/skymaps/steini/license.txt b/packages/textures/skymaps/steini/license.txt new file mode 100644 index 00000000..586e064d --- /dev/null +++ b/packages/textures/skymaps/steini/license.txt @@ -0,0 +1 @@ +Copyright (all rights reserved) by: steini \ No newline at end of file