4.8 KiB
CONTRIBUTING
Welcome to the ZG project! Thank you for reading this document and considering contributing.
Anyone is welcome to join our Discord server or IRC channel.
The Discord rooms are for players, developers, and curiosity/adventure-seekers.
Mods, tech trees, scenarios, tilesets, maps
Guidelines for submitting or letting us know about content you've created can be found on the data repo at zetaglest-data#submitting-mods-tech-trees-tilesets-maps-scenarios
Our goal with content contributed by artists are:
- help content creators promote their work
- make it more visible
- encourage testing by players
- have it available for testing and reviewing in a timely manner
Issues
ZetaGlest Issues are filed on these repositories:
If you find an issue that interests you, please leave a note asking about it first. If you don't see that anyone has inquired about it, you can simply leave a note saying you are going to work on it. If people work on an issue without saying they are working on it, the result is sometimes three people submit a PR for the same issue.
If you find a problem for which no ticket has yet been created, please don't hesitate to open a new ticket, and let us know if you are going to work on that issue.
If you would like to contribute something, it is advised to inquire first, to be sure it's a patch that would get accepted. We don't want anyone to spend their time and generosity working on something that we would be unable to accept.
Please leave another note if you change your mind or if you get busy with other things and are unable to finish it. That lets me and other people know the ticket is available to be worked on by other people.
Coding style
Please match the existing style
Sometimes a patch will be a single line in a single file; other times a single patch will consist of changes to several files. Keep unrelated patches separate from each other (i.e. a separate PR for each patch).
See the instructions in BUILD.md for important information about how to clone your forks so you can easily contribute patches, graphics, or other content to the ZetaGlest repositories.
Pull Requests
-
Fork the repo (if you haven't already done so)
-
Clone it to your computer
-
When you're ready to work on an issue, be sure you're on the develop branch. From there, create a separate branch (e.g. issue_32)
-
Make your changes. If you're unsure of some details while you're making edits, you can discuss them on the ticket.
-
Add yourself to the AUTHORS.md file
-
Commit your changes. git-cola is a nice GUI front-end for adding files and entering commit messages (git-cola is probably available from your OS repository).
- If you're updating only documention (or other files that don't affect a build) add [skip ci] to the commit message (automatic code integration tests will be skipped).
-
Push the working branch (e.g. issue_32) to your remote fork and make your pull request
- Do not merge it with the master branch on your fork. That would result in multiple, or unrelated patches being included in a single PR.
-
If any further changes need to be made, comments will be made on the pull request.
It's possible to work on two or more different patches (and therefore multiple branches) at one time, but it's recommended that beginners only work on one patch at a time.
Syncing
Periodically, especially before starting a new patch, you'll need the sync your repo with the remote upstream. GitHub has instructions for doing this:
- Configuring a remote for a fork
- For step 3 on that page, use https://github.com/ZetaGlest/zetaglest-source for the URL.
- Syncing a Fork
- On that page, it shows how to merge the master branch (steps 4 & 5 of Syncing a Fork).
Follow these steps if you are contributing to the data or masterserver repository.