diff --git a/AUTHORS.md b/AUTHORS.md new file mode 100644 index 000000000..53fbad481 --- /dev/null +++ b/AUTHORS.md @@ -0,0 +1,22 @@ +# AUTHORS.md + +This documents people who have contributed to ZetaGlest. If you are +looking for information about the game from which it was forked, please +see the [MegaGlest home page](https://megaglest.org/) or view GitHub's +[automated list of contributors](https://github.com/ZetaGlest/zetaglest-source/graphs/contributors). + +## Programming + +[Andy Alt](https://github.com/andy5995) + +## Graphics, Animation, and Artwork + +[virtushda](https://github.com/virtushda) + +## XML + +## Music + +## Documentation + +[Shourya Jaiswal](https://github.com/shouryaj98) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 32d43d3aa..a32071fb9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -25,19 +25,20 @@ patch will consist of changes to several files. Keep unrelated patches separate from each other (i.e. a separate PR for each patch). ## Pull Requests -2. [Fork the repo](https://github.com/ZetaGlest/zetaglest-source/fork) (if you haven't already done so) -3. Clone it to your computer -4. When you're ready to work on an issue, be sure you're on the **develop** branch. From there, +1. [Fork the repo](https://github.com/ZetaGlest/zetaglest-source/fork) (if you haven't already done so) +2. Clone it to your computer +3. When you're ready to work on an issue, be sure you're on the **develop** branch. From there, [create a separate branch](https://github.com/Kunena/Kunena-Forum/wiki/Create-a-new-branch-with-git-and-manage-branches) (e.g. issue_32) 4. Make your changes. If you're unsure of some details while you're making edits, you can discuss them on the ticket. -5. Commit your changes. [git-cola](https://git-cola.github.io/) is a nice GUI front-end for adding files and entering commit messages (git-cola is probably available from your OS repository). -6. Push the working branch (e.g. issue_32) to your remote fork and make your +5. Add yourself to the [AUTHORS.md](https://github.com/ZetaGlest/zetaglest-source/blob/develop/AUTHORS.md) file +6. Commit your changes. [git-cola](https://git-cola.github.io/) is a nice GUI front-end for adding files and entering commit messages (git-cola is probably available from your OS repository). +7. Push the working branch (e.g. issue_32) to your remote fork and make your [pull request](https://help.github.com/articles/creating-a-pull-request-from-a-fork/) * 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. -7. If any further changes need to be made, comments will be made on the pull request. +8. 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.