From 9455b6eadc121b5497fa94c9b1b2ceb31b23d6eb Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Sun, 9 Jun 2024 12:41:00 -0400
Subject: [PATCH 1/5] simplified the bug template to have less clutter
---
.github/ISSUE_TEMPLATE/bug.md | 56 +++++++++++++++++++----------------
1 file changed, 31 insertions(+), 25 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index efa81b56d..82c121b5a 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -5,40 +5,46 @@ title: 'Bug Report: [DESCRIBE YOUR BUG IN DETAIL HERE]'
labels: bug
---
-[weed]: <> (FILL THIS ISSUE THING OUT AS MUCH AS POSSIBLE)
-[weed]: <> (OR ELSE YOUR ISSUE WILL BE LESS LIKELY TO BE SOLVED!)
-[weed]: <> (DO NOT POST ABOUT ISSUES FROM OTHER FNF MOD ENGINES! I CANNOT AND PROBABLY WON'T SOLVE THOSE!)
-[weed]: <> (GO TO THEIR RESPECTIVE GITHUB ISSUES AND REPORT THEM THERE LOL!)
+<!-- FILL THIS ISSUE THING OUT AS MUCH AS POSSIBLE
+OR ELSE YOUR ISSUE WILL BE LESS LIKELY TO BE SOLVED!
-[weed]: <> (ALSO MAKE SURE THAT YOU USE PROPER LABELS, IF YOU'RE RUNNING INTO COMPILER ISSUES, USE THE compiler issue LABEL!!!)
+Do not post about issues from other FNF mod engines!
+We cannot and probably won't solve those!
+You can hopefully go to their respective GitHub issues and report them there, thank you :)
-#### Please check for duplicates or similar issues, as well performing simple troubleshooting steps (such as clearing cookies, clearing AppData, trying another browser) before submitting an issue.
-### If you are playing the game in a browser, what site are you playing it from?
+Please check for duplicates or similar issues, as well performing simple troubleshooting steps (such as clearing cookies, clearing AppData, trying another browser) before submitting an issue.
-[weed]: <> (Put an X in the [ ] thingies to fill out checkbox!)
-[weed]: <> (something like [x] pretty much, don't screw up or you will look stupid)
+From Joel On Software:
-- [ ] [Newgrounds](https://www.newgrounds.com/portal/view/770371)
-- [ ] [Itch.io](https://ninja-muffin24.itch.io/funkin)? Specify below
-- - [ ] Windows
-- - [ ] Mac
-- - [ ] Linux
+"It’s pretty easy to remember the rule for a good bug report. Every good bug report needs exactly three things.
-### If you are playing the game in a browser, what browser are you using?
+1. Steps to reproduce,
+2. What you expected to see, and
+3. What you saw instead."
-[weed]: <> (Again, put an x in the [ ] box!)
+-->
-- [ ] Google Chrome (or chomium based like Brave, vivaldi, MS Edge)
-- [ ] Firefox
-- [ ] Safari
+## Describe the bug
+<!-- A clear and concise description of what the bug is. -->
-## What version of the game are you using? Look in the bottom left corner of the main menu. (ex: 0.2.7, 0.2.1, shit like that)
+## To Reproduce
+<!-- Describe in DETAIL how to reproduce the bug/issue you are running into. -->
+## Expected behavior
+<!-- A clear and concise description of what you expected to happen. -->
+## Screenshots/Video
+<!-- If applicable, add screenshots/video to help explain your problem.
+Remember to mark the area in the application thats impacted. -->
-## Have you identified any steps to reproduce the bug? If so, please describe them below in as much detail as possible. Use images if possible.
+## Desktop
+ - OS:
+ <!-- [e.g. Windows 10, 11, Mac, Linux Mint, Ubuntu, Arch (btw)] -->
+ - Browser
+ <!-- [e.g. chrome, safari, firefox, edge, operaGX] -->
+ - Version:
+ <!-- [e.g. 0.4.0, 0.3.3, this can be found in the bottom left corner of the main menu!] -->
-## Please describe your issue. Provide extensive detail and images if possible.
+## Additional context
+<!-- Add any other context about the problem here. -->
-
-
-## If you're game is FROZEN and you're playing a web version, press F12 to open up browser dev window, and go to console, and copy-paste whatever red error you're getting
+<!-- If you're game is FROZEN and you're playing a web version, press F12 to open up browser dev window, and go to console, and copy-paste whatever red error you're getting -->
From 9f960f5c284e019e2787a0fe913368db18b68ad7 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Sun, 9 Jun 2024 12:43:43 -0400
Subject: [PATCH 2/5] removed compiling help and question templates
---
.github/ISSUE_TEMPLATE/compiling.md | 25 -------------------------
.github/ISSUE_TEMPLATE/question.md | 12 ------------
2 files changed, 37 deletions(-)
delete mode 100644 .github/ISSUE_TEMPLATE/compiling.md
delete mode 100644 .github/ISSUE_TEMPLATE/question.md
diff --git a/.github/ISSUE_TEMPLATE/compiling.md b/.github/ISSUE_TEMPLATE/compiling.md
deleted file mode 100644
index 14aea44a7..000000000
--- a/.github/ISSUE_TEMPLATE/compiling.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-name: Compiling help
-about: If you need help compiling the game, and you're running into issues. (Look through the 'compiling help' label in case it's been solved!)
-title: 'Compiling help: [BRIEF DESCRIPTION / ERROR MESSAGE OUTPUT]'
-labels: compiling help
----
-
-[weed]: <> (FILL THIS ISSUE THING OUT AS MUCH AS POSSIBLE)
-[weed]: <> (OR ELSE YOUR ISSUE WILL BE LESS LIKELY TO BE SOLVED!)
-[weed]: <> (DO NOT POST ABOUT ISSUES FROM OTHER FNF MOD ENGINES! I CANNOT AND PROBABLY WON'T SOLVE THOSE!)
-[weed]: <> (GO TO THEIR RESPECTIVE GITHUB ISSUES AND REPORT THEM THERE LOL!)
-
-#### Please check for duplicates or similar compiler issues by filtering for 'compiler help'
-
-[weed]: <> (Put an X in the [ ] thingies to fill out checkbox!)
-[weed]: <> (something like [x] pretty much, don't screw up or you will look stupid)
-
-
-- [ ] Windows
-- [ ] Mac
-- [ ] Linux
-- [ ] HTML5
-
-## Please describe your issue. Provide extensive detail and images if possible.
-
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
deleted file mode 100644
index a257c217a..000000000
--- a/.github/ISSUE_TEMPLATE/question.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-name: Question
-about: Ask a general question
-title: 'Question: '
-labels: question
----
-
-[weed]: <> (This isn't a place for AMA type questions, if you want to ask any of the devs something, reach out to them on twitter prob )
-[weed]: <> (any biz bullshit can go to cameron.taylor.ninja@gmail.com)
-
-#### Please check for duplicates or similar issues before asking your question.
-## What is your question?
From bdaadfbfdd7067be46c73bc87a174f72469688f2 Mon Sep 17 00:00:00 2001
From: Ikko Eltociear Ashimine <eltociear@gmail.com>
Date: Mon, 10 Jun 2024 02:26:55 +0900
Subject: [PATCH 3/5] chore: update MenuList.hx
lenth -> length
---
source/funkin/ui/MenuList.hx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source/funkin/ui/MenuList.hx b/source/funkin/ui/MenuList.hx
index 63a688778..c815e0adc 100644
--- a/source/funkin/ui/MenuList.hx
+++ b/source/funkin/ui/MenuList.hx
@@ -142,7 +142,7 @@ class MenuTypedList<T:MenuListItem> extends FlxTypedGroup<T>
*/
function navGrid(latSize:Int, latPrev:Bool, latNext:Bool, latAllowWrap:Bool, prev:Bool, next:Bool, allowWrap:Bool):Int
{
- // The grid lenth along the variable-length axis
+ // The grid length along the variable-length axis
var size = Math.ceil(length / latSize);
// The selected position along the variable-length axis
var index = Math.floor(selectedIndex / latSize);
From 9908f973cf1ec322a11ada5e8928992d6cf8bc2b Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Wed, 12 Jun 2024 15:27:56 -0400
Subject: [PATCH 4/5] someone pls tell me how to use two different git
submodules
---
.gitmodules | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 452c0089b..be5e0aaa8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
[submodule "assets"]
path = assets
- url = https://github.com/FunkinCrew/Funkin-Assets-secret
+ url = https://github.com/FunkinCrew/funkin.assets
[submodule "art"]
path = art
- url = https://github.com/FunkinCrew/Funkin-Art-secret
+ url = https://github.com/FunkinCrew/funkin.art
From 1f1fe62a06827f2487fb99d45b5a551dc07ed454 Mon Sep 17 00:00:00 2001
From: AppleHair <95587502+AppleHair@users.noreply.github.com>
Date: Fri, 14 Jun 2024 16:53:33 +0300
Subject: [PATCH 5/5] [BUGFIX] Fixed Ranks not appearing in freeplay for custom
variations
Freeplay tries to access a song's rank using the current difficulty name alone, but custom variation ranks are being saved with a variation prefix. This PR makes freeplay look for the variation prefix when necessary.
---
source/funkin/ui/freeplay/FreeplayState.hx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx
index 0caaf4591..23c0f6afb 100644
--- a/source/funkin/ui/freeplay/FreeplayState.hx
+++ b/source/funkin/ui/freeplay/FreeplayState.hx
@@ -2094,8 +2094,13 @@ class FreeplaySongData
{
this.albumId = songDifficulty.album;
}
+
+ // TODO: This line of code makes me sad, but you can't really fix it without a breaking migration.
+ // `easy`, `erect`, `normal-pico`, etc.
+ var suffixedDifficulty = (songDifficulty.variation != Constants.DEFAULT_VARIATION
+ && songDifficulty.variation != 'erect') ? '$currentDifficulty-${songDifficulty.variation}' : currentDifficulty;
- this.scoringRank = Save.instance.getSongRank(songId, currentDifficulty);
+ this.scoringRank = Save.instance.getSongRank(songId, suffixedDifficulty);
this.isNew = song.isSongNew(currentDifficulty);
}