Skip to content

Commit e6bb965

Browse files
authored
Merge branch 'main' into develop-0.7.2
2 parents ed86b32 + b00376c commit e6bb965

File tree

6 files changed

+57
-39
lines changed

6 files changed

+57
-39
lines changed

.github/ISSUE_TEMPLATE/bug.yml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ body:
2020
label: Platform
2121
description: Which platform are you playing on?
2222
options:
23+
- Android
24+
- iOS/iPadOS
2325
- Newgrounds (Web/HTML5)
2426
- Itch.io (Web/HTML5)
25-
- Itch.io (Downloadable Build) - Windows
26-
- Itch.io (Downloadable Build) - MacOS
27-
- Itch.io (Downloadable Build) - Linux
28-
- Google Playstore - Android
29-
- App Store - iOS
27+
- Windows (Downloadable Build)
28+
- MacOS (Downloadable Build)
29+
- Linux (Downloadable Build)
3030
- Compiled from GitHub Source Code
3131
validations:
3232
required: true
@@ -43,11 +43,23 @@ body:
4343
- Safari
4444
- Other (Specify in Description field)
4545

46+
- type: input
47+
attributes:
48+
label: Mobile Device Model
49+
description: (Mobile users only) What mobile device are you playing on?
50+
placeholder: ex. iPhone 16, Galaxy S25, iPad 11th Gen
51+
52+
- type: input
53+
attributes:
54+
label: Mobile OS Version
55+
description: (Mobile users only) What version is your Operating System?
56+
placeholder: ex. iOS 18.5, Android 15, iPadOS 18.5
57+
4658
- type: input
4759
attributes:
4860
label: Version
4961
description: Which version are you playing on? The game version is in the bottom left corner of the main menu.
50-
placeholder: ex. 0.6.4
62+
placeholder: ex. 0.7.2
5163
validations:
5264
required: true
5365

.github/ISSUE_TEMPLATE/charting.yml

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ body:
66
- type: markdown
77
attributes:
88
value: "# PLEASE READ THE [CONTRIBUTING GUIDE](https://github.com/FunkinCrew/Funkin/blob/main/docs/CONTRIBUTING.md) BEFORE OPENING ISSUES!"
9-
9+
1010
- type: checkboxes
1111
attributes:
1212
label: Issue Checklist
@@ -21,35 +21,25 @@ body:
2121
label: Platform
2222
description: Which platform are you playing on?
2323
options:
24+
- Android
25+
- iOS/iPadOS
2426
- Newgrounds (Web/HTML5)
2527
- Itch.io (Web/HTML5)
26-
- Itch.io (Downloadable Build) - Windows
27-
- Itch.io (Downloadable Build) - MacOS
28-
- Itch.io (Downloadable Build) - Linux
28+
- Windows (Downloadable Build)
29+
- MacOS (Downloadable Build)
30+
- Linux (Downloadable Build)
2931
- Compiled from GitHub Source Code
3032
validations:
3133
required: true
3234

33-
- type: dropdown
34-
attributes:
35-
label: Browser
36-
description: (Web/HTML5 users only) Which browser are you playing on?
37-
options:
38-
- Google Chrome
39-
- Microsoft Edge
40-
- Firefox
41-
- Opera
42-
- Safari
43-
- Other (Specify in Description field)
44-
4535
- type: input
4636
attributes:
4737
label: Version
48-
description: Which version are you playing on? The game version is in the bottom left corner of the main menu.
49-
placeholder: ex. 0.6.4
38+
description: Which version are you playing on? The game version is in the bottom left corner of the main menu.
39+
placeholder: ex. 0.7.2
5040
validations:
5141
required: true
52-
42+
5343
- type: markdown
5444
attributes:
5545
value: "## Describe the charting issue(s)."

.github/ISSUE_TEMPLATE/compiling.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ body:
66
- type: markdown
77
attributes:
88
value: "# PLEASE READ THE [CONTRIBUTING GUIDE](https://github.com/FunkinCrew/Funkin/blob/main/docs/CONTRIBUTING.md) BEFORE OPENING ISSUES!"
9-
9+
1010
- type: checkboxes
1111
attributes:
1212
label: Issue Checklist
@@ -22,6 +22,8 @@ body:
2222
label: Platform
2323
description: Which platform are you compiling for?
2424
options:
25+
- Android
26+
- iOS/iPadOS
2527
- Web/HTML5
2628
- Desktop (Windows)
2729
- Desktop (Mac)
@@ -33,11 +35,11 @@ body:
3335
- type: input
3436
attributes:
3537
label: Version
36-
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.
37-
placeholder: ex. 0.6.4
38+
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.
39+
placeholder: ex. 0.7.2
3840
validations:
3941
required: true
40-
42+
4143
- type: markdown
4244
attributes:
4345
value: "## Describe your compiling issue."

