diff --git a/docs/package_copyrights.txt b/docs/package_copyrights.txt index 475fda03..228eef8c 100644 --- a/docs/package_copyrights.txt +++ b/docs/package_copyrights.txt @@ -1,16 +1,3 @@ -This file holds the copyright information for all packages/artwork included in AssaultCube (UNLESS OTHERWISE -NOTED) OR it will tell you the place to find the licenses for works within AssaultCube. -Please respect the authors reserved rights and permissions. - - -PLEASE, check any folder containing media for a "license" or "readme" file and use that for -information about licensing, etc... - - -------------MAPS---------------------- -Check comments inside the *.cfg file included with the map for copyright information. -The included maps remain intellectual property of their respective creators. -Mapmessages upon load may provide further detail. ------------MODELS-------------------- @@ -39,101 +26,6 @@ File: source/vcpp/buildEnv/header.bmp - © makkE, all rights reserved -------------TEXTURES------------------ - -../packages/textures/arcitool - -Copyright by arcitool: http://www.arcitool.de/ - -German: -------- -WICHTIG: Die angebotenen Dateien und Bilder sind zum kostenlosen download vorgesehen. Die Dateien erhalten -keinen besonderen Schutz, um eine hohe Flexibilität für die Weiterbearbeitung zu gewährleisten. Die Dateien -dürfen beliebig verändert werden. Mailen Sie uns bitte Änderungsvorschläge, damit wir die Dateien ggf. auf -den neuesten Stand bringen können. - -Alle Dateien und Bilder dürfen uneingeschränkt in eigenen Projekten verwendet werden. Es ist nicht gestattet, -die Dateien und Bilder zu veröffentlichen, in andere Sammlungen einzubauen oder in irgend einer Form zu -veräußern. Hierzu bedarf es in jedem Fall der Erlaubnis von arcitool. - -English: --------- -Copyright by arcitool - -IMPORTANT: The offered files and images are meant to be freely downloadable. The files are not protected in -any way, to allow high flexibility of usage and reproccession. Files may be altered in any way. Please mail -us suggestions for changes, so we can assure future quality and replace files eventually. - -All files and images may be used without restrictions in your projects.It is prohibited to offer those files -as part of other texture packs or sell or distribute them in any other way without prior permission from -arcitool. -______________________________________________________________________________________________________________ - -../packages/textures/boeck - -Royalty Free textures assorted by Boeck, partially reprocessed by makkE to fit the engine. Thanks for the -excellent textures/resources !! - -http://www.boeckmania.de -______________________________________________________________________________________________________________ - -../packages/textures/craig_fortune - -These great textures were made by Craig Fortune. -http://www.garagegames.com/my/home/view.profile.php?qid=27414 -______________________________________________________________________________________________________________ - -../packages/textures/DigitalFlux - -These textures are copyright (c) Ted Southard http://www.digitalflux.com -They are free to use for non commercial use. Re-packaging and selling as part of a texture collection is -strictly prohibited. -______________________________________________________________________________________________________________ - -../packages/textures/jcdpc - -(c)Copyright by jcdpc -______________________________________________________________________________________________________________ - -../packages/textures/makke - -The following textures are (c) 2006-2008 by Markus "makkE" Bekel. All rights reserved. - -clayceiling.jpg -d_brick.jpg -platten.jpg -tiles.jpg - -Other textures here-in have been assembled/reprocessed/tiled/etc from various sources: - ---- -http://www.mayang.com/textures ---- -http://www.afflict.net/option_1/option_1.htm - -Can I use these textures for free? -You can use any texture for personal or school projects without my permission. However if you decide to -distribute your work I would appreciate credit where credit is due. - -Where can I not use these textures? -Any webpage, program, or texture cd that has them available without my permission is not permitted. You can -however use them in a design scheme for your site. - -what's with the update delays? -Since I'm a full time student and freelance web designer, it's a little hard for me to find time to get out -and take pictures (especially since i live in arizona and it's 500 degrees outside). Lately though I've been -trying a lot harder to put a lot more work into the sites content. ---- -Golgotha Texture Pack - -Textures by "Jonathon Clark and the Golgotha team - -Free textures from the abandoned "Golgotha" Video game. - -License Agreement ------------------ -Thanks to the Golgotha creators, these textures are free for use in any project whatsoever, and can be used -in commercial games or anything else unconditionally. ______________________________________________________________________________________________________________ ../packages/textures/noctua @@ -160,20 +52,6 @@ them without this "info.txt" file. Thanks if you link to my main page, but plea directly. Thanks, have fun! ;) _____________________________________________________________________________________________________________ -../packages/textures/mitaman - -Textures from various, approved "free to use for non commercial purpose" resources. -Textures here-in remain intellectual property of their respective authors. - -Check readme in these folders for information: - -..packages/textures/mitaman/golgotha/readme.txt -..packages/textures/mitaman/Grsites/readme.txt -..packages/textures/mitaman/Zastrow/readme.txt -..packages/textures/mitaman/various/readme.txt -..packages/textures/mitaman/3dcafe/readme.txt -_____________________________________________________________________________________________________________ - ../packages/textures/wotwot/urban Textures by wotwot. @@ -205,11 +83,6 @@ MitaMAN for gathering resources). Note: Shame on me I didn't keep track of my exact sources here. If you recognize any sound or components of a sound that has copyright issues, please contact me so I can solve it. Thanks, makkE. -_____________________________________________________________________________________________________________ - -..packages/audio/player/gib.ogg - Please read "gib.ogg_license.txt" for more information. - ____________________________________________________________________________________________________________ ..packages/audio/weapon/ric*.wav diff --git a/packages/maps/official/ac_mines.cfg b/packages/maps/official/ac_mines.cfg index d34935f8..c3f55152 100644 --- a/packages/maps/official/ac_mines.cfg +++ b/packages/maps/official/ac_mines.cfg @@ -258,7 +258,7 @@ texture 0 "./makke/11-Brick.jpg" texture 0 "./makke/bricky.jpg" texture 0 "./noctua/ground/ground02.jpg" texture 0 "./makke/rock.jpg" -texture 0 "./jcdpc/stone.jpg" +texture 0 "./makke/black.jpg" texture 0 "./makke/stuck1.jpg" texture 0 "./noctua/ground/ground06.jpg" texture 0 "./boeck/stone_014.jpg" diff --git a/packages/textures/DigitalFlux/license.txt b/packages/textures/DigitalFlux/license.txt new file mode 100755 index 00000000..3caaea69 --- /dev/null +++ b/packages/textures/DigitalFlux/license.txt @@ -0,0 +1,5 @@ +Files within this folder are copyright (all rights reserved) by: + Ted Southard (http://www.digitalflux.com) + +These files are free to use for non-commercial use. Re-packaging and +selling these files as part of a texture collection is strictly prohibited. diff --git a/packages/textures/DigitalFlux/readme.txt b/packages/textures/DigitalFlux/readme.txt deleted file mode 100755 index 29b486a9..00000000 --- a/packages/textures/DigitalFlux/readme.txt +++ /dev/null @@ -1,3 +0,0 @@ -These textures are copyright (c) Ted Southard http://www.digitalflux.com -They are free to use for non commercial use. Re-packaging and selling as part of a texture collection -is strictly prohibited. \ No newline at end of file diff --git a/packages/textures/boeck/license.txt b/packages/textures/boeck/license.txt new file mode 100755 index 00000000..c1dfa15f --- /dev/null +++ b/packages/textures/boeck/license.txt @@ -0,0 +1,5 @@ +These assorted royalty free textures are by: + Boeck (http://www.boeckmania.de) + +Note: These files have been partially reprocessed by + makkE to work with AssaultCube. diff --git a/packages/textures/boeck/readme.txt b/packages/textures/boeck/readme.txt deleted file mode 100755 index 482cedea..00000000 --- a/packages/textures/boeck/readme.txt +++ /dev/null @@ -1,4 +0,0 @@ -Royalty Free textures assorted by Boeck, partially reprocessed by makkE to fit the engine -Thanx for the exellent textures/resources !! - -http://www.boeckmania.de \ No newline at end of file diff --git a/packages/textures/craig_fortune/license.txt b/packages/textures/craig_fortune/license.txt new file mode 100755 index 00000000..09b07d98 --- /dev/null +++ b/packages/textures/craig_fortune/license.txt @@ -0,0 +1,14 @@ +Files within this folder AND all sub-folders are by: + Craig Fortune (http://www.garagegames.com/account/profile/27414) + +These files are no longer available from this website. When these +files were originally obtained, they allowed redistribution with +the following license: + + Totally free terrain textures. Free for both commercial use, + editing and otherwise. Free for commercial/non-commercial use + detailed crate textures. Just gimme a holler if you use them. + + + + diff --git a/packages/textures/craig_fortune/readme.txt b/packages/textures/craig_fortune/readme.txt deleted file mode 100755 index 1c950ff9..00000000 --- a/packages/textures/craig_fortune/readme.txt +++ /dev/null @@ -1,7 +0,0 @@ -These great textures were made by Craig Fortune. -http://www.garagegames.com/my/home/view.profile.php?qid=27414 - -Synopsis on garagegames.com: - -Totally free terrain textures. Free for both commercial use/editing and otherwise. -Free for commercial/non-commercial use detailed crate textures. 256x256 jpgs. Just gimme a holler if you use them. \ No newline at end of file diff --git a/packages/textures/makke/copyrights.txt b/packages/textures/makke/copyrights.txt deleted file mode 100644 index 75b34357..00000000 --- a/packages/textures/makke/copyrights.txt +++ /dev/null @@ -1,6 +0,0 @@ -The following textures are (c) 2006-2008 by Markus "makkE" Bekel. All rights reserved. - -clayceiling.jpg -d_brick.jpg -platten.jpg -tiles.jpg \ No newline at end of file diff --git a/packages/textures/makke/license.txt b/packages/textures/makke/license.txt new file mode 100644 index 00000000..4561ccce --- /dev/null +++ b/packages/textures/makke/license.txt @@ -0,0 +1,75 @@ +These five textures files: + + * clayceiling.jpg + * d_brick.jpg + * platten.jpg + * tiles.jpg + * black.jpg + +...are copyright (all rights reserved) by: + 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: +============================================== +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. + + 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) + +Originally available under the following license: + Can I use these textures for free? + You can use any texture for personal or school projects without my permission. + However if you decide to distribute your work I would appreciate credit where + credit is due. + + Where can I NOT use these textures? + Any webpage, program, or texture cd that has them available without my permission + is not permitted. You can however use them in a design scheme for your site. +============================================== +http://www.jonathanclark.com + Crack dot Com (The Golgotha Team) + +According to Golgotha's credits, these textures were most likely created by Kevin Tyler, +Stephen Wilson or Johnathan Clark: + http://web.archive.org/web/20041019082122/jonathanclark.com/golgotha/credits.html + +Read Wikipedia for more information about the fate of Golgotha: + http://en.wikipedia.org/wiki/Golgotha_%28computer_game%29 + +The last available archive of their website can be found here: + http://web.archive.org/web/20041015081823/jonathanclark.com/golgotha/ + + +These textures are free, released into the public domain by the since-abandoned "Golgotha" +computer game, which means they can be used for just about anything. +You can read more about it being free, to the public domain below. This excerpt was taken from: + http://web.archive.org/web/20031009012921/jonathanclark.com/golgotha/free.html + +Is everything free? +------------------- +YES! Free as in "free beer" and free as in "free speech." You can do anything you like with +the source, graphics, music, and level files, including: sell it, include parts or all of +it in your project, post it, copy it, and change it to your heart's content. The only +restrictions lay in the code which we did not write and therefore do not own (i.e. the MP3 +decoder code ). The author of MPG123 allows free use of that code for non profit use. + +This code and data is "public domain" not to be confused with code released under a license +such GPL. GPL sets limits on what you can do the code and conditions on it's use and we do not. + +The trademarks "Crack dot Com" and "Golgotha" remain the property of crack.com.