sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 14:46:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into spectator-state-rework

Browse Source
This commit is contained in:
Dan Balasescu
2022-02-02 18:57:04 +09:00
parent f4210f7a30 db0f3b7f5e
commit 6d3bc005ea
57 changed files with 752 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Screens/Play/Player.cs
View File

@ -163,6 +163,7 @@ namespace osu.Game.Screens.Play
PrepareReplay();
ScoreProcessor.NewJudgement += result => ScoreProcessor.PopulateScore(Score.ScoreInfo);
ScoreProcessor.OnResetFromReplayFrame += () => ScoreProcessor.PopulateScore(Score.ScoreInfo);
gameActive.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
}
@ -243,7 +244,7 @@ namespace osu.Game.Screens.Play
{
// underlay and gameplay should have access to the skinning sources.
createUnderlayComponents(),
createGameplayComponents(Beatmap.Value, playableBeatmap)
createGameplayComponents(Beatmap.Value)
}
},
FailOverlay = new FailOverlay
@ -356,7 +357,7 @@ namespace osu.Game.Screens.Play
private Drawable createUnderlayComponents() =>
DimmableStoryboard = new DimmableStoryboard(Beatmap.Value.Storyboard) { RelativeSizeAxes = Axes.Both };
private Drawable createGameplayComponents(IWorkingBeatmap working, IBeatmap playableBeatmap) => new ScalingContainer(ScalingMode.Gameplay)
private Drawable createGameplayComponents(IWorkingBeatmap working) => new ScalingContainer(ScalingMode.Gameplay)
{
Children = new Drawable[]
{