Skip to content

Commit

Permalink
Merge pull request #2820 from gamerbross/bugfix/animation-editor
Browse files Browse the repository at this point in the history
[ENHANCEMENT/BUGFIX] Few animation editor bugfixes and improvements
  • Loading branch information
EliteMasterEric authored Sep 16, 2024
2 parents b0c9365 + 359e4b4 commit ebfce9f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
7 changes: 0 additions & 7 deletions hmm.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,6 @@
"ref": "951a0103a17bfa55eed86703ce50b4fb0d7590bc",
"url": "https://github.com/FunkinCrew/flixel-text-input"
},
{
"name": "flixel-ui",
"type": "git",
"dir": null,
"ref": "27f1ba626f80a6282fa8a187115e79a4a2133dc2",
"url": "https://github.com/HaxeFlixel/flixel-ui"
},
{
"name": "flxanimate",
"type": "git",
Expand Down
7 changes: 6 additions & 1 deletion source/funkin/ui/debug/anim/DebugBoundingState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class DebugBoundingState extends FlxState
{
// get the screen position, according to the HUD camera, temp default to FlxG.camera juuust in case?
var hudMousePos:FlxPoint = FlxG.mouse.getScreenPosition(hudCam ?? FlxG.camera);
return Screen.instance.hasSolidComponentUnderPoint(hudMousePos.x, hudMousePos.y);
return Screen.instance.hasSolidComponentUnderPoint(hudMousePos.x, hudMousePos.y) || FlxG.mouse.overlaps(animDropDownMenu, hudCam);
}

override function create()
Expand Down Expand Up @@ -239,6 +239,11 @@ class DebugBoundingState extends FlxState
{
movingCharacter = false;
}

if (FlxG.mouse.justReleased)
{
movingCharacter = false;
}
}
}

Expand Down

0 comments on commit ebfce9f

Please sign in to comment.