cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-01-26 22:56:48 +00:00
Code Issues Releases Wiki Activity

Merge branch 'rewrite/master' into abnormalpoof/opening-urls

Browse source
This commit is contained in:
Cameron Taylor 2024-09-19 22:31:12 -04:00 committed by GitHub
parent d81e09b1c3 50de041251
commit 0b908b3cab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
hmm.json
View file

@ -35,13 +35,6 @@
"ref": "951a0103a17bfa55eed86703ce50b4fb0d7590bc", "ref": "951a0103a17bfa55eed86703ce50b4fb0d7590bc",
"url": "https://github.com/FunkinCrew/flixel-text-input" "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", "name": "flxanimate",
"type": "git", "type": "git",

5
source/funkin/ui/debug/anim/DebugBoundingState.hx
View file

@ -239,6 +239,11 @@ class DebugBoundingState extends FlxState
{ {
movingCharacter = false; movingCharacter = false;
} }
if (FlxG.mouse.justReleased)
{
movingCharacter = false;
}
} }
} }

1
source/funkin/ui/transition/LoadingState.hx
View file

@ -314,7 +314,6 @@ class LoadingState extends MusicBeatSubState
FunkinSprite.cacheTexture(Paths.image('ui/popup/pixel/num7')); FunkinSprite.cacheTexture(Paths.image('ui/popup/pixel/num7'));
FunkinSprite.cacheTexture(Paths.image('ui/popup/pixel/num8')); FunkinSprite.cacheTexture(Paths.image('ui/popup/pixel/num8'));
FunkinSprite.cacheTexture(Paths.image('ui/popup/pixel/num9')); FunkinSprite.cacheTexture(Paths.image('ui/popup/pixel/num9'));
FunkinSprite.cacheTexture(Paths.image('notes', 'shared')); FunkinSprite.cacheTexture(Paths.image('notes', 'shared'));
FunkinSprite.cacheTexture(Paths.image('noteSplashes', 'shared')); FunkinSprite.cacheTexture(Paths.image('noteSplashes', 'shared'));
FunkinSprite.cacheTexture(Paths.image('noteStrumline', 'shared')); FunkinSprite.cacheTexture(Paths.image('noteStrumline', 'shared'));