Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ENHANCEMENT] Custom Popups and Countdowns #3020

Merged
merged 9 commits into from
Sep 17, 2024
1 change: 1 addition & 0 deletions source/funkin/play/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -3046,6 +3046,7 @@ class PlayState extends MusicBeatSubState
GameOverSubState.reset();
PauseSubState.reset();
Countdown.reset();
PopUpStuff.reset();

// Clear the static reference to this state.
instance = null;
Expand Down
9 changes: 9 additions & 0 deletions source/funkin/play/components/PopUpStuff.hx
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,13 @@ class PopUpStuff extends FlxTypedGroup<FunkinSprite>
daLoop++;
}
}

/**
* Reset the popup configuration to the default.
*/
public static function reset()
{
noteStyle = NoteStyleRegistry.instance.fetchDefault();
isPixel = false;
}
}
1 change: 0 additions & 1 deletion source/funkin/ui/transition/LoadingState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,6 @@ class LoadingState extends MusicBeatSubState
FunkinSprite.cacheTexture(Paths.image('ui/popup/pixel/num7'));
FunkinSprite.cacheTexture(Paths.image('ui/popup/pixel/num8'));
FunkinSprite.cacheTexture(Paths.image('ui/popup/pixel/num9'));

FunkinSprite.cacheTexture(Paths.image('notes', 'shared'));
FunkinSprite.cacheTexture(Paths.image('noteSplashes', 'shared'));
FunkinSprite.cacheTexture(Paths.image('noteStrumline', 'shared'));
Expand Down