Skip to content

Commit

Permalink
Merge pull request #4095 from AbnormalPoof/main-to-develop
Browse files Browse the repository at this point in the history
Move changes from `main` to `develop`
  • Loading branch information
EliteMasterEric authored Feb 3, 2025
2 parents 6216655 + 246de95 commit 796cbb3
Show file tree
Hide file tree
Showing 11 changed files with 228 additions and 20 deletions.
5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ body:
label: Issue Checklist
description: Be sure to complete these steps to increase the chances of your issue being addressed!
options:
- label: I have properly named my issue
- label: I have read the pinned [Issues Guide](https://github.com/FunkinCrew/Funkin/issues/4050)
- label: I have checked the Issues/Discussions pages to see if my issue has already been reported
- label: I have properly named my issue

- type: dropdown
attributes:
Expand Down Expand Up @@ -41,7 +42,7 @@ body:
attributes:
label: Version
description: Which version are you playing on? The game version is in the bottom left corner of the main menu.
placeholder: ex. 0.5.0
placeholder: ex. 0.5.3
validations:
required: true

Expand Down
71 changes: 71 additions & 0 deletions .github/ISSUE_TEMPLATE/charting.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
name: Charting Issue
description: Report an issue with the placement of notes in the game.
labels: ["type: charting issue", "status: pending triage"]
title: "Charting Issue: "
body:
- type: checkboxes
attributes:
label: Issue Checklist
description: Be sure to complete these steps to increase the chances of your issue being addressed!
options:
- label: I have read the pinned [Issues Guide](https://github.com/FunkinCrew/Funkin/issues/4050)
- label: I have checked the Issues/Discussions pages to see if my issue has already been reported
- label: I have properly named my issue

- type: dropdown
attributes:
label: Platform
description: Which platform are you playing on?
options:
- Newgrounds (Web/HTML5)
- Itch.io (Web/HTML5)
- Itch.io (Downloadable Build) - Windows
- Itch.io (Downloadable Build) - MacOS
- Itch.io (Downloadable Build) - Linux
- Compiled from GitHub Source Code
validations:
required: true

- type: dropdown
attributes:
label: Browser
description: (Web/HTML5 users only) Which browser are you playing on?
options:
- Google Chrome
- Microsoft Edge
- Firefox
- Opera
- Safari
- Other (Specify in Description field)

- type: input
attributes:
label: Version
description: Which version are you playing on? The game version is in the bottom left corner of the main menu.
placeholder: ex. 0.5.3
validations:
required: true

- type: markdown
attributes:
value: "## Describe the charting issue(s)."

- type: markdown
attributes:
value: "### Please do not report issues from other engines. These must be reported in their respective repositories."

- type: textarea
attributes:
label: Location
description: Where did you find the issue(s)? Include the name of the song, the variation, the difficulty, the time/section of the song, and any images or videos.
placeholder: ex. Cocoa Erect on Erect/Nightmare difficulties at Section 30
validations:
required: true

- type: textarea
attributes:
label: Description
description: Why do you believe this is an issue? Is a note at the wrong time, a hold note too short/long, or something else?
placeholder: Describe the charting issue(s) here...
validations:
required: true
59 changes: 59 additions & 0 deletions .github/ISSUE_TEMPLATE/compiling.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: Compiling Help
description: Report an issue with compiling the game.
labels: ["type: compilation help", "status: pending triage"]
title: "Compiling Help: "
body:
- type: checkboxes
attributes:
label: Issue Checklist
description: Be sure to complete these steps to increase the chances of your issue being addressed!
options:
- label: I have read the pinned [Issues Guide](https://github.com/FunkinCrew/Funkin/issues/4050)
- label: I have followed the [Compiling Guide](https://github.com/FunkinCrew/Funkin/blob/main/docs/COMPILING.md) and the [Troubleshooting Guide](https://github.com/FunkinCrew/Funkin/blob/main/docs/TROUBLESHOOTING.md)
- label: I have checked the Issues/Discussions pages to see if my issue has already been reported
- label: I have properly named my issue

- type: dropdown
attributes:
label: Platform
description: Which platform are you compiling for?
options:
- Web/HTML5
- Desktop (Windows)
- Desktop (Mac)
- Desktop (Linux)
- Other
validations:
required: true

- type: input
attributes:
label: Version
description: Which version are you compiling? The game version is in the bottom left corner of the main menu or in the project.hxp file.
placeholder: ex. 0.5.3
validations:
required: true

- type: markdown
attributes:
value: "## Describe your compiling issue."

- type: markdown
attributes:
value: "### Please do not report issues from other engines. These must be reported in their respective repositories."

- type: textarea
attributes:
label: Console Output
description: Paste any errors or warnings from the console here.
placeholder: Paste output here...
validations:
required: true

- type: textarea
attributes:
label: Context
description: Provide as much detail as you can. Did you modify any code? Provide any relevant images or videos.
placeholder: Describe the context here...
validations:
required: true
5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/crash.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ body:
label: Issue Checklist
description: Be sure to complete these steps to increase the chances of your issue being addressed!
options:
- label: I have properly named my issue
- label: I have read the pinned [Issues Guide](https://github.com/FunkinCrew/Funkin/issues/4050)
- label: I have checked the Issues/Discussions pages to see if my issue has already been reported
- label: I have properly named my issue

- type: dropdown
attributes:
Expand Down Expand Up @@ -41,7 +42,7 @@ body:
attributes:
label: Version
description: Which version are you playing on? The game version is in the bottom left corner of the main menu.
placeholder: ex. 0.5.0
placeholder: ex. 0.5.3
validations:
required: true

Expand Down
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/enhancement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ body:
label: Issue Checklist
description: Be sure to complete these steps to increase the chances of your suggestion being considered!
options:
- label: I have properly named my enhancement
- label: I have read the pinned [Issues Guide](https://github.com/FunkinCrew/Funkin/issues/4050)
- label: I have checked the Issues/Discussions pages to see if my enhancement has already been suggested
- label: I have properly named my enhancement

- type: textarea
attributes:
Expand Down
12 changes: 6 additions & 6 deletions .github/changed-lines-count-labeler.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Add 'small' to any changes below 10 lines
small:
# Add 'size: small' to any changes below 10 lines
'size: small':
max: 9

# Add 'medium' to any changes between 10 and 100 lines
medium:
# Add 'size: medium' to any changes between 10 and 100 lines
'size: medium':
min: 10
max: 99

# Add 'large' to any changes of at least 100 lines
large:
# Add 'size: large' to any changes of at least 100 lines
'size: large':
min: 100
58 changes: 53 additions & 5 deletions .github/label-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,51 @@
comment: >
This issue is a duplicate. Please direct all discussion to the original issue.
# Close the issue
close: true
close: false
# Set a close reason
close-reason: 'not planned'
# close-reason: 'not planned'
# Remove other status labels
unlabel:
- 'status: accepted'
- 'status: bug reproduced'
- 'status: cannot reproduce'
- 'status: needs clarification'
- 'status: needs r&d'
- 'status: needs revision'
- 'status: pending pull request'
- 'status: pending triage'
- 'status: planned'
- 'status: rejected'
- 'status: resolved'
- 'status: resolved internally'
- 'status: reviewing internally'
- 'status: stale'
prs:
# Post a comment
comment: >
This pull request is a duplicate. Please direct all discussion to the original pull request.
# Close the pull request
close: false
# Remove other status labels
unlabel:
- 'status: accepted'
- 'status: bug reproduced'
- 'status: cannot reproduce'
- 'status: needs clarification'
- 'status: needs r&d'
- 'status: needs revision'
- 'status: pending pull request'
- 'status: pending triage'
- 'status: planned'
- 'status: rejected'
- 'status: resolved'
- 'status: resolved internally'
- 'status: reviewing internally'
- 'status: stale'

'status: stale':
issues:
# Close the issue
close: true
# Set a close reason
close-reason: 'not planned'
Expand All @@ -37,15 +60,36 @@
- 'status: accepted'
- 'status: bug reproduced'
- 'status: cannot reproduce'
- 'status: duplicate'
- 'status: needs clarification'
- 'status: needs r&d'
- 'status: needs revision'
- 'status: pending pull request'
- 'status: pending triage'
- 'status: planned'
- 'status: rejected'
- 'status: resolved'
- 'status: resolved internally'
- 'status: reviewing internally'
prs:
# Close the pull request
close: true
# Remove other status labels
unlabel:
- 'status: accepted'
- 'status: bug reproduced'
- 'status: cannot reproduce'
- 'status: duplicate'
- 'status: needs clarification'
- 'status: needs r&d'
- 'status: needs revision'
- 'status: pending pull request'
- 'status: pending triage'
- 'status: planned'
- 'status: rejected'
- 'status: resolved'
- 'status: resolved internally'
- 'status: reviewing internally'
- 'status: stale'

'status: rejected':
issues:
Expand All @@ -60,30 +104,32 @@
- 'status: cannot reproduce'
- 'status: duplicate'
- 'status: needs clarification'
- 'status: needs r&d'
- 'status: needs revision'
- 'status: pending pull request'
- 'status: pending triage'
- 'status: planned'
- 'status: resolved'
- 'status: resolved internally'
- 'status: reviewing internally'
- 'status: stale'
prs:
# Close the pull request
close: true
# Set a close reason
close-reason: 'not planned'
# Remove other status labels
unlabel:
- 'status: accepted'
- 'status: bug reproduced'
- 'status: cannot reproduce'
- 'status: duplicate'
- 'status: needs clarification'
- 'status: needs r&d'
- 'status: needs revision'
- 'status: pending pull request'
- 'status: pending triage'
- 'status: planned'
- 'status: resolved'
- 'status: resolved internally'
- 'status: reviewing internally'
- 'status: stale'

Expand All @@ -100,10 +146,12 @@
- 'status: cannot reproduce'
- 'status: duplicate'
- 'status: needs clarification'
- 'status: needs r&d'
- 'status: needs revision'
- 'status: pending pull request'
- 'status: pending triage'
- 'status: planned'
- 'status: rejected'
- 'status: resolved internally'
- 'status: reviewing internally'
- 'status: stale'
11 changes: 9 additions & 2 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
# Add Documentation tag to PR's changing markdown files, or anything in the docs folder
Documentation:
'pr: documentation':
- changed-files:
- any-glob-to-any-file:
- docs/*
- '**/*.md'

# Add Haxe tag to PR's changing haxe code files
Haxe:
'pr: haxe':
- changed-files:
- any-glob-to-any-file: '**/*.hx'

# Add GitHub tag to PR's changing yml files, or anything in the .github folder
'pr: github':
- changed-files:
- any-glob-to-any-file:
- github/*
- '**/*.yml'
19 changes: 19 additions & 0 deletions .github/workflows/label-pull-request-on-create.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: "Pull Request Labeler 2 (Runs on PR creation)"
on:
pull_request_target:
types:
- opened

jobs:
# Apply `status: pending triage` to newly created pull requests
apply-pending-triage:
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
steps:
- name: Apply "status pending triage" to new pull requests
uses: actions-ecosystem/action-add-labels@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
labels: "status: pending triage"
3 changes: 2 additions & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ All Rights Reserved. "Friday Night Funkin'" and the "Friday Night Funkin'" logo
You can view the `funkin-assets` license here: (https://github.com/FunkinCrew/funkin.assets/blob/main/LICENSE.md)

## Apache 2.0 License

```
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down Expand Up @@ -210,3 +210,4 @@ You can view the `funkin-assets` license here: (https://github.com/FunkinCrew/fu
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
```
Loading

0 comments on commit 796cbb3

Please sign in to comment.