.github/ISSUE_TEMPLATE/crash.yml

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ body:
66
- type: markdown
77
attributes:
88
value: "# PLEASE READ THE [CONTRIBUTING GUIDE](https://github.com/FunkinCrew/Funkin/blob/main/docs/CONTRIBUTING.md) BEFORE OPENING ISSUES!"
9-
9+
1010
- type: checkboxes
1111
attributes:
1212
label: Issue Checklist
@@ -21,11 +21,13 @@ body:
2121
label: Platform
2222
description: Which platform are you playing on?
2323
options:
24+
- Android
25+
- iOS/iPadOS
2426
- Newgrounds (Web/HTML5)
2527
- Itch.io (Web/HTML5)
26-
- Itch.io (Downloadable Build) - Windows
27-
- Itch.io (Downloadable Build) - MacOS
28-
- Itch.io (Downloadable Build) - Linux
28+
- Windows (Downloadable Build)
29+
- MacOS (Downloadable Build)
30+
- Linux (Downloadable Build)
2931
- Compiled from GitHub Source Code
3032
validations:
3133
required: true
@@ -42,11 +44,23 @@ body:
4244
- Safari
4345
- Other (Specify in Description field)
4446

47+
- type: input
48+
attributes:
49+
label: Mobile Device Model
50+
description: (Mobile users only) What mobile device are you playing on?
51+
placeholder: ex. iPhone 16, Galaxy S25, iPad 11th Gen
52+
53+
- type: input
54+
attributes:
55+
label: Mobile OS Version
56+
description: (Mobile users only) What version is your Operating System?
57+
placeholder: ex. iOS 18.5, Android 15, iPadOS 18.5
58+
4559
- type: input
4660
attributes:
4761
label: Version
48-
description: Which version are you playing on? The game version is in the bottom left corner of the main menu.
49-
placeholder: ex. 0.6.4
62+
description: Which version are you playing on? The game version is in the bottom left corner of the main menu.
63+
placeholder: ex. 0.7.2
5064
validations:
5165
required: true
5266

@@ -61,7 +75,7 @@ body:
6175
- type: textarea
6276
attributes:
6377
label: Description
64-
description: Include screenshots or videos of the crash happening. Provide as much detail as you can.
78+
description: Include screenshots or videos of the crash happening. Provide as much detail as you can.
6579
placeholder: Describe the crash here...
6680
validations:
6781
required: true
@@ -77,7 +91,7 @@ body:
7791
- type: textarea
7892
attributes:
7993
label: Crash logs
80-
description: These can be found in the logs folder where Funkin.exe is.
94+
description: These can be found in the logs folder where Funkin.exe is, or in your mobile device's file explorer.
8195
placeholder: Upload your logs here...
8296
validations:
8397
required: true

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ Select. ([3d3e2bd](https://github.com/FunkinCrew/Funkin/commit/3d3e2bd3786b85814
412412
* @JackXson-Real made their first contribution in [#4346](https://github.com/FunkinCrew/Funkin/pull/4346)
413413
* @VioletSnowLeopard made their first contribution in [#4382](https://github.com/FunkinCrew/Funkin/pull/4382)
414414
* @superpowers04 made their first contribution in [#4729](https://github.com/FunkinCrew/Funkin/pull/4729)
415-
* @ShadzXD made their first contribution in [#62](https://github.com/FunkinCrew/Funkin/pull/4729)
415+
* @ShadzXD made their first contribution in [funkin.assets#62](https://github.com/FunkinCrew/funkin.assets/pull/62)
416416

417417

418418

docs/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ This section provides guidelines to follow when [opening an issue](https://githu
6060

6161
## Requirements
6262
Make sure you're playing:
63-
- the latest version of the game (currently v0.6.4)
63+
- the latest version of the game (currently v0.7.2)
6464
- without any mods
6565
- on [Newgrounds](https://www.newgrounds.com/portal/view/770371) or downloaded from [itch.io](https://ninja-muffin24.itch.io/funkin)
6666

0 commit comments

Comments
 (0)