Skip to content

Commit 7fec2a5

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into feature-gdx
2 parents 1f9c756 + 858857f commit 7fec2a5

12 files changed

Lines changed: 280 additions & 608 deletions

CHANGE_LOG.md

Lines changed: 0 additions & 234 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 147 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,208 @@
11
# Contributing to MapTool
22

3-
The following is a set of guidelines for contributing to MapTool. These are mostly guidelines, not rules. Use your best judgement,
3+
Thank you for your interest in contributing to MapTool! This document provides guidelines and
4+
information about contributing to the project.
5+
6+
The following is a set of guidelines for contributing to MapTool. These are mostly guidelines, not
7+
rules. Use your best judgement,
48
and feel free to propose changes to this document via a pull request.
59

6-
#### Table of Contents
10+
This project and everyone participating in it is governed by
11+
the [RPTools Code Of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected
12+
to uphold this code. Also please remember that everyone is contributing in their spare time so some
13+
times it may take a day to answer any questions you have.
14+
15+
## Ways to Contribute
16+
17+
MapTool welcomes contributions from anyone who is interested in helping out. You don't need to be a
18+
programmer to contribute. Here are several ways you can help:
19+
20+
* **[Reporting Bugs](#reporting-bugs)** - Help identify bugs in MapTool
21+
* **[Suggesting Enhancements](#suggesting-enhancements)** - Help improve MapTool by suggesting new
22+
features
23+
* **[Testing](#testing)** - Help test new features and report bugs
24+
* **[Translations](#translations)** - Help translate MapTool into different languages
25+
* **[Documentation](#documentation)** - Improve existing documentation or create new guides
26+
* **[Asset Creation](#asset-creation)** - Create tokens, states, maps, and other assets
27+
* **[Code Contributions](#code-contributions)** - Contribute bug fixes or new features
728

8-
[Code of Conduct](#code-of-conduct)
929

10-
[How Can I Contribute?](#how-can-i-contribute)
11-
* [Reporting Bugs](#reporting-bugs)
12-
* [Suggesting Enhancements](#suggesting-enhancements)
1330
* [Your First Code Contribution](#your-first-code-contribution)
1431
* [Pull Requests](#pull-requests)
1532

1633
[Styleguides](#styleguids)
34+
1735
* [Coding Styleguides](#coding-styleguides)
1836

1937
[Asking Questions](#asking-questions)
2038

21-
22-
23-
## Code of Conduct
24-
25-
This project and everyone participating in it is governed by the [RPTools Code Of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected
26-
to uphold this code.
27-
28-
## How Can I Contribute?
29-
3039
### Reporting Bugs
40+
3141
#### Before submitting a Bug Report
42+
3243
* **Perform a [cursory search][bug-issue]** to see if the problem has already been reported.
33-
if it has and the issue is still open add a comment to the existing issue rather than opening a new one.
44+
if it has and the issue is still open add a comment to the existing issue rather than opening a
45+
new one.
3446

3547
### How do I Submit a Bug Report?
36-
Bugs are tracked as [GitHub Issues](https://guides.github.com/features/issues/). To create a Bug Report use the [Bug Report Issue Template](https://github.com/RPTools/maptool/issues/new?assignees=&labels=bug&template=bug_report.md&title=).
48+
49+
Bugs are tracked as [GitHub Issues](https://guides.github.com/features/issues/). To create a Bug
50+
Report use
51+
the [Bug Report Issue Template](https://github.com/RPTools/maptool/issues/new?assignees=&labels=bug&template=bug_report.md&title=).
3752
Explain the problem and include additional details to help maintainers reproduce the problem.
53+
3854
* **Use a clear descriptive title** for the issue to identify the problem.
39-
* **Describe the exact steps which reproduce the problem** in as much detail as possible. This will help us find and fix the problem faster.
55+
* **Describe the exact steps which reproduce the problem** in as much detail as possible. This will
56+
help us find and fix the problem faster.
4057
* **Explain which behavior you expected to see and why**
41-
* **Include screenshots and animated GIFs** (where relevant) which show you following the steps and the error that occurred.
42-
* **If a problem wasn't triggered by a specific action**, describe what you were doing before the problem happened.
43-
* **Provide the details of the Operating System and MapTool version** you are running.
58+
* **Include screenshots and animated GIFs** (where relevant) which show you following the steps and
59+
the error that occurred.
60+
* **If a problem wasn't triggered by a specific action**, describe what you were doing before the
61+
problem happened.
62+
* **Provide the details of the Operating System and MapTool version** you are running.
4463

4564
Provide more context by answering these questions:
46-
* **Did the problem start happening recently**, for example after upgrading to a new version, or was this always a problem?
47-
* **Can you reliably reproduce the issue?** If not, provide details about how often the problem happens and under which conditions it normally happens.
48-
* **If the problem is related to assets (for example images)** does the problem happen with all assets of this type or only certain ones?
4965

66+
* **Did the problem start happening recently**, for example after upgrading to a new version, or was
67+
this always a problem?
68+
* **Can you reliably reproduce the issue?** If not, provide details about how often the problem
69+
happens and under which conditions it normally happens.
70+
* **If the problem is related to assets (for example images)** does the problem happen with all
71+
assets of this type or only certain ones?
5072

5173
### Suggesting Enhancements
52-
This section guides you through submitting an enhancement suggestion/feature request for MapTool, including completely new features and minor improvements
74+
75+
This section guides you through submitting an enhancement suggestion/feature request for MapTool,
76+
including completely new features and minor improvements
5377
to existing functionality.
78+
5479
#### Before Suggesting an Enhancement.
55-
* **Perform a [cursory search][feature-issue]** to see if the problem has already been reported.
5680

81+
* **Perform a [cursory search][feature-issue]** to see if the problem has already been reported.
5782

5883
### How Do I Submit an Enhancement Suggestion?
5984

60-
Feature requests are tracked as [GitHub Issues](https://guides.github.com/features/issues/). To create a Feature Request use the [Feature Request Issue Template](https://github.com/RPTools/maptool/issues/new?assignees=&labels=feature&template=feature_request.md&title=).
85+
Feature requests are tracked as [GitHub Issues](https://guides.github.com/features/issues/). To
86+
create a Feature Request use
87+
the [Feature Request Issue Template](https://github.com/RPTools/maptool/issues/new?assignees=&labels=feature&template=feature_request.md&title=).
88+
89+
Explain your request
6190

62-
Explain your request
6391
* **Use a clear and descriptive title** for the issue to identify the suggestion.
6492
* **Provide a step-by-step description of the enhancement** in as much detail as possible.
6593
* **Provide specific examples to demonstrate**
66-
* **Describe the current behavior** and **explain which behavior you expected to see instead** and why.
67-
* **Include screenshots and animated GIFs** which help to demonstrate the steps or point out how things could work.
94+
* **Describe the current behavior** and **explain which behavior you expected to see instead** and
95+
why.
96+
* **Include screenshots and animated GIFs** which help to demonstrate the steps or point out how
97+
things could work.
6898
* **Explain why this enhancement would be useful** to other MapTool users.
6999
* **Specify which version of MapTool you are using.**
70100

101+
### Testing
102+
103+
We can never have enough testing. If you would like to help test new features or bug fixes,
104+
please download the latest development build and report any issues you find. You can also join our
105+
[discord](discord.gg/dZy7HeYYVY) server to discuss testing and assign yourself the Testing role.
106+
107+
### Translation
108+
109+
MapTool uses [crowdin](https://crowdin.com/project/maptool) for translations. If you would like
110+
to help translate MapTool into your language, please visit the crowdin project page and create an
111+
account. You can then request to join the MapTool translation team. There is also an area on our
112+
[discord](discord.gg/dZy7HeYYVY) to discuss translations.
71113

72-
### Your First Code Contribution
73-
Unsure where to begin contributing code to MapTool? You can start by looking through these `a good first issue` and `up for grabs` issues.
74-
* [Good First Issues][good-first-issue] - issues which should be good for people who are not yet familiar with MapTool code base.
75-
* [Up For Grabs Issues][up-for-grabs] - issues which require a little but not much familiarity with the MapTool code base and don't require extensive modifications.
114+
### Asset Creation
76115

77-
### Local Development
78-
MapTool can be developed locally, for instructions on how to do this see [Contributor Setup Instructions For MapTool][contributor-setup-for-maptool]
116+
New Tokens, States, and Maps, and Tile packs are always welcome. If you would like to contribute
117+
assets to MapTool, please log into discord and ask about how to contribute assets.
79118

119+
### Documentation
80120

81-
### Pull Requests
121+
Improving documentation is always welcome. If you would like to help improve the documentation
122+
you can create an account on the [RPTools Wiki](https://wiki.rptools.info/index.php/Main_Page)
123+
and start editing, or you can create a pull request with the changes you would like to see in the
124+
documentation on the [MapTool GitHub Repository](https://github.com/RPTools/maptool), or the
125+
[MapTool GitHub Wiki](https://github.com/RPTools/maptool/wiki). There is also an area on
126+
our [discord](discord.gg/dZy7HeYYVY) server to discuss documentation.
82127

83-
Please follow these steps to have your contribution considered by the maintainers:
84-
1. Fill out the relevant details in the pull request template.
85-
2. Follow the [styleguides](#styleguides)
86-
3. After you submit your pull request, verify that all [status checks](https://help.github.com/articles/about-status-checks/) are passing
87-
<details><summary>What if the status checks are failing?</summary>If a status check is failing, and you believe that the failure is unrelated to your change, please leave a comment on the pull request explaining why you believe the failure is unrelated. A maintainer will re-run the status check for you.</details>
128+
### Asset Creation
88129

89-
While the prerequisites above must be satisfied prior to having your pull request reviewed, the reviewer(s) may ask you to complete additional design work, tests, or other changes before your pull request can be ultimately accepted.
130+
New Tokens, States, and Maps, and Tile packs are always welcome. If you would like to contribute
131+
assets to MapTool, please log into discord and ask about how to contribute assets.
90132

133+
### Code Contributions
91134

135+
* Java Development Kit (JDK) from Eclipse Temurin (formerly AdoptOpenJDK)
136+
* An IDE (IntelliJ IDEA recommended)
137+
* [How To Setup User Interface (UI) Tools for MapTool](docs/How_To_Setup_User_Interface_Tools_for_MapTool.md) (
138+
This is optional as it is only
139+
required if you want to make modifications to the user interface.)
92140

93-
## Styleguides
94-
### Coding Styleguids
95-
Please follow the [Coding Styleguides][coding-style-guides] to ensure that the codebase is consistent which makes it easier to read and maintain for everyone.
141+
For detailed setup instructions, please visit
142+
our [Contributor Setup Guide](https://github.com/RPTools/maptool/wiki/Contributor-Setup-Instructions-For-MapTool).
96143

144+
#### Code Style and Guidelines
145+
146+
Please read the [Code Style and Guidelines][coding-style-guides] for MapTool before contributing.
147+
148+
We follow the [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html) with
149+
150+
#### Code Formatting
151+
152+
* Use Spotless for code formatting: Run `gradlew spotlessCheck` and `spotlessApply` before
153+
committing
154+
155+
#### Pull Request Process
156+
157+
1. Fork the repository and create a new branch for your feature or fix
158+
2. Ensure your code follows our style guidelines
159+
3. Write clear commit messages
160+
4. Include tests if applicable
161+
5. Update documentation as needed
162+
6. Submit a pull request with a clear description of the changes
163+
164+
#### Before Submitting
165+
166+
- [ ] Run Spotless to ensure code formatting
167+
- [ ] Test your changes thoroughly
168+
- [ ] Update relevant documentation
169+
- [ ] Ensure all tests pass
170+
- [ ] Review your changes for potential issues
171+
172+
#### Your First Code Contribution
173+
174+
Unsure where to begin contributing code to MapTool? You can start by looking through these
175+
`a good first issue` and `up for grabs` issues.
176+
177+
* [Good First Issues][good-first-issue] - issues which should be good for people who are not yet
178+
familiar with MapTool code base.
179+
* [Up For Grabs Issues][up-for-grabs] - issues which require a little but not much familiarity with
180+
the MapTool code base and don't require extensive modifications.
181+
182+
#### Local Development
183+
184+
MapTool can be developed locally, for instructions on how to do this
185+
see [Contributor Setup Instructions For MapTool][contributor-setup-for-maptool]
97186

98187
## Asking Questions
99-
If you have questions not answered in these guidelines, need further help getting started, or need help working on an issue then you can
100-
* [Ask on the RPTools Discord Sever](https://discord.gg/gevEtpC)
101-
* [Submit a GitHib Issue as a question](https://github.com/RPTools/maptool/issues/new?assignees=&labels=question&template=submit-a-question.md&title=)
102188

189+
If you have questions not answered in these guidelines, need further help getting started, or need
190+
help working on an issue then you can
191+
192+
* [Ask on the RPTools Discord Sever](discord.gg/dZy7HeYYVY)
193+
* [Submit a GitHib Issue as a question](https://github.com/RPTools/maptool/issues/new?assignees=&labels=question&template=submit-a-question.md&title=)
103194

104195
[bug-issue]:https://github.com/RPTools/maptool/labels/bug
196+
105197
[feature-issue]:https://github.com/RPTools/maptool/labels/feature
198+
106199
[good-first-issue]:https://github.com/RPTools/maptool/labels/good%20first%20issue
200+
107201
[up-for-grabs]:https://github.com/RPTools/maptool/labels/up%20for%20grabs
202+
108203
[contributor-setup-for-maptool]:https://github.com/RPTools/maptool/wiki/Contributor-Setup-Instructions-For-MapTool
204+
109205
[coding-style-guides]:https://github.com/RPTools/maptool/blob/develop/doc/Code_Style_and_Guidelines.md
110206

207+
208+
Thank you for contributing to MapTool! Your efforts help make the project better for everyone.

0 commit comments

Comments
 (0)