From 23519fed5f7b5ab5b243819f861a79a26ac7b9e2 Mon Sep 17 00:00:00 2001 From: Erlend Sogge Heggen Date: Thu, 4 Jan 2024 01:16:02 +0100 Subject: [PATCH 1/3] Create CONTRIBUTING.md --- CONTRIBUTING.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..ba76364 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,5 @@ +## Contributor License Compromise + +Independent contributions (i.e. individual pull requests) from anyone other than 'Isaac Turci @Zac8668' are dual-licensed as [Polyform NonCommercial](https://polyformproject.org/licenses/noncommercial/1.0.0/) (granted to Spicy Lobster & Isaac Turci as the _licensor_) and [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0), meaning all independent contributors retain ownership of their own contributions, albeit non-exclusively. + +In other words, your contributions belong equally to the Astratomic project as they do to you. From 49fa697a7e28265cae4189cf521d1c9374ce696f Mon Sep 17 00:00:00 2001 From: Erlend Sogge Heggen Date: Thu, 4 Jan 2024 01:17:14 +0100 Subject: [PATCH 2/3] Update and rename LICENSE to LICENSE.md --- LICENSE => LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename LICENSE => LICENSE.md (76%) diff --git a/LICENSE b/LICENSE.md similarity index 76% rename from LICENSE rename to LICENSE.md index b85aaa2..256484e 100644 --- a/LICENSE +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Astratomic source code is Copyright (c) 2023 The Spicy Lobster team & Isaac Turci \ +Astratomic source code is Copyright (c) 2024 The Spicy Lobster team & Isaac Turci \ and licensed as [PolyForm NonCommercial v1.0](https://polyformproject.org/licenses/noncommercial/1.0.0/). The player assets are from Penzilla, https://penzilla.itch.io/protagonist-character. From 2b3eafc2bb1563aac30bc6532c0fffb1c5250305 Mon Sep 17 00:00:00 2001 From: Erlend Sogge Heggen Date: Thu, 4 Jan 2024 01:22:07 +0100 Subject: [PATCH 3/3] Update README.md --- README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b16e5d4..a0ac52a 100644 --- a/README.md +++ b/README.md @@ -44,8 +44,14 @@ We added: ## Licensing -In the future we aim to separate the engine code from the game code, making the former licensed under MIT and the latter under PolyForm NonCommercial v1.0. +In the future we aim to separate the engine code from the game code, making the former licensed under Apache v2.0 and the latter under PolyForm NonCommercial v1.0. -# +### Contributor License Compromise + +Independent contributions (i.e. individual pull requests) from anyone other than 'Isaac Turci @Zac8668' are dual-licensed as [Polyform NonCommercial](https://polyformproject.org/licenses/noncommercial/1.0.0/) (granted to Spicy Lobster & Isaac Turci as the _licensor_) and [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0), meaning all independent contributors retain ownership of their own contributions, albeit non-exclusively. + +More specifics soon to come in [CONTRIBUTING.md](/CONTRIBUTING.md). + +### Assets The player assets are from Penzilla, https://penzilla.itch.io/protagonist-character.