diff --git a/.vscode/settings.json b/.vscode/settings.json
index 92d49c3d4..cefbadcf6 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,8 +4,7 @@
"editor.formatOnSave": true,
"editor.formatOnPaste": true,
"editor.codeActionsOnSave": {
- // Compilation server issues can cause auto-cleanup to remove valid imports.
- "source.organizeImports": false
+ "source.organizeImports": "never"
},
"editor.defaultFormatter": "nadako.vshaxe",
"editor.tabSize": 2
diff --git a/Project.xml b/Project.xml
index 4c0ffdce7..e0677b026 100644
--- a/Project.xml
+++ b/Project.xml
@@ -99,18 +99,20 @@
-
+
+
-
+
+
+
+
-
-
diff --git a/hmm.json b/hmm.json
index a10eed1a6..b85413bae 100644
--- a/hmm.json
+++ b/hmm.json
@@ -11,7 +11,7 @@
"name": "flixel",
"type": "git",
"dir": null,
- "ref": "da04cbda49a4c5eebe93fb61296dbaf4f0f1b556",
+ "ref": "9bdea914f3d0485b9b3ec158f28875b5ac95d476",
"url": "https://github.com/EliteMasterEric/flixel"
},
{
@@ -21,6 +21,11 @@
"ref": "c8c41e26d463aaf2edc0582fb23b6e228235bd16",
"url": "https://github.com/EliteMasterEric/flixel-addons"
},
+ {
+ "name": "flixel-text-input",
+ "type": "haxelib",
+ "version": "1.1.0"
+ },
{
"name": "flixel-ui",
"type": "git",
@@ -32,8 +37,8 @@
"name": "flxanimate",
"type": "git",
"dir": null,
- "ref": "dd2903f7dc7024335b981edf2a770760cec912e1",
- "url": "https://github.com/ninjamuffin99/flxanimate"
+ "ref": "d7c5621be742e2c98d523dfe5af7528835eaff1e",
+ "url": "https://github.com/EliteMasterEric/flxanimate"
},
{
"name": "format",
@@ -158,4 +163,4 @@
"version": "0.11.0"
}
]
-}
+}
\ No newline at end of file
diff --git a/source/funkin/play/character/MultiSparrowCharacter.hx b/source/funkin/play/character/MultiSparrowCharacter.hx
index 968f613ff..0fc07399c 100644
--- a/source/funkin/play/character/MultiSparrowCharacter.hx
+++ b/source/funkin/play/character/MultiSparrowCharacter.hx
@@ -205,7 +205,7 @@ class MultiSparrowCharacter extends BaseCharacter
graphic = value.parent;
this.frames = value;
this.frame = value.getByIndex(0);
- this.numFrames = value.numFrames;
+ // this.numFrames = value.numFrames;
resetHelpers();
this.bakedRotationAngle = 0;
this.animation.frameIndex = 0;