diff --git a/.gitignore b/.gitignore index b6a415fe9..84585eee0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,8 @@ RECOVER_*.fla shitAudio/ .build_time .swp + +# Exclude JS stuff +node_modules/ +package.json +package-lock.json diff --git a/assets b/assets index 1b12b6c66..3d8cfbb89 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 1b12b6c6666af6c84addf5aa0795546aa0d04185 +Subproject commit 3d8cfbb89527d5fbd52a1544e0724a6f37183178 diff --git a/source/funkin/graphics/adobeanimate/FlxAtlasSprite.hx b/source/funkin/graphics/adobeanimate/FlxAtlasSprite.hx index 5ab2df837..8a77c1c85 100644 --- a/source/funkin/graphics/adobeanimate/FlxAtlasSprite.hx +++ b/source/funkin/graphics/adobeanimate/FlxAtlasSprite.hx @@ -37,6 +37,11 @@ class FlxAtlasSprite extends FlxAnimate { if (settings == null) settings = SETTINGS; + if (path == null) + { + throw 'Null path specified for FlxAtlasSprite!'; + } + super(x, y, path, settings); if (this.anim.curInstance == null) diff --git a/source/funkin/ui/transition/LoadingState.hx b/source/funkin/ui/transition/LoadingState.hx index 347190993..ec6621ee3 100644 --- a/source/funkin/ui/transition/LoadingState.hx +++ b/source/funkin/ui/transition/LoadingState.hx @@ -332,6 +332,7 @@ class LoadingState extends MusicBeatSubState // Since FlxGraphic tells OpenFL to not cache it, we have to do it manually. if (path.endsWith('spritemap1.png')) { + trace('Preloading FlxAnimate asset: ${path}'); openfl.Assets.getBitmapData(path, true); } }