From 903b3fc59905a70802618a1cd67407722ea956ed Mon Sep 17 00:00:00 2001 From: Kolo <67389779+JustKolosaki@users.noreply.github.com> Date: Sat, 5 Oct 2024 10:29:26 +0200 Subject: [PATCH 01/10] fix: Don't restart the FreeplayState song preview when changing the difficulty within the same variation pulled from the wrong branch, oops! last update i hope wrong spellings im gonna kms --- source/funkin/ui/freeplay/FreeplayState.hx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx index 507c447588..351de6b977 100644 --- a/source/funkin/ui/freeplay/FreeplayState.hx +++ b/source/funkin/ui/freeplay/FreeplayState.hx @@ -1689,6 +1689,7 @@ class FreeplayState extends MusicBeatSubState function changeDiff(change:Int = 0, force:Bool = false):Void { touchTimer = 0; + var previousVariation:String = currentVariation; // Available variations for current character. We get this since bf is usually `default` variation, and `pico` is `pico` // but sometimes pico can be the default variation (weekend 1 songs), and bf can be `bf` variation (darnell) @@ -1784,7 +1785,7 @@ class FreeplayState extends MusicBeatSubState } // Reset the song preview in case we changed variations (normal->erect etc) - playCurSongPreview(); + if (currentVariation != previousVariation) playCurSongPreview(); } // Set the album graphic and play the animation if relevant. From 3267c612587017298ab9f2e7d368331e9ac59285 Mon Sep 17 00:00:00 2001 From: Abnormal <86753001+AbnormalPoof@users.noreply.github.com> Date: Sun, 6 Oct 2024 18:25:04 -0500 Subject: [PATCH 02/10] blacklist one additional class --- source/funkin/modding/PolymodHandler.hx | 1 + 1 file changed, 1 insertion(+) diff --git a/source/funkin/modding/PolymodHandler.hx b/source/funkin/modding/PolymodHandler.hx index f3d9273b24..eb0e77fc55 100644 --- a/source/funkin/modding/PolymodHandler.hx +++ b/source/funkin/modding/PolymodHandler.hx @@ -288,6 +288,7 @@ class PolymodHandler Polymod.blacklistImport('openfl.utils.Assets'); Polymod.blacklistImport('openfl.Lib'); Polymod.blacklistImport('openfl.system.ApplicationDomain'); + Polymod.blacklistImport('funkin.util.FunkinTypeResolver'); // `openfl.desktop.NativeProcess` // Can load native processes on the host operating system. From 9695e791349cb8f72814d69e6bf9c34148296fce Mon Sep 17 00:00:00 2001 From: Hundrec Date: Fri, 4 Oct 2024 21:20:45 -0700 Subject: [PATCH 03/10] Label me Docs --- .github/labeler.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index e8250b4e77..9cf784f4ca 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,11 +1,11 @@ -# Add Documentation tag to PR's changing markdown files, or anyhting in the docs folder +# Add Documentation tag to PR's changing markdown files, or anything in the docs folder Documentation: - changed-files: - any-glob-to-any-file: - docs/* - '**/*.md' -# Adds Haxe tag to PR's changing haxe code files +# Add Haxe tag to PR's changing haxe code files Haxe: - changed-files: - any-glob-to-any-file: '**/*.hx' From f6a5a9d8ce45ea3ec358df874f05053ad35734bd Mon Sep 17 00:00:00 2001 From: Hundrec Date: Fri, 4 Oct 2024 21:27:34 -0700 Subject: [PATCH 04/10] Wait now it should do it --- docs/COMPILING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/COMPILING.md b/docs/COMPILING.md index ce3d89e7b4..f2b59acbc3 100644 --- a/docs/COMPILING.md +++ b/docs/COMPILING.md @@ -34,7 +34,7 @@ There are several useful build flags you can add to a build to affect how it wor - `-DGITHUB_BUILD` will enable in-game debug functions (such as the ability to time travel in a song by pressing `PgUp`/`PgDn`), without enabling the other stuff - `-DFEATURE_POLYMOD_MODS` or `-DNO_FEATURE_POLYMOD_MODS` to forcibly enable or disable modding support. - `-DREDIRECT_ASSETS_FOLDER` or `-DNO_REDIRECT_ASSETS_FOLDER` to forcibly enable or disable asset redirection. - - This feature causes the game to load exported assets from the project's assets folder rather than the exported one. Great for fast iteration, but the game + - This feature causes the game to load exported assets from the project's assets folder rather than the exported one. Great for fast iteration, but the game _(finish this sentence Eric)_ - `-DFEATURE_DISCORD_RPC` or `-DNO_FEATURE_DISCORD_RPC` to forcibly enable or disable support for Discord Rich Presence. - `-DFEATURE_VIDEO_PLAYBACK` or `-DNO_FEATURE_VIDEO_PLAYBACK` to forcibly enable or disable video cutscene support. - `-DFEATURE_CHART_EDITOR` or `-DNO_FEATURE_CHART_EDITOR` to forcibly enable or disable the chart editor in the Debug menu. From 5d10bb9f5489f1e693a113880fd31ab2042e3765 Mon Sep 17 00:00:00 2001 From: Hundrec Date: Fri, 4 Oct 2024 21:56:49 -0700 Subject: [PATCH 05/10] Rename troubleshooting.md to fix link in COMPILING.md --- docs/{troubleshooting.md => TROUBLESHOOTING.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docs/{troubleshooting.md => TROUBLESHOOTING.md} (100%) diff --git a/docs/troubleshooting.md b/docs/TROUBLESHOOTING.md similarity index 100% rename from docs/troubleshooting.md rename to docs/TROUBLESHOOTING.md From 6848815e801e15064e4dfd9d3817a32eeae2f41a Mon Sep 17 00:00:00 2001 From: Hundrec Date: Fri, 4 Oct 2024 22:03:33 -0700 Subject: [PATCH 06/10] Adjust line count labeler comment --- .github/changed-lines-count-labeler.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/changed-lines-count-labeler.yml b/.github/changed-lines-count-labeler.yml index 6f890f5342..1de00e62f8 100644 --- a/.github/changed-lines-count-labeler.yml +++ b/.github/changed-lines-count-labeler.yml @@ -7,6 +7,6 @@ medium: min: 10 max: 99 -# Add 'large' to any changes for more than 100 lines +# Add 'large' to any changes of at least 100 lines large: min: 100 From 7d5d80d515715501f8d2178539addfa16962bfba Mon Sep 17 00:00:00 2001 From: Hundrec Date: Fri, 4 Oct 2024 22:13:02 -0700 Subject: [PATCH 07/10] Fix typos in CODESTYLE.md --- CODESTYLE.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CODESTYLE.md b/CODESTYLE.md index 2641febfa8..2b6333258a 100644 --- a/CODESTYLE.md +++ b/CODESTYLE.md @@ -4,14 +4,14 @@ Code style is enforced using Visual Studio Code extensions. ## .hx Formatting is handled by the `nadako.vshaxe` extension, which includes Haxe Formatter. -Haxe Formatter automatically resolves issues such as intentation style and line breaks, and can be configured in `hxformat.json`. +Haxe Formatter automatically resolves issues such as indentation style and line breaks, and can be configured in `hxformat.json`. Code Quality is handled by the `vshaxe.haxe-checkstyle` extension, which includes Haxe Checkstyle. ### Haxe Checkstyle Notes -* Checks can be escalated to display as different serverities in the Problems window. +* Checks can be escalated to display as different severities in the Problems window. * Checks can be disabled by setting the severity to `IGNORE`. -* `IndentationCharacter` checks what is used to indent, `Indentation` checks how deep the intentation is. +* `IndentationCharacter` checks what is used to indent, `Indentation` checks how deep the indentation is. * `CommentedOutCode` check is in place because old code should be retrieved via Git history. * TODO items: Enable these one-by-one and fix them to improve the overall code quality. - Reconfigure `MethodLength` From 880615e707accf8a5ce8a2b7fcf128c1fb0222c8 Mon Sep 17 00:00:00 2001 From: Hundrec Date: Fri, 4 Oct 2024 22:54:28 -0700 Subject: [PATCH 08/10] Remove extra asterisks in Funkin' Debug Hotkeys.md Those stars might have been indicators for something, but I don't see any note related to them. --- docs/Funkin' Debug Hotkeys.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/Funkin' Debug Hotkeys.md b/docs/Funkin' Debug Hotkeys.md index 1287d5a1bf..416c897141 100644 --- a/docs/Funkin' Debug Hotkeys.md +++ b/docs/Funkin' Debug Hotkeys.md @@ -15,8 +15,8 @@ Most of this functionality is only available on debug builds of the game! - `2`: ***GAIN HEALTH***: Debug function, add 10% to the player's health. - `3`: ***LOSE HEALTH***: Debug function, subtract 5% to the player's health. - `9`: NEATO! -- `PAGEUP` (MacOS: `Fn-Up`): ***FORWARDS TIME TRAVEL****: Move forward by 2 sections. Hold SHIFT to move forward by 20 sections instead. -- `PAGEDOWN` (MacOS: `Fn-Down`): ***BACKWARDS TIME TRAVEL****: Move backward by 2 sections. Hold SHIFT to move backward by 20 sections instead. +- `PAGEUP` (MacOS: `Fn-Up`): ***FORWARDS TIME TRAVEL***: Move forward by 2 sections. Hold SHIFT to move forward by 20 sections instead. +- `PAGEDOWN` (MacOS: `Fn-Down`): ***BACKWARDS TIME TRAVEL***: Move backward by 2 sections. Hold SHIFT to move backward by 20 sections instead. ## **Freeplay State** - `F` (Freeplay Menu) - Move to Favorites @@ -27,5 +27,5 @@ Most of this functionality is only available on debug builds of the game! - `Y` - WOAH ## **Main Menu** -- `~`: ***DEBUG****: Opens a menu to access the Chart Editor and other work-in-progress editors. Rebindable in the options menu. +- `~`: ***DEBUG***: Opens a menu to access the Chart Editor and other work-in-progress editors. Rebindable in the options menu. - `CTRL-ALT-SHIFT-W`: ***ALL ACCESS***: Unlocks all songs in Freeplay. Only available on debug builds. From 31d1b3e2464120c2608995e968357ef85c004535 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 8 Oct 2024 14:12:55 -0400 Subject: [PATCH 09/10] Finish the sentence. --- docs/COMPILING.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/COMPILING.md b/docs/COMPILING.md index f2b59acbc3..6df1232b17 100644 --- a/docs/COMPILING.md +++ b/docs/COMPILING.md @@ -34,10 +34,11 @@ There are several useful build flags you can add to a build to affect how it wor - `-DGITHUB_BUILD` will enable in-game debug functions (such as the ability to time travel in a song by pressing `PgUp`/`PgDn`), without enabling the other stuff - `-DFEATURE_POLYMOD_MODS` or `-DNO_FEATURE_POLYMOD_MODS` to forcibly enable or disable modding support. - `-DREDIRECT_ASSETS_FOLDER` or `-DNO_REDIRECT_ASSETS_FOLDER` to forcibly enable or disable asset redirection. - - This feature causes the game to load exported assets from the project's assets folder rather than the exported one. Great for fast iteration, but the game _(finish this sentence Eric)_ + - This feature causes the game to load exported assets from the project's assets folder rather than the exported one. Great for fast iteration, but the game will break if you try to zip it up and send it to someone, so it's disabled for release builds. - `-DFEATURE_DISCORD_RPC` or `-DNO_FEATURE_DISCORD_RPC` to forcibly enable or disable support for Discord Rich Presence. - `-DFEATURE_VIDEO_PLAYBACK` or `-DNO_FEATURE_VIDEO_PLAYBACK` to forcibly enable or disable video cutscene support. - `-DFEATURE_CHART_EDITOR` or `-DNO_FEATURE_CHART_EDITOR` to forcibly enable or disable the chart editor in the Debug menu. +- `-DFEATURE_SCREENSHOTS` or `-DNO_FEATURE_SCREENSHOTS` to forcibly enable or disable the screenshots feature. - `-DFEATURE_STAGE_EDITOR` to forcibly enable the experimental stage editor. - `-DFEATURE_GHOST_TAPPING` to forcibly enable an experimental gameplay change to the anti-mash system. From e66290c55f7141402223644f06ec8a69edeee089 Mon Sep 17 00:00:00 2001 From: Kn1ghtNight Date: Tue, 18 Jun 2024 18:25:00 -0400 Subject: [PATCH 10/10] fix: anti alias / smooth the volume sound tray --- source/funkin/ui/options/FunkinSoundTray.hx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/funkin/ui/options/FunkinSoundTray.hx b/source/funkin/ui/options/FunkinSoundTray.hx index b2fb7fc044..5a5bf1d6cc 100644 --- a/source/funkin/ui/options/FunkinSoundTray.hx +++ b/source/funkin/ui/options/FunkinSoundTray.hx @@ -33,6 +33,7 @@ class FunkinSoundTray extends FlxSoundTray var bg:Bitmap = new Bitmap(Assets.getBitmapData(Paths.image("soundtray/volumebox"))); bg.scaleX = graphicScale; bg.scaleY = graphicScale; + bg.smoothing = true; addChild(bg); y = -height; @@ -44,6 +45,7 @@ class FunkinSoundTray extends FlxSoundTray backingBar.y = 5; backingBar.scaleX = graphicScale; backingBar.scaleY = graphicScale; + backingBar.smoothing = true; addChild(backingBar); backingBar.alpha = 0.4; @@ -60,6 +62,7 @@ class FunkinSoundTray extends FlxSoundTray bar.y = 5; bar.scaleX = graphicScale; bar.scaleY = graphicScale; + bar.smoothing = true; addChild(bar); _bars.push(bar); }