Skip to content

Commit

Permalink
Merge pull request #29 from erlend-sh/main
Browse files Browse the repository at this point in the history
fix: Contributor License Compromise
  • Loading branch information
Zac8668 authored Jan 4, 2024
2 parents c90c82a + 2b3eafc commit d997021
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
5 changes: 5 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion LICENSE → LICENSE.md
Original file line number Diff line number Diff line change
@@ -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.
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

0 comments on commit d997021

Please sign in to comment.