Skip to content

Commit

Permalink
Merge branch 'wesnoth:master' into pr/6236
Browse files Browse the repository at this point in the history
  • Loading branch information
cooljeanius authored Sep 5, 2023
2 parents 680474d + 1e31dad commit 73bebd3
Show file tree
Hide file tree
Showing 13,253 changed files with 1,715,337 additions and 892,384 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
/attic export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.travis.yml export-ignore
RELEASE_NOTES export-ignore
/.github export-ignore
/changelog_entries export-ignore

# help github's language detection and syntax highlighting
*.cfg linguist-language=INI
36 changes: 0 additions & 36 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

52 changes: 52 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Bug Report
description: Create a report to help us improve the game,
labels: ['Bug']

body:
- type: textarea
id: info
attributes:
label: Game and System Information
description: |
- What version of the game are you running?
- Where did you download it from? (Steam, Mac App Store, our website, built from source, etc.)
- If you're using a custom build, what compiler did you use, and what commit did you build at?
- What OS are you running?
value: |
- **Version:**
- **Downloaded from:**
- **Build info:**
- **OS:**
validations:
required: true

- type: textarea
id: description
attributes:
label: Description of the bug
description: A clear and concise description of what the bug is.
validations:
required: true

- type: textarea
id: to_reproduce
attributes:
label: Steps to reproduce the behavior
placeholder: |
1.
2.
3.
- type: textarea
id: expectation
attributes:
label: Expected behavior
description: |
A clear and concise description of what you expected to happen. If applicable, add screenshots or savefiles to help explain your problem.
To find savefiles, start Wesnoth, click on the `i` button at the bottom left corner of the title screen, and open the `Saved games` directory.
- type: textarea
id: more_info
attributes:
label: Additional context
description: Add any other context (compiler logs, console output, etc) about the problem here.
21 changes: 0 additions & 21 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Feature Request
description: Request a new feature to enhance the game.
labels: ['Enhancement']

body:
- type: textarea
id: description
attributes:
label: Describe the desired feature
description: |
Try to explain the desired end result, rather than speculating about how the feature could be implemented.
If applicable, add screenshots or mockups to help explain your request.
validations:
required: true
31 changes: 0 additions & 31 deletions .github/ISSUE_TEMPLATE/text-typos-or-improvements.md

This file was deleted.

42 changes: 42 additions & 0 deletions .github/ISSUE_TEMPLATE/text-typos-or-improvements.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Text Typos or Improvements
description: Any typo fixes or improvement suggestions for campaign dialog, unit descriptions, or other game text.
labels: ['Prose']

body:
- type: markdown
attributes:
value: >
**Note:** The house style of Wesnoth uses a good many words and constructions that are archaic, poetic,
or dialectal. If you speak modern English as a second language you may incorrectly read these as errors.
Please see [NotSpellingMistakes](https://wiki.wesnoth.org/NotSpellingMistakes) for a list of things you
will encounter that may look like spelling or usage errors but are not.
Note that the mainline campaigns are now using correct typography, including sexed quotes and en and em
dashes. These will appear as three byte sequences if you are not using a viewer that supports UTF-8.
- type: input
id: language
attributes:
label: Language
description: What language does the typo appear in?

- type: input
id: location
attributes:
label: Source
description: Where does the typo appear? If part of a campaign, specify the scenario.
validations:
required: true

- type: textarea
id: original_text
attributes:
label: Original Text
description: Quote the text verbatim. You can use `**bold**` to highlight the issue.
validations:
required: true

- type: textarea
id: new_text
attributes:
label: Proposed Change
8 changes: 8 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
Achievements:
- src/achievements.hpp
- src/achievements.cpp
- src/gui/dialogs/achievements_dialog.hpp
- src/gui/dialogs/achievements_dialog.cpp
- data/achievements.cfg
- data/campaigns/*/achievements.cfg

Add-ons:
- src/server/campaignd/**
- src/server/common/**
Expand Down
Loading

0 comments on commit 73bebd3

Please sign in to comment.