cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-26 15:07:14 +00:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into fps-setting

Browse source
This commit is contained in:
Eric 2024-09-16 22:09:54 -04:00 committed by GitHub
parent f38a95bbf7 1fc835494d
commit 6efdbde8da
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/funkin/play/PlayState.hx
View file

@ -3046,6 +3046,7 @@ class PlayState extends MusicBeatSubState
GameOverSubState.reset(); GameOverSubState.reset();
PauseSubState.reset(); PauseSubState.reset();
Countdown.reset(); Countdown.reset();
PopUpStuff.reset();
// Clear the static reference to this state. // Clear the static reference to this state.
instance = null; instance = null;

9
source/funkin/play/components/PopUpStuff.hx
View file

@ -125,4 +125,13 @@ class PopUpStuff extends FlxTypedGroup<FunkinSprite>
daLoop++; daLoop++;
} }
} }
/**
* Reset the popup configuration to the default.
*/
public static function reset()
{
noteStyle = NoteStyleRegistry.instance.fetchDefault();
isPixel = 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'));