Merge branch 'feature/stacked-notes-vis' of https://github.com/NotHyp…

…er-474/Funkin-Legacy-Linux into feature/stacked-notes-vis

.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

.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'

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`

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
+    - 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.
 

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.

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.

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.

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);
     }