Merge branch 'develop' into center-waveforms

Author: Starexify

source/funkin/InitState.hx

@@ -402,7 +402,11 @@ class InitState extends FlxState
     }
     else if (params.song.shouldLoadSong && params.song.songPath != null)
     {
+      #if sys
       FlxG.switchState(() -> new ChartPlaytestMenu(params.song.songPath));
+      #else
+      FlxG.switchState(() -> new TitleState());
+      #end
     }
     else
     {

source/funkin/play/GameOverSubState.hx

@@ -499,9 +499,9 @@ class GameOverSubState extends MusicBeatSubState
       else
       {
         onComplete = function() {
-          isStarting = true;
+          isStarting = false;
           // We need to force to ensure that the non-starting music plays.
-          startDeathMusic(0.0, true);
+          startDeathMusic(1.0, true);
         };
       }
     }

source/funkin/play/cutscene/VideoCutscene.hx

@@ -73,13 +73,10 @@ class VideoCutscene
     if (!openfl.Assets.exists(filePath))
     {
       // Display a popup.
-      // funkin.util.WindowUtil.showError('Error playing video', 'Video file does not exist: ${filePath}');
-      // return;
-
-      // TODO: After moving videos to their own library,
-      // this function ALWAYS FAILS on web, but the video still plays.
-      // I think that's due to a weird quirk with how OpenFL libraries work.
+      funkin.util.WindowUtil.showError('Error playing video', 'Video file does not exist: ${filePath}');
       trace('Video file does not exist: ${filePath}');
+
+      return;
     }
 
     var rawFilePath = Paths.stripLibrary(filePath);

source/funkin/ui/debug/playtest/ChartPlaytestMenu.hx

@@ -1,5 +1,6 @@
 package funkin.ui.debug.playtest;
 
+#if sys
 import flixel.text.FlxText;
 import flixel.util.FlxColor;
 import flixel.tweens.FlxTween;
@@ -97,3 +98,4 @@ class ChartPlaytestMenu extends MusicBeatState
     #end
   }
 }
+#end

source/funkin/ui/debug/playtest/ChartPlaytestMenuButton.hx

@@ -1,5 +1,6 @@
 package funkin.ui.debug.playtest;
 
+#if sys
 import flixel.group.FlxSpriteGroup;
 import flixel.text.FlxText;
 import flixel.util.FlxColor;
@@ -104,3 +105,4 @@ class ChartPlaytestMenuButtonListToggle extends ChartPlaytestMenuButtonBase
     return '$title: $selectedItem';
   }
 }
+#end

source/funkin/ui/transition/LoadingState.hx

@@ -95,6 +95,7 @@ class LoadingState extends MusicBeatSubState
       }
 
       checkLibrary('shared');
+      checkLibrary('videos');
       checkLibrary(stageDirectory);
       checkLibrary('tutorial');