Skip to content

Commit

Permalink
Update haxelibs, add flixel-text-input to fix overlapping text
Browse files Browse the repository at this point in the history
  • Loading branch information
EliteMasterEric committed Dec 14, 2023
1 parent e5ceb1a commit 3f2d1b4
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 11 deletions.
3 changes: 1 addition & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions Project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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!-->
Expand Down
13 changes: 9 additions & 4 deletions hmm.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"name": "flixel",
"type": "git",
"dir": null,
"ref": "da04cbda49a4c5eebe93fb61296dbaf4f0f1b556",
"ref": "9bdea914f3d0485b9b3ec158f28875b5ac95d476",
"url": "https://github.com/EliteMasterEric/flixel"
},
{
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -158,4 +163,4 @@
"version": "0.11.0"
}
]
}
}
2 changes: 1 addition & 1 deletion source/funkin/play/character/MultiSparrowCharacter.hx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 3f2d1b4

Please sign in to comment.