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 remote-tracking branch 'upstream/master' into user-status-wiring

Browse Source
This commit is contained in:
Lucas A
2019-05-07 18:27:14 +02:00
parent 3ecfa9dcdb 9f52b3b490
commit a5f758b977
224 changed files with 772 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Screens/Edit/Editor.cs
View File

@ -70,6 +70,7 @@ namespace osu.Game.Screens.Edit
EditorMenuBar menuBar;
var fileMenuItems = new List<MenuItem>();
if (RuntimeInfo.IsDesktop)
{
fileMenuItems.Add(new EditorMenuItem("Export", MenuItemType.Standard, exportBeatmap));
@ -173,6 +174,7 @@ namespace osu.Game.Screens.Edit
case Key.Left:
seek(e, -1);
return true;
case Key.Right:
seek(e, 1);
return true;
@ -218,6 +220,7 @@ namespace osu.Game.Screens.Edit
public override bool OnExiting(IScreen next)
{
Background.FadeColour(Color4.White, 500);
if (Beatmap.Value.Track != null)
{
Beatmap.Value.Track.Tempo.Value = 1;
@ -238,9 +241,11 @@ namespace osu.Game.Screens.Edit
case EditorScreenMode.Compose:
currentScreen = new ComposeScreen();
break;
case EditorScreenMode.Design:
currentScreen = new DesignScreen();
break;
default:
currentScreen = new EditorScreen();
break;