diff --git a/Project.xml b/Project.xml
index c2f03f83b..ef58d5b53 100644
--- a/Project.xml
+++ b/Project.xml
@@ -129,7 +129,7 @@
-
+
diff --git a/hmm.json b/hmm.json
index 9edc42cdd..6e8601501 100644
--- a/hmm.json
+++ b/hmm.json
@@ -1,116 +1,108 @@
{
- "dependencies": [
- {
- "name": "discord_rpc",
- "type": "git",
- "dir": null,
- "ref": "2d83fa8",
- "url": "https://github.com/Aidan63/linc_discord-rpc"
- },
- {
- "name": "flixel",
- "type": "git",
- "dir": null,
- "ref": "d6100cc8",
- "url": "https://github.com/EliteMasterEric/flixel"
- },
- {
- "name": "flixel-addons",
- "type": "git",
- "dir": null,
- "ref": "f107166",
- "url": "https://github.com/EliteMasterEric/flixel-addons"
- },
- {
- "name": "flixel-ui",
- "type": "haxelib",
- "version": "2.4.0"
- },
- {
- "name": "flxanimate",
- "type": "git",
- "dir": null,
- "ref": "18b2060",
- "url": "https://github.com/Dot-Stuff/flxanimate"
- },
- {
- "name": "format",
- "type": "haxelib",
- "version": "3.5.0"
- },
- {
- "name": "haxeui-core",
- "type": "git",
- "dir": null,
- "ref": "e5cf78d",
- "url": "https://github.com/haxeui/haxeui-core/"
- },
- {
- "name": "haxeui-flixel",
- "type": "git",
- "dir": null,
- "ref": "f03bb6d",
- "url": "https://github.com/haxeui/haxeui-flixel"
- },
- {
- "name": "hmm",
- "type": "git",
- "dir": null,
- "ref": "3ef9522",
- "url": "https://github.com/steviegt6/hmm"
- },
- {
- "name": "hscript",
- "type": "haxelib",
- "version": "2.5.0"
- },
- {
- "name": "hxcodec",
- "type": "git",
- "dir": null,
- "ref": "master",
- "url": "https://github.com/EliteMasterEric/hxCodec"
- },
- {
- "name": "hxcpp",
- "type": "haxelib",
- "version": "4.2.1"
- },
- {
- "name": "hxcpp-debug-server",
- "type": "haxelib",
- "version": "1.2.4"
- },
- {
- "name": "hxp",
- "type": "haxelib",
- "version": null
- },
- {
- "name": "lime",
- "type": "git",
- "dir": null,
- "ref": "afadf5f",
- "url": "https://github.com/openfl/lime"
- },
- {
- "name": "openfl",
- "type": "git",
- "dir": null,
- "ref": "b2c18513",
- "url": "https://github.com/EliteMasterEric/openfl"
- },
- {
- "name": "polymod",
- "type": "git",
- "dir": null,
- "ref": "4e5b4b3",
- "url": "https://github.com/larsiusprime/polymod"
- },
- {
- "name": "thx.semver",
- "type": "haxelib",
- "version": "0.2.2"
- }
- ]
-}
+ "dependencies": [{
+ "name": "discord_rpc",
+ "type": "git",
+ "dir": null,
+ "ref": "2d83fa8",
+ "url": "https://github.com/Aidan63/linc_discord-rpc"
+ },
+ {
+ "name": "flixel",
+ "type": "git",
+ "dir": null,
+ "ref": "d6100cc8",
+ "url": "https://github.com/EliteMasterEric/flixel"
+ },
+ {
+ "name": "flixel-addons",
+ "type": "git",
+ "dir": null,
+ "ref": "f107166",
+ "url": "https://github.com/EliteMasterEric/flixel-addons"
+ },
+ {
+ "name": "flixel-ui",
+ "type": "haxelib",
+ "version": "2.4.0"
+ },
+ {
+ "name": "flxanimate",
+ "type": "git",
+ "dir": null,
+ "ref": "49f5554",
+ "url": "https://github.com/Dot-Stuff/flxanimate"
+ },
+ {
+ "name": "format",
+ "type": "haxelib",
+ "version": "3.5.0"
+ },
+ {
+ "name": "haxeui-core",
+ "type": "git",
+ "dir": null,
+ "ref": "dd7a95d",
+ "url": "https://github.com/haxeui/haxeui-core/"
+ },
+ {
+ "name": "haxeui-flixel",
+ "type": "git",
+ "dir": null,
+ "ref": "3882f1f",
+ "url": "https://github.com/haxeui/haxeui-flixel"
+ },
+ {
+ "name": "hmm",
+ "type": "git",
+ "dir": null,
+ "ref": "3ef9522",
+ "url": "https://github.com/steviegt6/hmm"
+ },
+ {
+ "name": "hscript",
+ "type": "haxelib",
+ "version": "2.5.0"
+ },
+ {
+ "name": "hxcpp",
+ "type": "haxelib",
+ "version": "4.2.1"
+ },
+ {
+ "name": "hxcpp-debug-server",
+ "type": "haxelib",
+ "version": "1.2.4"
+ },
+ {
+ "name": "hxp",
+ "type": "haxelib",
+ "version": null
+ },
+ {
+ "name": "lime",
+ "type": "git",
+ "dir": null,
+ "ref": "afadf5f",
+ "url": "https://github.com/openfl/lime"
+ },
+ {
+ "name": "openfl",
+ "type": "git",
+ "dir": null,
+ "ref": "b2c18513",
+ "url": "https://github.com/EliteMasterEric/openfl"
+ },
+ {
+ "name": "polymod",
+ "type": "git",
+ "dir": null,
+ "ref": "4e5b4b3",
+ "url": "https://github.com/larsiusprime/polymod"
+ },
+ {
+ "name": "thx.semver",
+ "type": "haxelib",
+ "version": "0.2.2"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/source/funkin/play/cutscene/VanillaCutscenes.hx b/source/funkin/play/cutscene/VanillaCutscenes.hx
index 99d0bd0d8..9f51b214c 100644
--- a/source/funkin/play/cutscene/VanillaCutscenes.hx
+++ b/source/funkin/play/cutscene/VanillaCutscenes.hx
@@ -1,12 +1,13 @@
package funkin.play.cutscene;
-import hxcodec.flixel.FlxVideoSprite;
-import hxcodec.flixel.FlxCutsceneState;
+// import hxcodec.flixel.FlxVideoSprite;
+// import hxcodec.flixel.FlxCutsceneState;
import flixel.FlxSprite;
import flixel.tweens.FlxEase;
import flixel.tweens.FlxTween;
import flixel.util.FlxColor;
import flixel.util.FlxTimer;
+import funkin.graphics.video.FlxVideo;
/**
* Static methods for playing cutscenes in the PlayState.
@@ -62,7 +63,7 @@ class VanillaCutscenes
vid.finishCallback = finishCutscene;
#else
// Video displays OVER the FlxState.
- vid = new FlxVideoSprite(0, 0);
+ // vid = new FlxVideoSprite(0, 0);
vid.cameras = [PlayState.instance.camCutscene];
@@ -73,7 +74,7 @@ class VanillaCutscenes
#end
}
- static var vid:#if html5 FlxVideo #else FlxVideoSprite #end;
+ static var vid:#if html5 FlxVideo #else Dynamic /**FlxVideoSprite **/ #end;
/**
* Does the cleanup to start the countdown after the video is done.