From d4eee38fd2c8f1ca59dbdd801957eb0b067e5542 Mon Sep 17 00:00:00 2001 From: Hyper_ <40342021+NotHyper-474@users.noreply.github.com> Date: Mon, 7 Apr 2025 21:07:46 -0300 Subject: [PATCH 1/9] feat: Show current beat and step next to song position --- source/funkin/ui/debug/charting/ChartEditorState.hx | 1 + 1 file changed, 1 insertion(+) diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx index 22845155f..61b893cdc 100644 --- a/source/funkin/ui/debug/charting/ChartEditorState.hx +++ b/source/funkin/ui/debug/charting/ChartEditorState.hx @@ -5117,6 +5117,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState var songPosMinutes:String = Std.string(Math.floor((Math.abs(songPos) / 1000) / 60)).lpad('0', 2); if (songPos < 0) songPosMinutes = '-' + songPosMinutes; var songPosString:String = '${songPosMinutes}:${songPosSeconds}.${songPosMilliseconds}'; + songPosString += ' | Beat: ${Conductor.instance.currentBeat} | Step: ${Conductor.instance.currentStep}'; if (playbarSongPos.value != songPosString) playbarSongPos.value = songPosString; From c32ade49b9ae0b608af50aa6bcb0750517bd136c Mon Sep 17 00:00:00 2001 From: Hyper_ <40342021+NotHyper-474@users.noreply.github.com> Date: Mon, 7 Apr 2025 23:58:35 -0300 Subject: [PATCH 2/9] Implement suggestion: Fractional beat display --- source/funkin/ui/debug/charting/ChartEditorState.hx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx index 61b893cdc..f8eae591d 100644 --- a/source/funkin/ui/debug/charting/ChartEditorState.hx +++ b/source/funkin/ui/debug/charting/ChartEditorState.hx @@ -5117,7 +5117,11 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState var songPosMinutes:String = Std.string(Math.floor((Math.abs(songPos) / 1000) / 60)).lpad('0', 2); if (songPos < 0) songPosMinutes = '-' + songPosMinutes; var songPosString:String = '${songPosMinutes}:${songPosSeconds}.${songPosMilliseconds}'; - songPosString += ' | Beat: ${Conductor.instance.currentBeat} | Step: ${Conductor.instance.currentStep}'; + + var roundedBeat = FlxMath.roundDecimal(Conductor.instance.currentBeatTime, 2); + var parts:Array = Std.string(roundedBeat).split('.'); + if (parts.length == 1) parts.push('00'); + songPosString += ' | Beat: ${parts.join('.')} | Step: ${Conductor.instance.currentStep}'; if (playbarSongPos.value != songPosString) playbarSongPos.value = songPosString; From 26f2578bf2fb50ccf4070e38c5177df53b61a7a7 Mon Sep 17 00:00:00 2001 From: Hyper_ <40342021+NotHyper-474@users.noreply.github.com> Date: Tue, 8 Apr 2025 16:02:03 -0300 Subject: [PATCH 3/9] fix: Pad number with 1 decimal place with zero --- source/funkin/ui/debug/charting/ChartEditorState.hx | 1 + 1 file changed, 1 insertion(+) diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx index f8eae591d..2fefe5fc0 100644 --- a/source/funkin/ui/debug/charting/ChartEditorState.hx +++ b/source/funkin/ui/debug/charting/ChartEditorState.hx @@ -5121,6 +5121,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState var roundedBeat = FlxMath.roundDecimal(Conductor.instance.currentBeatTime, 2); var parts:Array = Std.string(roundedBeat).split('.'); if (parts.length == 1) parts.push('00'); + else if (parts[1].length < 2) parts[1] += '0'; songPosString += ' | Beat: ${parts.join('.')} | Step: ${Conductor.instance.currentStep}'; if (playbarSongPos.value != songPosString) playbarSongPos.value = songPosString; From 66197b34f65853fa77c85071df13c857cf723e99 Mon Sep 17 00:00:00 2001 From: ShadzXD <136199318+ShadzXD@users.noreply.github.com> Date: Mon, 28 Apr 2025 22:40:26 +0200 Subject: [PATCH 4/9] Update CHANGELOG.md --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 635d5c516..dc6fcc68b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Implemented a macro to optimize registries and entries. ([1497521](https://github.com/FunkinCrew/Funkin/commit/14975212a918adb1a5d96a349ec9e8e63c9fc64b)) - by @lemz1 in [#3694](https://github.com/FunkinCrew/Funkin/pull/3694) - The macro is now used to retrieve base game assets. ([963e2ec](https://github.com/FunkinCrew/Funkin/commit/963e2ecd630fae24dae4206d315618cf4c4be6db)) - by @lemz1 in [#4707](https://github.com/FunkinCrew/Funkin/pull/4707) - The Chart Editor now displays the current beat and step of the playhead. ([83bb3bb](https://github.com/FunkinCrew/Funkin/commit/83bb3bb5074ecb5f50ee21979711efcda9d8017d)) - by @NotHyper-474 in [#4649](https://github.com/FunkinCrew/Funkin/pull/4649) +- The Erect Eggnog cutscene can now be Skipped. ([0303a03](https://github.com/FunkinCrew/funkin.assets/commit/1202651db8ea938fe11b6b734fbf7884d101e6ad)) - by @ShadzXD in [#62](https://github.com/FunkinCrew/funkin.assets/pull/62) ### Changed @@ -77,7 +78,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * @JackXson-Real made their first contribution in [#4346](https://github.com/FunkinCrew/Funkin/pull/4346) * @VioletSnowLeopard made their first contribution in [#4382](https://github.com/FunkinCrew/Funkin/pull/4382) * @superpowers04 made their first contribution in [#4729](https://github.com/FunkinCrew/Funkin/pull/4729) - +* @ShadzXD made their first contribution in [#62](https://github.com/FunkinCrew/Funkin/pull/4729) ## [0.6.2] - 2025-03-31 From db0ac4819276e074ff97d43b7924a74cf7e69f70 Mon Sep 17 00:00:00 2001 From: Hundrec Date: Mon, 28 Apr 2025 14:47:42 -0600 Subject: [PATCH 5/9] Tiny polish for Eggnog cutscene Changelog entry --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc6fcc68b..d37e3cae2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,7 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Implemented a macro to optimize registries and entries. ([1497521](https://github.com/FunkinCrew/Funkin/commit/14975212a918adb1a5d96a349ec9e8e63c9fc64b)) - by @lemz1 in [#3694](https://github.com/FunkinCrew/Funkin/pull/3694) - The macro is now used to retrieve base game assets. ([963e2ec](https://github.com/FunkinCrew/Funkin/commit/963e2ecd630fae24dae4206d315618cf4c4be6db)) - by @lemz1 in [#4707](https://github.com/FunkinCrew/Funkin/pull/4707) - The Chart Editor now displays the current beat and step of the playhead. ([83bb3bb](https://github.com/FunkinCrew/Funkin/commit/83bb3bb5074ecb5f50ee21979711efcda9d8017d)) - by @NotHyper-474 in [#4649](https://github.com/FunkinCrew/Funkin/pull/4649) -- The Erect Eggnog cutscene can now be Skipped. ([0303a03](https://github.com/FunkinCrew/funkin.assets/commit/1202651db8ea938fe11b6b734fbf7884d101e6ad)) - by @ShadzXD in [#62](https://github.com/FunkinCrew/funkin.assets/pull/62) +- The Eggnog Erect cutscene can now be skipped. ([0303a03](https://github.com/FunkinCrew/funkin.assets/commit/1202651db8ea938fe11b6b734fbf7884d101e6ad)) - by @ShadzXD in [#62](https://github.com/FunkinCrew/funkin.assets/pull/62) ### Changed @@ -81,6 +81,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * @ShadzXD made their first contribution in [#62](https://github.com/FunkinCrew/Funkin/pull/4729) + ## [0.6.2] - 2025-03-31 ### Added From 51605e50f852b27aededeae511e3d966b6e20b43 Mon Sep 17 00:00:00 2001 From: Hundrec Date: Tue, 29 Apr 2025 01:31:19 -0600 Subject: [PATCH 6/9] Credit Lasercar for a crash fix from assets PR --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d37e3cae2..6827ee77e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,7 +20,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Implemented a macro to optimize registries and entries. ([1497521](https://github.com/FunkinCrew/Funkin/commit/14975212a918adb1a5d96a349ec9e8e63c9fc64b)) - by @lemz1 in [#3694](https://github.com/FunkinCrew/Funkin/pull/3694) - The macro is now used to retrieve base game assets. ([963e2ec](https://github.com/FunkinCrew/Funkin/commit/963e2ecd630fae24dae4206d315618cf4c4be6db)) - by @lemz1 in [#4707](https://github.com/FunkinCrew/Funkin/pull/4707) - The Chart Editor now displays the current beat and step of the playhead. ([83bb3bb](https://github.com/FunkinCrew/Funkin/commit/83bb3bb5074ecb5f50ee21979711efcda9d8017d)) - by @NotHyper-474 in [#4649](https://github.com/FunkinCrew/Funkin/pull/4649) -- The Eggnog Erect cutscene can now be skipped. ([0303a03](https://github.com/FunkinCrew/funkin.assets/commit/1202651db8ea938fe11b6b734fbf7884d101e6ad)) - by @ShadzXD in [#62](https://github.com/FunkinCrew/funkin.assets/pull/62) ### Changed @@ -39,6 +38,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - The nearest song with an Erect variation will be selected when switching. - Switching difficulties now always plays the capsule jump-in animation. - The "Random" capsule now plays animations consistent with other capsules. +- The Eggnog Erect cutscene can now be skipped. ([0303a03](https://github.com/FunkinCrew/funkin.assets/commit/1202651db8ea938fe11b6b734fbf7884d101e6ad)) - by @ShadzXD in [#62](https://github.com/FunkinCrew/funkin.assets/pull/62) - Swapped the positions of “skip” and “restart” items in the dialogue pause menu for consistency. ([1f88a3b](https://github.com/FunkinCrew/Funkin/commit/1f88a3b6e13e9283ad680805deab5e27ba141d96)) - by @VioletSnowLeopard in [#4553](https://github.com/FunkinCrew/Funkin/pull/4553) - The Controls menu now prevents unbinding essential UI controls to safeguard against softlocking save files. ([7eebce4](https://github.com/FunkinCrew/Funkin/commit/7eebce432d7627a1cf0bbd43f22a6f9bcb63ff65)) - by @VioletSnowLeopard in [#4382](https://github.com/FunkinCrew/Funkin/pull/4382) - Renamed “Auto Pause” preference to “Pause on Unfocus” for clarity. ([52be941](https://github.com/FunkinCrew/Funkin/commit/52be941b4503da0ac76918e2482ab1804866f2cf)) - by @JackXson-Real in [#4346](https://github.com/FunkinCrew/Funkin/pull/4346) @@ -59,9 +59,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Week 6 dialogue no longer plays for all non-default variations when entered through Freeplay. - Nene (Pixel) now plays her knife raising animation when the player has low health. - A-Bot's visualizer is now blank before the song starts. -- Adding custom parameters to note kinds no longer crashes the Chart Editor. - Debug editor tooltips no longer display behind windows. - Clearing save data no longer crashes the game. +- Adding custom parameters to note kinds no longer crashes the Chart Editor. ([0a7bd31](https://github.com/FunkinCrew/Funkin/commit/0a7bd3111f59efbecfe097f8bbcfdefa5ace299d)) - by @Lasercar in [#136](https://github.com/FunkinCrew/funkin.assets/pull/136) - Improved performance in the Freeplay menu before entering a song. ([2b7254f](https://github.com/FunkinCrew/Funkin/commit/2b7254fbd2356e9da91e216f178a88f17874a6eb)) - by @superpowers04 in [#4729](https://github.com/FunkinCrew/Funkin/pull/4729) - Prevented a crash by capping Freeplay and Results screen score displays at their largest possible values (actual scores are not capped). ([51324e9](https://github.com/FunkinCrew/Funkin/commit/51324e9c283c43ca861d3369ba9b3e1db9c89765)) - by @KoloInDaCrib in [#3634](https://github.com/FunkinCrew/Funkin/pull/3634) - The Animation Editor no longer crashes when opened. ([b40b4b0](https://github.com/FunkinCrew/Funkin/commit/b40b4b03692910afceff361cf6ca3298fd787e3c)) - by @sector-a in [#4582](https://github.com/FunkinCrew/Funkin/pull/4582) From 4c5335d7a312828fa8db9d08e1313503cc87cd66 Mon Sep 17 00:00:00 2001 From: Abnormal <86753001+AbnormalPoof@users.noreply.github.com> Date: Wed, 30 Apr 2025 02:37:13 -0500 Subject: [PATCH 7/9] art submod --- art | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/art b/art index 78dc31021..8402339e2 160000 --- a/art +++ b/art @@ -1 +1 @@ -Subproject commit 78dc310219370144719b4eeef9b3b511c5a44532 +Subproject commit 8402339e2e63ae99c441941a46d54bf3f0c0d5fa From d423eb3ddd67f988f28bf7f020b0c6496417bbe0 Mon Sep 17 00:00:00 2001 From: Hundrec Date: Wed, 30 Apr 2025 23:34:26 -0600 Subject: [PATCH 8/9] Update Charting PR policy in CONTRIBUTING.md We no longer accept chart modifications. --- docs/CONTRIBUTING.md | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 234d44cf5..762c837d8 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -405,22 +405,15 @@ If you simultaneously modify files from both repositories, then open two separat Be sure to choose `main` as the base branch for `funkin.assets` PRs, as no `develop` branch exists for that repository. ### Charting PRs -Charting PRs make changes such as **adding/removing notes** or **adjusting the placement of song events**. +Charting PRs make changes such as **adjusting chart metadata**. -This involves modifying one or several of the `funkin.assets` repository's `.json` chart files, found in the `preload/data/songs/` directory. - -These PRs should only be opened in the `funkin.assets` repository. +This involves modifying one or several of the `funkin.assets` repository's `*-metadata.json` files, found in the `preload/data/songs/` directory. > [!CAUTION] -> **No Major Recharts!** Any PR that makes major chart modifications will be rejected. -> Keep your PRs to small tweaks and fixes. +> We **do not** accept changes to the chart `.json` file itself. +> If you find an error in the game's charts, please open an issue in the `Funkin` repo! -Here are some guidelines for opening a Charting PR: -- **Explain the issue.** Which song, variation, difficulty, and section/timestamp is the problem in? Help us understand with screenshots and videos. -- **Show your changes.** How does the chart look with your changes? Provide screenshots and videos here as well. -- **Minimize the diff.** If your changes are very small (e.g. a few notes), do not re-export the chart using the Chart Editor. Instead, manually edit the `.json` chart files to help GitHub display your changes cleanly. - -If your PR is accepted, you will be credited as a GitHub contributor (but not as a charter in the Pause Menu). +These PRs should only be opened in the `funkin.assets` repository. # Closing Thank you for reading the Contributing Guide. From 65699ee865b3ac80219e34d7b6c67be069aacbba Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 1 May 2025 01:38:23 -0400 Subject: [PATCH 9/9] Update CONTRIBUTING.md --- docs/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 762c837d8..9240dd2ed 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -411,7 +411,7 @@ This involves modifying one or several of the `funkin.assets` repository's `*-me > [!CAUTION] > We **do not** accept changes to the chart `.json` file itself. -> If you find an error in the game's charts, please open an issue in the `Funkin` repo! +> If you find an error in the game's charts, please open an issue in the `Funkin` repo, and the Funkin' Crew will review it and make tweaks themselves as necessary. These PRs should only be opened in the `funkin.assets` repository.