mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-12-23 13:48:23 +00:00
Update haxelibs, add flixel-text-input to fix overlapping text
This commit is contained in:
parent
e5ceb1a5e3
commit
3f2d1b4c1b
3
.vscode/settings.json
vendored
3
.vscode/settings.json
vendored
|
@ -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
|
||||
|
|
10
Project.xml
10
Project.xml
|
@ -99,18 +99,20 @@
|
|||
|
||||
<haxelib name="flixel-addons" /> <!-- Additional utilities for Flixel -->
|
||||
<haxelib name="hscript" /> <!-- Scripting -->
|
||||
<haxelib name="flixel-ui" /> <!-- UI framework (deprecate this? -->
|
||||
<haxelib name="flixel-ui" /> <!-- UI framework (DEPRECATED) -->
|
||||
<haxelib name="haxeui-core" /> <!-- UI framework -->
|
||||
<haxelib name="haxeui-flixel" /> <!-- Integrate HaxeUI with Flixel -->
|
||||
<haxelib name="flixel-text-input" /> <!-- Improved text field rendering for HaxeUI -->
|
||||
<haxelib name="polymod" /> <!-- Modding framework -->
|
||||
<haxelib name="flxanimate" /> <!-- Texture atlas rendering -->
|
||||
<haxelib name="hxCodec" /> <!-- Video playback -->
|
||||
|
||||
<haxelib name="json2object" /> <!-- JSON parsing -->
|
||||
<haxelib name="tink_json" /> <!-- JSON parsing -->
|
||||
<haxelib name="tink_json" /> <!-- JSON parsing (DEPRECATED) -->
|
||||
<haxelib name="thx.semver" /> <!-- Version string handling -->
|
||||
|
||||
<haxelib name="hxcpp-debug-server" if="desktop debug" /> <!-- VSCode debug support -->
|
||||
|
||||
<haxelib name="thx.semver" />
|
||||
<haxelib name="hxcpp-debug-server" if="desktop debug" />
|
||||
<!--Disable the Flixel core focus lost screen-->
|
||||
<haxedef name="FLX_NO_FOCUS_LOST_SCREEN" />
|
||||
<!--Disable the Flixel core debugger. Automatically gets set whenever you compile in release mode!-->
|
||||
|
|
13
hmm.json
13
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"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue