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

Load gameplay immediately on entering the skin editor while at the main menu #25568

Merged
merged 5 commits into from
Nov 27, 2023

Conversation

peppy
Copy link
Member

@peppy peppy commented Nov 24, 2023

This will also loop gameplay so it doesn't rudely exit to the results screen while you are editing a skin.

CleanShot.2023-11-24.at.08.48.19.mp4

@bdach bdach added the next release Pull requests which are almost there. We'll aim to get them in the next release, but no guarantees! label Nov 27, 2023
@@ -222,5 +282,25 @@ private void globallyReenableBeatmapSkinSetting()
leasedBeatmapSkins?.Return();
leasedBeatmapSkins = null;
}

private partial class EndlessPlayer : ReplayPlayer
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The one issue I have with this, if anything, is that doing things this way creates a weird UX wherein opening the skin editor while a replay is running will cause the replay to terminate, while going to an autoplay replay via the scene library explicitly will result in the gameplay looping.

But for now the upsides of having anything at all probably beat the downside of said weirdness, and all of this is mostly nicely localised (and I'm not sure that would have been possible if one wanted to fix the aforementioned issue), so I'm looking away for now.

Comment on lines +142 to +148
// If we're playing the intro, switch away to another beatmap.
if (beatmap.Value.BeatmapSetInfo.Protected)
{
music.NextTrack();
Schedule(PresentGameplay);
return;
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the local user has no beatmaps imported, this will mean that they cannot enter the gameplay skinning scene at all. However, what would happen previously is that they would open the triangles "beatmap", which has 1 object in it, so the gameplay scene would terminate after like 5 seconds, so I'm looking away for now.

As discussed IRL the way forward is probably to provide an actual beatmap in the game files but for now that is out of scope.

@bdach bdach enabled auto-merge November 27, 2023 03:23
@bdach bdach merged commit 1bd5d33 into ppy:master Nov 27, 2023
9 of 10 checks passed
@peppy peppy deleted the skin-editor-load-gameplay branch November 28, 2023 09:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area:skin-editor next release Pull requests which are almost there. We'll aim to get them in the next release, but no guarantees! size/L
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants