Skip to content

Commit 2943fab

Browse files
author
Topaz
committed
New license for a new future.
1 parent 5e3f4a2 commit 2943fab

8 files changed

+1659
-680
lines changed

AGPL3

+661
Large diffs are not rendered by default.

CONTRIBUTING.md

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
# Issue Report Contributions:
22

33
* Bug reports will only be accepted if they occur on [master](https://github.com/project-topaz/topaz/tree/master)
4-
* If an issue involves incorrect NPC or text, please include your client version (type `/ver` in game)
4+
* If an issue involves incorrect NPCs or text, please include your client version (type `/ver` in game)
5+
* Unimplemented feature requests must be _retail behavior_, and adequetly cover everything about that feature which is missing.
56

67
----
78

89
# Pull Request Contributions:
910

11+
**By submitting a pull request to Project Topaz, you agree to our [Limited Contributor License Agreement](https://github.com/project-topaz/topaz/tree/master/CONTRIBUTER_AGREEMENT.md)**
12+
1013
All contributions must be done through pull requests to the Topaz repository. We don't take fixes from Discord to apply ourselves. If you need help with making a pull request, there is a GitHub guide on how to do so. If you still need help after consulting the guide, you can ask for help in Discord and we will be happy to help you.
1114

15+
We prefer submitting early and often, over monolithic and once. If you're implementing a complex feature, please try to submit PRs as you get each smaller functional aspect working (use your best judgment on what counts as a useful PR). This way we can help make sure you're on the right track before you sink a lot of time into implementations we might want done in a different way.
16+
17+
Please try to leave your PR alone after submission, unless it's to fix bugs you've noticed, or if we've requested changes. If you're still pushing commits after opening the PR, it makes it hard for reviewers to know when you're "finished" and if it's "safe" to begin their reviews.
18+
1219
After a pull request is made, if a staff member leaves feedback for you to change, you must either fix or address it for your pull request to be merged.
1320

1421
# Style Guide
@@ -61,7 +68,7 @@ Clang-Format is also an option for C++
6168
### Lua
6269

6370
* Unix (LF) line ends
64-
* Curly braces go on a newline unless empty.
71+
* Curly braces go on a newline unless empty, or opening a lambda.
6572
* Our lua functions are typically lowerCamelCased, with few exceptions (just FYI).
6673
* No parentheses unless needed to clarify order of operations.
6774
* No semicolons unless multiple statements on a single line.

CONTRIBUTOR_AGREEMENT.md

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Project Topaz Limited Contributor License Agreement
2+
(Updated December 10, 2019)
3+
4+
**By submitting a Pull Request to Project Topaz ("Us", "We", "Our"), You represent, warrant, and agree:**
5+
* **1. Representations and Warranties; Indemnification**
6+
* You have the legal authority to enter into this Agreement
7+
* You own the Copyright and patent claims covering Your Contribution, and that such claims may not also be claimed by third parties, including Your school or employer
8+
* The rights You grant Us do not violate any grant of right You have made to third parties, or any other rights owned by third parties
9+
* Your Contribution can be legally licensed under the AGPLv3 or later version
10+
* You shall, at Our request, indemnify, defend, and hold harmless Project Topaz, its affiliates, and its officers from and against any and all claims, losses, liabilities, damages, expenses and costs (including reasonable attorneys' fees), arising from your breach, or alleged breach, of this Section 1.
11+
* **2. Contribution License**
12+
* Your Contribution - regardless of the license of any code upon which the Contribution is based - is to be licensed under the Project Topaz License, which licenses Our material under the terms of the AGPLv3 with additional supplemental terms
13+
* You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable license to, at any time, and without notice to You:
14+
* Add to, modify, or remove from the Contribution any Additional Permissions under Section 7, Additional Terms of the AGPLv3 license, provided:
15+
* The Additional Permission is or was a reasonable attempt to increase user modification, server customization, or project adoption; or
16+
* The Additional Permission is or was a reasonable attempt to restrict the requirements of Section 13, Remote Network Interaction of the AGPLv3, from applying to a modification or Program which falls outside the current scope of Project Topaz; and
17+
* The Additional Permission would not violate the terms of a hypothetical _GPLv3_ license (_not_ AGPLv3) which _lacks_ Additional Permissions
18+
* Add to, modify, or remove from the Contribution any supplemental restrictions which are allowed under Section 7, Additional Terms of the AGPLv3
19+
* License, relicense, or sublicense, and then convey, the Contribution under any version of the GPL or AGPL
20+
* License, relicense, or sublicense, and then convey, the Contribution under any version of the Project Topaz License, provided:
21+
* That version of the Project Topaz License does not violate the terms of a GPLv3 license (_with_ any supplemental restriction allowed under Section 7, Additional Terms); and
22+
* In the event that version of the Project Topaz License would violate a term of the GPLv3 license, the rest of the Project Topaz License will remain in the full effect allowed by the GPLv3
23+
* Grant to third parties, at Our sole discretion, a limited sublicense exempting them from being bound by any requirement of Section 13, Remote Network Interaction of the AGPLv3, if at the time the sublicense is granted:
24+
* Their modification would be in violation of the Additional Permissions enumerated in the current version of the Project Topaz License;
25+
* Their modification can not be reasonably achieved with the methods the Program provides or intends for modification, without violating the Additional Permissions of that Project Topaz License; and
26+
* The sublicense expires when the modification can be reasonably achieved with methods the Program later provides or intends for modification, while fully abiding by the Project Topaz License
27+
* All references to both the GNU General Public License and the GNU Affero Public License may, at Our sole option, and without notice to You:
28+
* Be updated to any later version of those licenses, and we may relicense Your Contribution under those later versions
29+
* Any restrictions placed on the terms for which We may license Your Contribution may be updated to reference those later versions
30+
* **3. Compensation; Attribution; Waiver**
31+
* The potential inclusion of Your Contribution in Project Topaz is the only compensation for Your Contribution. You are not entitled to any payments, royalties, or other consideration of any kind.
32+
* We may, but are not required to, include attribution to You in files which Project Topaz uses to track or list contributors, such as an AUTHORS file.
33+
* You waive any claims and rights arising from Our authorized use of the Contribution, such as the right to be named as the author, to control modifications, to prevent Your identification as author, and right to prevent commercial usage, to the extent those rights would interfere with those You have granted Us.
34+
* **4. Contribution Ownership**
35+
* You continue to retain all ownership rights to Your contribution, including any and all Copyright and patent claims.
36+
* Any and all rights You grant to Project Topaz are not exclusive, and You may grant them to other third parties.
37+
* In the event that You transfer your ownership rights to any third party, Project Topaz will retain the rights You have granted us.
38+
* **5. General**
39+
* **Nothing in this Agreement shall be construed to allow Us to convey your Contribution in any fashion which would violate the terms of a GPLv3 license** (_not_ AGPLv3) which lacks Additional Permissions. For example, We may not, even with this license You are granting to Us, convey your Contribution without the underlying source code, or remove the copyleft nature of the GPLv3 from Your Contribution.
40+
* **All Contributions currently in the Project Topaz repository for which You own the Copyright and patent claims to will be subject to this Agreement**, as written at the time of your most recent Contribution to Us, regardless of when the Contributions were added to the repository.
41+
* **This Agreement applies even if the Pull Request is later closed**, by either You or Us, without being merged.

0 commit comments

Comments
 (0)