openfpsz/open-fpsz
1
0
Fork 0
mirror of https://gitlab.com/open-fpsz/open-fpsz.git synced 2026-01-19 19:44:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into develop

Browse source
This commit is contained in:
anyreso 2024-12-08 22:28:41 -05:00
parent bc3261d595 4a0143a065
commit 7d0ffba573
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CONTRIBUTING.md
View file

@ -20,7 +20,7 @@ The `develop` branch contains the most recent and advanced codebase, as it serve
Periodically, changes from `develop` are merged into the `main` branch to package releases.
This practice ensures that everyone remains updated on ongoing tasks, fostering transparency and encouraging collaboration.
This practice keeps everyone informed about ongoing tasks, promotes transparency, fosters collaboration, and safeguards newcomers from oversights in the review process.
> Learn how to [create a merge request when you work in a fork][#create_merge_requests_from_fork].
@ -65,7 +65,7 @@ Access to our [gitlab repository][#repo_url] is essential for collaborative deve
4. **Review**: We will assess factors such as the quality of your contributions, adherence to our guidelines and alignment with our project's vision.
5. **Access**: Upon approval, a membership will be granted to our [gitlab repository][#repo_url], allowing you to directly contribute, review changes and collaborate with others.
While we welcome contributions from everyone, access to our repository is granted at our discretion.
While we welcome contributions from everyone, access to our repository is granted at our discretion.
We greatly value enthusiasm within our community and we can't wait to see what you'll bring to the table!
@ -100,13 +100,13 @@ This naming convention helps to categorize branches and makes it easier to ident
1. Create a new branch for your changes:
```shell
git checkout -b fix/my-branch
git checkout -b feat/my-branch
```
2. Make your changes, stage then and commit:
```shell
git commit -am "📝 update CONTRIBUTING.md"
git commit -am "✨ add magic"
```
3. Push your changes to the repository:

6
README.md
View file

@ -1,6 +1,6 @@
# open-fpsz
We love fpsz video games, but we're tired of the genre being abandoned by prominent studios. To properly honor its legacy, we've chosen to develop our own game inspired by it, aiming to surpass its qualities with familiar jetpack and skiing mechanics.
We love fpsz games, but we're tired of the genre being abandoned by prominent studios. To properly honor its legacy, we've chosen to develop our own game inspired by it, aiming to surpass its qualities with familiar jetpack and skiing mechanics.
## Prerequisities
@ -25,3 +25,7 @@ Connect, ask questions and stay updated on the latest developments by joining ou
## License
This project is licensed under the [GPLv3](https://www.gnu.org/licenses/gpl-3.0.html). For more details, please refer to the [LICENSE](LICENSE.md) file.
### Addons
Please note that addons are subject to their own separate license and may have different terms. Be sure to check each addon under [addons][addons] for its respective licenses.