summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid McMackins II <contact@mcmackins.org>2017-08-04 06:43:18 -0500
committerDavid McMackins II <contact@mcmackins.org>2017-08-04 06:43:18 -0500
commit919ef470cca678f0adafed540b53ebb081b6b7a7 (patch)
tree0b2a9d78821af13bebc15f1bd6d4ea36149361e4
parent1636c5d781f8f0ab71ce593ec74d1bc2c4b91878 (diff)
Add COIL text file and change image license to CC-BY
-rw-r--r--COPYING30
-rw-r--r--COPYING.CC-BY (renamed from COPYING.CC-BY-SA)93
-rw-r--r--Makefile2
-rw-r--r--README5
4 files changed, 65 insertions, 65 deletions
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..dbe92cd
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,30 @@
+Redistributions, modified or unmodified, in whole or in part, must retain
+applicable copyright or other legal privilege notices, these conditions, and
+the following license terms and disclaimer. Subject to these conditions, the
+holder(s) of copyright or other legal privileges, author(s) or assembler(s),
+and contributors of this work hereby grant to any person who obtains a copy of
+this work in any form:
+
+1. Permission to reproduce, modify, distribute, publish, sell, sublicense, use,
+and/or otherwise deal in the licensed material without restriction.
+
+2. A perpetual, worldwide, non-exclusive, royalty-free, irrevocable patent
+license to reproduce, modify, distribute, publish, sell, use, and/or otherwise
+deal in the licensed material without restriction, for any and all patents:
+
+ a. Held by each such holder of copyright or other legal privilege, author
+ or assembler, or contributor, necessarily infringed by the contributions
+ alone or by combination with the work, of that privilege holder, author or
+ assembler, or contributor.
+
+ b. Necessarily infringed by the work at the time that holder of copyright
+ or other privilege, author or assembler, or contributor made any
+ contribution to the work.
+
+NO WARRANTY OF ANY KIND IS IMPLIED BY, OR SHOULD BE INFERRED FROM, THIS LICENSE
+OR THE ACT OF DISTRIBUTION UNDER THE TERMS OF THIS LICENSE, INCLUDING BUT NOT
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
+AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS, ASSEMBLERS, OR HOLDERS OF
+COPYRIGHT OR OTHER LEGAL PRIVILEGE BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER
+LIABILITY, WHETHER IN ACTION OF CONTRACT, TORT, OR OTHERWISE ARISING FROM, OUT
+OF, OR IN CONNECTION WITH THE WORK OR THE USE OF OR OTHER DEALINGS IN THE WORK. \ No newline at end of file
diff --git a/COPYING.CC-BY-SA b/COPYING.CC-BY
index 34ec65f..53883b1 100644
--- a/COPYING.CC-BY-SA
+++ b/COPYING.CC-BY
@@ -1,4 +1,4 @@
-Attribution-ShareAlike 4.0 International
+Attribution 4.0 International
=======================================================================
@@ -54,18 +54,16 @@ exhaustive, and do not form part of our licenses.
=======================================================================
-Creative Commons Attribution-ShareAlike 4.0 International Public
-License
+Creative Commons Attribution 4.0 International Public License
By exercising the Licensed Rights (defined below), You accept and agree
to be bound by the terms and conditions of this Creative Commons
-Attribution-ShareAlike 4.0 International Public License ("Public
-License"). To the extent this Public License may be interpreted as a
-contract, You are granted the Licensed Rights in consideration of Your
-acceptance of these terms and conditions, and the Licensor grants You
-such rights in consideration of benefits the Licensor receives from
-making the Licensed Material available under these terms and
-conditions.
+Attribution 4.0 International Public License ("Public License"). To the
+extent this Public License may be interpreted as a contract, You are
+granted the Licensed Rights in consideration of Your acceptance of
+these terms and conditions, and the Licensor grants You such rights in
+consideration of benefits the Licensor receives from making the
+Licensed Material available under these terms and conditions.
Section 1 -- Definitions.
@@ -84,11 +82,7 @@ Section 1 -- Definitions.
and Similar Rights in Your contributions to Adapted Material in
accordance with the terms and conditions of this Public License.
- c. BY-SA Compatible License means a license listed at
- creativecommons.org/compatiblelicenses, approved by Creative
- Commons as essentially the equivalent of this Public License.
-
- d. Copyright and Similar Rights means copyright and/or similar rights
+ c. Copyright and Similar Rights means copyright and/or similar rights
closely related to copyright including, without limitation,
performance, broadcast, sound recording, and Sui Generis Database
Rights, without regard to how the rights are labeled or
@@ -96,33 +90,29 @@ Section 1 -- Definitions.
specified in Section 2(b)(1)-(2) are not Copyright and Similar
Rights.
- e. Effective Technological Measures means those measures that, in the
+ d. Effective Technological Measures means those measures that, in the
absence of proper authority, may not be circumvented under laws
fulfilling obligations under Article 11 of the WIPO Copyright
Treaty adopted on December 20, 1996, and/or similar international
agreements.
- f. Exceptions and Limitations means fair use, fair dealing, and/or
+ e. Exceptions and Limitations means fair use, fair dealing, and/or
any other exception or limitation to Copyright and Similar Rights
that applies to Your use of the Licensed Material.
- g. License Elements means the license attributes listed in the name
- of a Creative Commons Public License. The License Elements of this
- Public License are Attribution and ShareAlike.
-
- h. Licensed Material means the artistic or literary work, database,
+ f. Licensed Material means the artistic or literary work, database,
or other material to which the Licensor applied this Public
License.
- i. Licensed Rights means the rights granted to You subject to the
+ g. Licensed Rights means the rights granted to You subject to the
terms and conditions of this Public License, which are limited to
all Copyright and Similar Rights that apply to Your use of the
Licensed Material and that the Licensor has authority to license.
- j. Licensor means the individual(s) or entity(ies) granting rights
+ h. Licensor means the individual(s) or entity(ies) granting rights
under this Public License.
- k. Share means to provide material to the public by any means or
+ i. Share means to provide material to the public by any means or
process that requires permission under the Licensed Rights, such
as reproduction, public display, public performance, distribution,
dissemination, communication, or importation, and to make material
@@ -130,13 +120,13 @@ Section 1 -- Definitions.
public may access the material from a place and at a time
individually chosen by them.
- l. Sui Generis Database Rights means rights other than copyright
+ j. Sui Generis Database Rights means rights other than copyright
resulting from Directive 96/9/EC of the European Parliament and of
the Council of 11 March 1996 on the legal protection of databases,
as amended and/or succeeded, as well as other essentially
equivalent rights anywhere in the world.
- m. You means the individual or entity exercising the Licensed Rights
+ k. You means the individual or entity exercising the Licensed Rights
under this Public License. Your has a corresponding meaning.
@@ -182,13 +172,7 @@ Section 2 -- Scope.
Licensed Rights under the terms and conditions of this
Public License.
- b. Additional offer from the Licensor -- Adapted Material.
- Every recipient of Adapted Material from You
- automatically receives an offer from the Licensor to
- exercise the Licensed Rights in the Adapted Material
- under the conditions of the Adapter's License You apply.
-
- c. No downstream restrictions. You may not offer or impose
+ b. No downstream restrictions. You may not offer or impose
any additional or different terms or conditions on, or
apply any Effective Technological Measures to, the
Licensed Material if doing so restricts exercise of the
@@ -270,24 +254,9 @@ following conditions.
information required by Section 3(a)(1)(A) to the extent
reasonably practicable.
- b. ShareAlike.
-
- In addition to the conditions in Section 3(a), if You Share
- Adapted Material You produce, the following conditions also apply.
-
- 1. The Adapter's License You apply must be a Creative Commons
- license with the same License Elements, this version or
- later, or a BY-SA Compatible License.
-
- 2. You must include the text of, or the URI or hyperlink to, the
- Adapter's License You apply. You may satisfy this condition
- in any reasonable manner based on the medium, means, and
- context in which You Share Adapted Material.
-
- 3. You may not offer or impose any additional or different terms
- or conditions on, or apply any Effective Technological
- Measures to, Adapted Material that restrict exercise of the
- rights granted under the Adapter's License You apply.
+ 4. If You Share Adapted Material You produce, the Adapter's
+ License You apply must not prevent recipients of the Adapted
+ Material from complying with this Public License.
Section 4 -- Sui Generis Database Rights.
@@ -302,9 +271,8 @@ apply to Your use of the Licensed Material:
b. if You include all or a substantial portion of the database
contents in a database in which You have Sui Generis Database
Rights, then the database in which You have Sui Generis Database
- Rights (but not its individual contents) is Adapted Material,
+ Rights (but not its individual contents) is Adapted Material; and
- including for purposes of Section 3(b); and
c. You must comply with the conditions in Section 3(a) if You Share
all or a substantial portion of the contents of the database.
@@ -407,11 +375,13 @@ Section 8 -- Interpretation.
=======================================================================
-Creative Commons is not a party to its public licenses.
-Notwithstanding, Creative Commons may elect to apply one of its public
-licenses to material it publishes and in those instances will be
-considered the "Licensor." Except for the limited purpose of indicating
-that material is shared under a Creative Commons public license or as
+Creative Commons is not a party to its public
+licenses. Notwithstanding, Creative Commons may elect to apply one of
+its public licenses to material it publishes and in those instances
+will be considered the “Licensor.” The text of the Creative Commons
+public licenses is dedicated to the public domain under the CC0 Public
+Domain Dedication. Except for the limited purpose of indicating that
+material is shared under a Creative Commons public license or as
otherwise permitted by the Creative Commons policies published at
creativecommons.org/policies, Creative Commons does not authorize the
use of the trademark "Creative Commons" or any other trademark or logo
@@ -419,7 +389,8 @@ of Creative Commons without its prior written consent including,
without limitation, in connection with any unauthorized modifications
to any of its public licenses or any other arrangements,
understandings, or agreements concerning use of licensed material. For
-the avoidance of doubt, this paragraph does not form part of the public
-licenses.
+the avoidance of doubt, this paragraph does not form part of the
+public licenses.
Creative Commons may be contacted at creativecommons.org.
+
diff --git a/Makefile b/Makefile
index 45cb2ce..b4cc867 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
OUT=agario-checkers.love
-DATA=COPYING COPYING.CC-BY-SA README res/ TRADEMARKS
+DATA=COPYING COPYING.CC-BY README res/ TRADEMARKS
all: zip
diff --git a/README b/README
index b47c812..5a705ed 100644
--- a/README
+++ b/README
@@ -91,9 +91,8 @@ See license headers in source files for details.
The images used in Agario Checkers (except the DELWINK trademark, see below for
details) are libre culture: you are free to use, copy, modify, and redistribute
-them under the terms of version 4.0 of the Creative Commons
-Attribution-ShareAlike International License. See
-[COPYING.CC-BY-SA](COPYING.CC-BY-SA) for details.
+them under the terms of version 4.0 of the Creative Commons Attribution
+International License. See [COPYING.CC-BY](COPYING.CC-BY) for details.
"DELWINK" is a trademark of Delwink, LLC, subject to the terms of its
[trademark agreement][2]. **If and ONLY if** that page is not available, a copy