From 49e8ebcdc84a2239518f9e0fb77efb766d7c090b Mon Sep 17 00:00:00 2001 From: MrSimbax Date: Mon, 12 Nov 2018 00:15:27 +0100 Subject: [PATCH] Move repo to TerranovaTeam --- CHANGELOG.md | 9 +- LICENSE | 137 +++++++++++++++++++---- README.md | 28 ++--- levels/custom/alludo/level001/help.E.txt | 4 +- levels/custom/alludo/level001/help.P.txt | 4 +- levels/custom/alludo/level001/scene.txt | 4 +- 6 files changed, 143 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 224e396..f2c283e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,12 @@ # Alludo Changelog # -Colobot user level by Simbax -Made for level designers +Basic level for use as a template or testing playground. +Initially created by Mateusz Przybył, now maintained by TerranovaTeam. + +# Version 1.4.2 # +* Moved repository to `colobot` organization (https://github.com/colobot/alludo) +* Changed license from MIT to `CC0-1.0` +* Improved and unified descriptions # Version 1.4.1 # * Add ability to build Destroyer diff --git a/LICENSE b/LICENSE index 3a7852d..670154e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,116 @@ -The MIT License (MIT) - -Copyright (c) 2014 Mateusz Przybył - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file +CC0 1.0 Universal + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator and +subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for the +purpose of contributing to a commons of creative, cultural and scientific +works ("Commons") that the public can reliably and without fear of later +claims of infringement build upon, modify, incorporate in other works, reuse +and redistribute as freely as possible in any form whatsoever and for any +purposes, including without limitation commercial purposes. These owners may +contribute to the Commons to promote the ideal of a free culture and the +further production of creative, cultural and scientific works, or to gain +reputation or greater distribution for their Work in part through the use and +efforts of others. + +For these and/or other purposes and motivations, and without any expectation +of additional consideration or compensation, the person associating CC0 with a +Work (the "Affirmer"), to the extent that he or she is an owner of Copyright +and Related Rights in the Work, voluntarily elects to apply CC0 to the Work +and publicly distribute the Work under its terms, with knowledge of his or her +Copyright and Related Rights in the Work and the meaning and intended legal +effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not limited +to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, communicate, + and translate a Work; + + ii. moral rights retained by the original author(s) and/or performer(s); + + iii. publicity and privacy rights pertaining to a person's image or likeness + depicted in a Work; + + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + + v. rights protecting the extraction, dissemination, use and reuse of data in + a Work; + + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation thereof, + including any amended or successor version of such directive); and + + vii. other similar, equivalent or corresponding rights throughout the world + based on applicable law or treaty, and any national implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention of, +applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and +unconditionally waives, abandons, and surrenders all of Affirmer's Copyright +and Related Rights and associated claims and causes of action, whether now +known or unknown (including existing as well as future claims and causes of +action), in the Work (i) in all territories worldwide, (ii) for the maximum +duration provided by applicable law or treaty (including future time +extensions), (iii) in any current or future medium and for any number of +copies, and (iv) for any purpose whatsoever, including without limitation +commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes +the Waiver for the benefit of each member of the public at large and to the +detriment of Affirmer's heirs and successors, fully intending that such Waiver +shall not be subject to revocation, rescission, cancellation, termination, or +any other legal or equitable action to disrupt the quiet enjoyment of the Work +by the public as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason be +judged legally invalid or ineffective under applicable law, then the Waiver +shall be preserved to the maximum extent permitted taking into account +Affirmer's express Statement of Purpose. In addition, to the extent the Waiver +is so judged Affirmer hereby grants to each affected person a royalty-free, +non transferable, non sublicensable, non exclusive, irrevocable and +unconditional license to exercise Affirmer's Copyright and Related Rights in +the Work (i) in all territories worldwide, (ii) for the maximum duration +provided by applicable law or treaty (including future time extensions), (iii) +in any current or future medium and for any number of copies, and (iv) for any +purpose whatsoever, including without limitation commercial, advertising or +promotional purposes (the "License"). The License shall be deemed effective as +of the date CC0 was applied by Affirmer to the Work. Should any part of the +License for any reason be judged legally invalid or ineffective under +applicable law, such partial invalidity or ineffectiveness shall not +invalidate the remainder of the License, and in such case Affirmer hereby +affirms that he or she will not (i) exercise any of his or her remaining +Copyright and Related Rights in the Work or (ii) assert any associated claims +and causes of action with respect to the Work, in either case contrary to +Affirmer's express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + + b. Affirmer offers the Work as-is and makes no representations or warranties + of any kind concerning the Work, express, implied, statutory or otherwise, + including without limitation warranties of title, merchantability, fitness + for a particular purpose, non infringement, or the absence of latent or + other defects, accuracy, or the present or absence of errors, whether or not + discoverable, all to the greatest extent permissible under applicable law. + + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without limitation + any person's Copyright and Related Rights in the Work. Further, Affirmer + disclaims responsibility for obtaining any necessary consents, permissions + or other rights required for any use of the Work. + + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to this + CC0 or use of the Work. + +For more information, please see + diff --git a/README.md b/README.md index 1d07f4f..57ad762 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Alludo # -Basic Colobot (https://github.com/colobot/colobot) user level made for level designers, developers and testers. +Basic [Colobot](https://colobot.info/) level for use as a template or testing playground. # Screenshots # @@ -24,27 +24,27 @@ The map is perfect for testing purposes as it is relatively simple and provides # Features # -* The map is almost completely flat and there is no water. -* Underground resources location is indicated by ground spots in the three corners of the map. -* 1 grid == 1 square "colometer" -* `Me` and first bots are immortal. -* All buildings and bots are available. -* There is no living alien to disturb you. -* All objects available in the game are situated in the south-east corner of the map. -* Mission never ends. -* A ramp showing every possible height of the ground. +- The map is almost completely flat and there is no water. +- Underground resources location is indicated by ground spots in the three corners of the map. +- 1 grid == 1 square "colometer" +- `Me` and first bots are immortal. +- All buildings and bots are available. +- There is no living alien to disturb you. +- All objects available in the game are situated in the south-east corner of the map. +- Mission never ends. +- A ramp showing every possible height of the ground. # Installation # -Download the latest release from [here](https://github.com/MrSimbax/colobot-alludo/releases) and put it in `/mods` folder (unpacking is not necessary). +Download the latest release from [here](https://github.com/colobot/alludo/releases) and put it in `/mods` folder (unpacking is not necessary). If you are familiar with `git`, it is recommended to `git clone` the repository instead of using the above method. Updating the map will be as easy as typing `git pull` (assuming there are no modifications). You can clone the repository to Colobot `data/mods` directory by entering the following command in your terminal: - git clone https://github.com:MrSimbax/colobot-alludo.git /mods/alludo + git clone https://github.com/colobot/alludo.git /mods/alludo SSH-authentication version of the above command: - git clone git@github.com:MrSimbax/colobot-alludo.git /mods/alludo + git clone git@github.com:colobot/alludo.git /mods/alludo You can also clone the repository to _any_ directory and then start Colobot with: @@ -56,4 +56,4 @@ See the `CHANGELOG.md` file. # License # -See the `LICENSE` file. +`CC0-1.0`, see the `LICENSE` file for details. diff --git a/levels/custom/alludo/level001/help.E.txt b/levels/custom/alludo/level001/help.E.txt index 7e0ebdb..e229548 100644 --- a/levels/custom/alludo/level001/help.E.txt +++ b/levels/custom/alludo/level001/help.E.txt @@ -1,6 +1,6 @@ \b;Alludo -Basic user level made for level designers, developers and testers. +Basic level for use as a template or testing playground. \t;Features @@ -26,4 +26,4 @@ The ramp is in a relief file. Each pixel represents one height. The ramp is 3 pi \t;About -The level was created by Simbax (Mateusz Przybył). License, list of changes and new releases can be found here: \c;https://github.com/MrSimbax/colobot-alludo\n;. +Initially created by Mateusz Przybył, now maintained by TerranovaTeam. License (CC0-1.0), list of changes and new releases can be found here: \c;https://github.com/colobot/alludo\n;. diff --git a/levels/custom/alludo/level001/help.P.txt b/levels/custom/alludo/level001/help.P.txt index 99d9300..fb4ab5a 100644 --- a/levels/custom/alludo/level001/help.P.txt +++ b/levels/custom/alludo/level001/help.P.txt @@ -1,6 +1,6 @@ \b;Alludo -Prosta mapa dla level designerów, developerów i testerów. +Prosty poziom służący jako szablon albo miejsce do testowania. \t;Opis @@ -26,4 +26,4 @@ Rampa znajduje się w pliku relief. Jeden piksel to jedna wysokość. Rampa ma 3 \t;Informacje -Poziom stworzony przez użytkownika Simbax (Mateusz Przybył). Szczegółową licencję, listę zmian i nowe wydania znajdziesz tutaj: \c;https://github.com/MrSimbax/colobot-alludo\n;. +Pierwotnie stworzony przez Mateusza Przybył, teraz utrzymywany przez TerranovaTeam. Licencję (CC0-1.0), listę zmian i nowe wydania znajdziesz tutaj: \c;https://github.com/colobot/alludo\n;. diff --git a/levels/custom/alludo/level001/scene.txt b/levels/custom/alludo/level001/scene.txt index 5790f56..488d2aa 100644 --- a/levels/custom/alludo/level001/scene.txt +++ b/levels/custom/alludo/level001/scene.txt @@ -1,11 +1,11 @@ // Titles EN Title.E text="Alludo" -Resume.E text="Basic map for level designers. Perfect for testing." +Resume.E text="Basic level for use as a template or testing playground." ScriptName.E text="Program" // Titles PL Title.P text="Alludo" -Resume.P text="Prosta mapa dla level designerów. Idealna do testowania." +Resume.P text="Prosty poziom służący jako szablon albo miejsce do testowania." ScriptName.P text="Program" // SatCom in all languages