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

Merge branch 'master' into m1-migration-information

Browse Source
This commit is contained in:
Salman Ahmed
2022-03-29 13:03:36 +03:00
committed by GitHub
parent 0433d2fe6a 10c23e3506
commit cdc2ae7991
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Rulesets/Mods/ModCinema.cs
View File

@ -14,8 +14,6 @@ namespace osu.Game.Rulesets.Mods
{ {
public virtual void ApplyToDrawableRuleset(DrawableRuleset<T> drawableRuleset) public virtual void ApplyToDrawableRuleset(DrawableRuleset<T> drawableRuleset)
{ {
drawableRuleset.SetReplayScore(CreateReplayScore(drawableRuleset.Beatmap, drawableRuleset.Mods));
// AlwaysPresent required for hitsounds // AlwaysPresent required for hitsounds
drawableRuleset.AlwaysPresent = true; drawableRuleset.AlwaysPresent = true;
drawableRuleset.Hide(); drawableRuleset.Hide();

5
osu.Game/Skinning/Editor/SkinEditor.cs
View File

@ -42,6 +42,9 @@ namespace osu.Game.Skinning.Editor
[Resolved] [Resolved]
private OsuColour colours { get; set; } private OsuColour colours { get; set; }
[Resolved(canBeNull: true)]
private SkinEditorOverlay skinEditorOverlay { get; set; }
[Cached] [Cached]
private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue); private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
@ -107,7 +110,7 @@ namespace osu.Game.Skinning.Editor
new EditorMenuItem("Save", MenuItemType.Standard, Save), new EditorMenuItem("Save", MenuItemType.Standard, Save),
new EditorMenuItem("Revert to default", MenuItemType.Destructive, revert), new EditorMenuItem("Revert to default", MenuItemType.Destructive, revert),
new EditorMenuItemSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Exit", MenuItemType.Standard, Hide), new EditorMenuItem("Exit", MenuItemType.Standard, () => skinEditorOverlay?.Hide()),
}, },
}, },
} }