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.

Sign up for GitHub

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

Fix to Character animation editor, plus a main menu music fix #3530

Merged
merged 2 commits into from
Oct 4, 2024
Merged

Fix to Character animation editor, plus a main menu music fix #3530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64658e5
fix: The dialog now shows up on the animation debugger view
EliteMasterEric Oct 2, 2024
2ef414b
fix: Main menu music doesn't cut out when switching states anymore.
EliteMasterEric Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions source/funkin/ui/debug/anim/DebugBoundingState.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,11 @@ class DebugBoundingState extends FlxState
offsetEditorDialog.cameras = [hudCam];

add(offsetEditorDialog);
offsetEditorDialog.showDialog(false);

// Anchor to the right side by default
// offsetEditorDialog.x = FlxG.width - offsetEditorDialog.width;
// Anchor to the left side by default
offsetEditorDialog.x = 16;
offsetEditorDialog.y = 16;

// sets the default camera back to FlxG.camera, since we set it to hudCamera for haxeui stuf
FlxG.cameras.setDefaultDrawTarget(FlxG.camera, true);
Expand Down
4 changes: 3 additions & 1 deletion source/funkin/ui/freeplay/FreeplayState.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1646,7 +1646,9 @@ class FreeplayState extends MusicBeatSubState
FunkinSound.playMusic('freakyMenu',
{
overrideExisting: true,
restartTrack: false
restartTrack: false,
// Continue playing this music between states, until a different music track gets played.
persist: true
});
FlxG.sound.music.fadeIn(4.0, 0.0, 1.0);
close();
Expand Down
4 changes: 3 additions & 1 deletion source/funkin/ui/mainmenu/MainMenuState.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,9 @@ class MainMenuState extends MusicBeatState
FunkinSound.playMusic('freakyMenu',
{
overrideExisting: true,
restartTrack: false
restartTrack: false,
// Continue playing this music between states, until a different music track gets played.
persist: true
});
}

Expand Down
4 changes: 3 additions & 1 deletion source/funkin/ui/story/StoryMenuState.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,9 @@ class StoryMenuState extends MusicBeatState
FunkinSound.playMusic('freakyMenu',
{
overrideExisting: true,
restartTrack: false
restartTrack: false,
// Continue playing this music between states, until a different music track gets played.
persist: true
});
}

Expand Down
1 change: 1 addition & 0 deletions source/funkin/ui/title/TitleState.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ class TitleState extends MusicBeatState
startingVolume: 0.0,
overrideExisting: true,
restartTrack: false,
// Continue playing this music between states, until a different music track gets played.
persist: true
});
// Fade from 0.0 to 1 over 4 seconds
Expand Down
Loading