Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Contributor License Compromise #29

Merged
merged 3 commits into from
Jan 4, 2024
Merged

fix: Contributor License Compromise #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23519fe
Create CONTRIBUTING.md
erlend-sh Jan 4, 2024
49fa697
Update and rename LICENSE to LICENSE.md
erlend-sh Jan 4, 2024
2b3eafc
Update README.md
erlend-sh Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CONTRIBUTING.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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.
Loading