diff --git a/assets/data/characters/da.xml b/assets/data/characters/da.xml new file mode 100644 index 00000000..86e40e5b --- /dev/null +++ b/assets/data/characters/da.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/assets/images/characters/da.png b/assets/images/characters/da.png new file mode 100644 index 00000000..8ddaf9d4 Binary files /dev/null and b/assets/images/characters/da.png differ diff --git a/assets/images/characters/da.xml b/assets/images/characters/da.xml new file mode 100644 index 00000000..05374465 --- /dev/null +++ b/assets/images/characters/da.xml @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/buildnumber.txt b/buildnumber.txt index 3827a8bd..3de00380 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -2132 \ No newline at end of file +2134 \ No newline at end of file diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 6c9106f4..fa2d6c8f 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -1490,7 +1490,7 @@ class PlayState extends MusicBeatState function goodNoteHit(note:Note):Void { - if(note.wasGoodHit) return; + if(note == null || note.wasGoodHit) return; note.wasGoodHit = true; diff --git a/source/funkin/mods/ModsFolder.hx b/source/funkin/mods/ModsFolder.hx index 9ccc4c11..49e7c822 100644 --- a/source/funkin/mods/ModsFolder.hx +++ b/source/funkin/mods/ModsFolder.hx @@ -76,6 +76,7 @@ class ModsFolder { Options.lastLoadedMod = ModsFolder.currentModFolder = mod; Options.save(); if (ModsFolder.currentModFolder == null) return; + Paths.assetsTree.addLibrary(loadMod(ModsFolder.currentModFolder)); Main.refreshAssets();