diff --git a/osu.Android.props b/osu.Android.props
index 6744590f0d..2c5e54d4f5 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -63,6 +63,6 @@
-
+
diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 975b7f9f5a..761f52f961 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
@@ -38,9 +38,9 @@ namespace osu.Desktop
if (Host is DesktopGameHost desktopHost)
return new StableStorage(desktopHost);
}
- catch (Exception e)
+ catch (Exception)
{
- Logger.Error(e, "Error while searching for stable install");
+ Logger.Log("Could not find a stable install", LoggingTarget.Runtime, LogLevel.Important);
}
return null;
@@ -52,11 +52,7 @@ namespace osu.Desktop
if (!noVersionOverlay)
{
- LoadComponentAsync(versionManager = new VersionManager { Depth = int.MinValue }, v =>
- {
- Add(v);
- v.Show();
- });
+ LoadComponentAsync(versionManager = new VersionManager { Depth = int.MinValue }, Add);
if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows)
Add(new SquirrelUpdateManager());
@@ -71,7 +67,7 @@ namespace osu.Desktop
switch (newScreen)
{
- case Intro _:
+ case IntroScreen _:
case MainMenu _:
versionManager?.Show();
break;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBody.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBody.cs
index 6bc19ee3b5..24a437c20e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBody.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
protected Path Path => path;
- public float PathRadius
+ public virtual float PathRadius
{
get => path.PathRadius;
set => path.PathRadius = value;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SnakingSliderBody.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SnakingSliderBody.cs
index a3d3893c8b..0590ca1d96 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SnakingSliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SnakingSliderBody.cs
@@ -24,6 +24,20 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
public double? SnakedStart { get; private set; }
public double? SnakedEnd { get; private set; }
+ public override float PathRadius
+ {
+ get => base.PathRadius;
+ set
+ {
+ if (base.PathRadius == value)
+ return;
+
+ base.PathRadius = value;
+
+ Refresh();
+ }
+ }
+
public override Vector2 PathOffset => snakedPathOffset;
///
diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimContainer.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimContainer.cs
index dc4ceed59e..f114559114 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimContainer.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimContainer.cs
@@ -17,7 +17,6 @@ using osu.Framework.Platform;
using osu.Framework.Screens;
using osu.Game.Beatmaps;
using osu.Game.Configuration;
-using osu.Game.Database;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
@@ -51,26 +50,14 @@ namespace osu.Game.Tests.Visual.Background
private DummySongSelect songSelect;
private TestPlayerLoader playerLoader;
private TestPlayer player;
- private DatabaseContextFactory factory;
private BeatmapManager manager;
private RulesetStore rulesets;
[BackgroundDependencyLoader]
private void load(GameHost host, AudioManager audio)
{
- factory = new DatabaseContextFactory(LocalStorage);
- factory.ResetDatabase();
-
- using (var usage = factory.Get())
- usage.Migrate();
-
- factory.ResetDatabase();
-
- using (var usage = factory.Get())
- usage.Migrate();
-
- Dependencies.Cache(rulesets = new RulesetStore(factory));
- Dependencies.Cache(manager = new BeatmapManager(LocalStorage, factory, rulesets, null, audio, host, Beatmap.Default));
+ Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
+ Dependencies.Cache(manager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
Dependencies.Cache(new OsuConfigManager(LocalStorage));
manager.Import(TestResources.GetTestBeatmapForImport()).Wait();
diff --git a/osu.Game.Tests/Visual/Menus/IntroTestScene.cs b/osu.Game.Tests/Visual/Menus/IntroTestScene.cs
new file mode 100644
index 0000000000..d03d341ee4
--- /dev/null
+++ b/osu.Game.Tests/Visual/Menus/IntroTestScene.cs
@@ -0,0 +1,69 @@
+// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Screens;
+using osu.Game.Screens;
+using osu.Game.Screens.Menu;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.Menus
+{
+ [TestFixture]
+ public abstract class IntroTestScene : OsuTestScene
+ {
+ public override IReadOnlyList RequiredTypes => new[]
+ {
+ typeof(StartupScreen),
+ typeof(IntroScreen),
+ typeof(OsuScreen),
+ typeof(IntroTestScene),
+ };
+
+ [Cached]
+ private OsuLogo logo;
+
+ protected IntroTestScene()
+ {
+ Drawable introStack = null;
+
+ Children = new Drawable[]
+ {
+ new Box
+ {
+ RelativeSizeAxes = Axes.Both,
+ Depth = float.MaxValue,
+ Colour = Color4.Black,
+ },
+ logo = new OsuLogo
+ {
+ Alpha = 0,
+ RelativePositionAxes = Axes.Both,
+ Depth = float.MinValue,
+ Position = new Vector2(0.5f),
+ }
+ };
+
+ AddStep("restart sequence", () =>
+ {
+ logo.FinishTransforms();
+ logo.IsTracking = false;
+
+ introStack?.Expire();
+
+ Add(introStack = new OsuScreenStack(CreateScreen())
+ {
+ RelativeSizeAxes = Axes.Both,
+ });
+ });
+ }
+
+ protected abstract IScreen CreateScreen();
+ }
+}
diff --git a/osu.Game.Tests/Visual/Menus/TestSceneIntroCircles.cs b/osu.Game.Tests/Visual/Menus/TestSceneIntroCircles.cs
new file mode 100644
index 0000000000..107734cc8d
--- /dev/null
+++ b/osu.Game.Tests/Visual/Menus/TestSceneIntroCircles.cs
@@ -0,0 +1,15 @@
+// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Framework.Screens;
+using osu.Game.Screens.Menu;
+
+namespace osu.Game.Tests.Visual.Menus
+{
+ [TestFixture]
+ public class TestSceneIntroCircles : IntroTestScene
+ {
+ protected override IScreen CreateScreen() => new IntroCircles();
+ }
+}
diff --git a/osu.Game.Tests/Visual/Menus/TestSceneIntroSequence.cs b/osu.Game.Tests/Visual/Menus/TestSceneIntroSequence.cs
deleted file mode 100644
index b59fb18428..0000000000
--- a/osu.Game.Tests/Visual/Menus/TestSceneIntroSequence.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using System.Collections.Generic;
-using NUnit.Framework;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Timing;
-using osu.Game.Screens.Menu;
-using osuTK.Graphics;
-
-namespace osu.Game.Tests.Visual.Menus
-{
- [TestFixture]
- public class TestSceneIntroSequence : OsuTestScene
- {
- public override IReadOnlyList RequiredTypes => new[]
- {
- typeof(OsuLogo),
- };
-
- public TestSceneIntroSequence()
- {
- OsuLogo logo;
-
- var rateAdjustClock = new StopwatchClock(true);
- var framedClock = new FramedClock(rateAdjustClock);
- framedClock.ProcessFrame();
-
- Add(new Container
- {
- RelativeSizeAxes = Axes.Both,
- Clock = framedClock,
- Children = new Drawable[]
- {
- new Box
- {
- RelativeSizeAxes = Axes.Both,
- Colour = Color4.Black,
- },
- logo = new OsuLogo
- {
- Anchor = Anchor.Centre,
- }
- }
- });
-
- AddStep(@"Restart", logo.PlayIntro);
- AddSliderStep("Playback speed", 0.0, 2.0, 1, v => rateAdjustClock.Rate = v);
- }
- }
-}
diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index f3255814f2..680250a226 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -15,7 +15,6 @@ using osu.Framework.MathUtils;
using osu.Framework.Platform;
using osu.Framework.Screens;
using osu.Game.Beatmaps;
-using osu.Game.Database;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Osu;
@@ -35,7 +34,6 @@ namespace osu.Game.Tests.Visual.SongSelect
private RulesetStore rulesets;
private WorkingBeatmap defaultBeatmap;
- private DatabaseContextFactory factory;
public override IReadOnlyList RequiredTypes => new[]
{
@@ -74,28 +72,11 @@ namespace osu.Game.Tests.Visual.SongSelect
private TestSongSelect songSelect;
- protected override void Dispose(bool isDisposing)
- {
- factory.ResetDatabase();
- base.Dispose(isDisposing);
- }
-
[BackgroundDependencyLoader]
private void load(GameHost host, AudioManager audio)
{
- factory = new DatabaseContextFactory(LocalStorage);
- factory.ResetDatabase();
-
- using (var usage = factory.Get())
- usage.Migrate();
-
- factory.ResetDatabase();
-
- using (var usage = factory.Get())
- usage.Migrate();
-
- Dependencies.Cache(rulesets = new RulesetStore(factory));
- Dependencies.Cache(manager = new BeatmapManager(LocalStorage, factory, rulesets, null, audio, host, defaultBeatmap = Beatmap.Default));
+ Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
+ Dependencies.Cache(manager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, defaultBeatmap = Beatmap.Default));
Beatmap.SetDefault();
}
diff --git a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentMatch.cs b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentMatch.cs
index f329623703..e65b708fea 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentMatch.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentMatch.cs
@@ -5,14 +5,13 @@ using System;
using System.Collections.Generic;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
-using osu.Game.Tests.Visual;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Models;
using osu.Game.Tournament.Screens.Ladder.Components;
namespace osu.Game.Tournament.Tests.Components
{
- public class TestSceneDrawableTournamentMatch : OsuTestScene
+ public class TestSceneDrawableTournamentMatch : TournamentTestScene
{
public override IReadOnlyList RequiredTypes => new[]
{
diff --git a/osu.Game.Tournament.Tests/LadderTestScene.cs b/osu.Game.Tournament.Tests/LadderTestScene.cs
index b49341d0d1..dae0721023 100644
--- a/osu.Game.Tournament.Tests/LadderTestScene.cs
+++ b/osu.Game.Tournament.Tests/LadderTestScene.cs
@@ -1,13 +1,14 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
+using NUnit.Framework;
using osu.Framework.Allocation;
-using osu.Game.Tests.Visual;
using osu.Game.Tournament.Models;
namespace osu.Game.Tournament.Tests
{
- public abstract class LadderTestScene : OsuTestScene
+ [TestFixture]
+ public abstract class LadderTestScene : TournamentTestScene
{
[Resolved]
protected LadderInfo Ladder { get; private set; }
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
index 201736f38a..9de00818a5 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
@@ -2,13 +2,12 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
-using osu.Game.Tests.Visual;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Screens.Gameplay;
namespace osu.Game.Tournament.Tests.Screens
{
- public class TestSceneGameplayScreen : OsuTestScene
+ public class TestSceneGameplayScreen : TournamentTestScene
{
[Cached]
private TournamentMatchChatDisplay chat = new TournamentMatchChatDisplay();
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
index f3e65919eb..2277302e98 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
@@ -2,12 +2,11 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
-using osu.Game.Tests.Visual;
using osu.Game.Tournament.Screens.Schedule;
namespace osu.Game.Tournament.Tests.Screens
{
- public class TestSceneScheduleScreen : OsuTestScene
+ public class TestSceneScheduleScreen : TournamentTestScene
{
[BackgroundDependencyLoader]
private void load()
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneShowcaseScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneShowcaseScreen.cs
index edf1477b06..8c43e25416 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneShowcaseScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneShowcaseScreen.cs
@@ -2,12 +2,11 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
-using osu.Game.Tests.Visual;
using osu.Game.Tournament.Screens.Showcase;
namespace osu.Game.Tournament.Tests.Screens
{
- public class TestSceneShowcaseScreen : OsuTestScene
+ public class TestSceneShowcaseScreen : TournamentTestScene
{
[BackgroundDependencyLoader]
private void load()
diff --git a/osu.Game.Tournament.Tests/TestSceneTournamentSceneManager.cs b/osu.Game.Tournament.Tests/TestSceneTournamentSceneManager.cs
index 378614343a..4d134ce4af 100644
--- a/osu.Game.Tournament.Tests/TestSceneTournamentSceneManager.cs
+++ b/osu.Game.Tournament.Tests/TestSceneTournamentSceneManager.cs
@@ -3,11 +3,10 @@
using osu.Framework.Allocation;
using osu.Framework.Platform;
-using osu.Game.Tests.Visual;
namespace osu.Game.Tournament.Tests
{
- public class TestSceneTournamentSceneManager : OsuTestScene
+ public class TestSceneTournamentSceneManager : TournamentTestScene
{
[BackgroundDependencyLoader]
private void load(Storage storage)
diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
new file mode 100644
index 0000000000..18ac3230da
--- /dev/null
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -0,0 +1,28 @@
+// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Testing;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tournament.Tests
+{
+ public abstract class TournamentTestScene : OsuTestScene
+ {
+ protected override ITestSceneTestRunner CreateRunner() => new TournamentTestSceneTestRunner();
+
+ public class TournamentTestSceneTestRunner : TournamentGameBase, ITestSceneTestRunner
+ {
+ private TestSceneTestRunner.TestRunner runner;
+
+ protected override void LoadAsyncComplete()
+ {
+ // this has to be run here rather than LoadComplete because
+ // TestScene.cs is checking the IsLoaded state (on another thread) and expects
+ // the runner to be loaded at that point.
+ Add(runner = new TestSceneTestRunner.TestRunner());
+ }
+
+ public void RunTestBlocking(TestScene test) => runner.RunTestBlocking(test);
+ }
+ }
+}
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 06fb52da77..dbfa70704b 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -9,15 +9,20 @@ using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
using osu.Framework.Input;
using osu.Framework.IO.Stores;
using osu.Framework.Platform;
using osu.Game.Beatmaps;
+using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API.Requests;
using osu.Game.Tournament.IPC;
using osu.Game.Tournament.Models;
+using osuTK.Graphics;
using osuTK.Input;
namespace osu.Game.Tournament
@@ -35,6 +40,8 @@ namespace osu.Game.Tournament
private Bindable windowSize;
private FileBasedIPC ipc;
+ private Drawable heightWarning;
+
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
{
return dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
@@ -53,6 +60,12 @@ namespace osu.Game.Tournament
this.storage = storage;
windowSize = frameworkConfig.GetBindable(FrameworkSetting.WindowedSize);
+ windowSize.BindValueChanged(size => ScheduleAfterChildren(() =>
+ {
+ var minWidth = (int)(size.NewValue.Height / 9f * 16 + 400);
+
+ heightWarning.Alpha = size.NewValue.Width < minWidth ? 1 : 0;
+ }), true);
readBracket();
@@ -61,16 +74,43 @@ namespace osu.Game.Tournament
dependencies.CacheAs(ipc = new FileBasedIPC());
Add(ipc);
- Add(new OsuButton
+ AddRange(new[]
{
- Text = "Save Changes",
- Width = 140,
- Height = 50,
- Depth = float.MinValue,
- Anchor = Anchor.BottomRight,
- Origin = Anchor.BottomRight,
- Padding = new MarginPadding(10),
- Action = SaveChanges,
+ new OsuButton
+ {
+ Text = "Save Changes",
+ Width = 140,
+ Height = 50,
+ Depth = float.MinValue,
+ Anchor = Anchor.BottomRight,
+ Origin = Anchor.BottomRight,
+ Padding = new MarginPadding(10),
+ Action = SaveChanges,
+ },
+ heightWarning = new Container
+ {
+ Masking = true,
+ CornerRadius = 5,
+ Depth = float.MinValue,
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ AutoSizeAxes = Axes.Both,
+ Children = new Drawable[]
+ {
+ new Box
+ {
+ Colour = Color4.Red,
+ RelativeSizeAxes = Axes.Both,
+ },
+ new SpriteText
+ {
+ Text = "Please make the window wider",
+ Font = OsuFont.Default.With(weight: "bold"),
+ Colour = Color4.White,
+ Padding = new MarginPadding(20)
+ }
+ }
+ },
});
}
@@ -195,18 +235,6 @@ namespace osu.Game.Tournament
base.LoadComplete();
}
- protected override void Update()
- {
- base.Update();
- var minWidth = (int)(windowSize.Value.Height / 9f * 16 + 400);
-
- if (windowSize.Value.Width < minWidth)
- {
- // todo: can be removed after ppy/osu-framework#1975
- windowSize.Value = Host.Window.ClientSize = new Size(minWidth, windowSize.Value.Height);
- }
- }
-
protected virtual void SaveChanges()
{
foreach (var r in ladder.Rounds)
diff --git a/osu.Game/Graphics/Containers/OsuScrollContainer.cs b/osu.Game/Graphics/Containers/OsuScrollContainer.cs
index 53092ddc9e..8fc8dec9fd 100644
--- a/osu.Game/Graphics/Containers/OsuScrollContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuScrollContainer.cs
@@ -27,11 +27,12 @@ namespace osu.Game.Graphics.Containers
private bool shouldPerformRightMouseScroll(MouseButtonEvent e) => RightMouseScrollbar && e.Button == MouseButton.Right;
- private void scrollToRelative(float value) => ScrollTo(Clamp((value - Scrollbar.DrawSize[ScrollDim] / 2) / Scrollbar.Size[ScrollDim]), true, DistanceDecayOnRightMouseScrollbar);
+ private void scrollFromMouseEvent(MouseEvent e) =>
+ ScrollTo(Clamp(ToLocalSpace(e.ScreenSpaceMousePosition)[ScrollDim] / DrawSize[ScrollDim]) * Content.DrawSize[ScrollDim], true, DistanceDecayOnRightMouseScrollbar);
- private bool mouseScrollBarDragging;
+ private bool rightMouseDragging;
- protected override bool IsDragging => base.IsDragging || mouseScrollBarDragging;
+ protected override bool IsDragging => base.IsDragging || rightMouseDragging;
public OsuScrollContainer(Direction scrollDirection = Direction.Vertical)
: base(scrollDirection)
@@ -42,7 +43,7 @@ namespace osu.Game.Graphics.Containers
{
if (shouldPerformRightMouseScroll(e))
{
- scrollToRelative(e.MousePosition[ScrollDim]);
+ scrollFromMouseEvent(e);
return true;
}
@@ -51,9 +52,9 @@ namespace osu.Game.Graphics.Containers
protected override bool OnDrag(DragEvent e)
{
- if (mouseScrollBarDragging)
+ if (rightMouseDragging)
{
- scrollToRelative(e.MousePosition[ScrollDim]);
+ scrollFromMouseEvent(e);
return true;
}
@@ -64,7 +65,7 @@ namespace osu.Game.Graphics.Containers
{
if (shouldPerformRightMouseScroll(e))
{
- mouseScrollBarDragging = true;
+ rightMouseDragging = true;
return true;
}
@@ -73,9 +74,9 @@ namespace osu.Game.Graphics.Containers
protected override bool OnDragEnd(DragEndEvent e)
{
- if (mouseScrollBarDragging)
+ if (rightMouseDragging)
{
- mouseScrollBarDragging = false;
+ rightMouseDragging = false;
return true;
}
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index ceaf0c3d5e..e71dd67bf2 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -87,7 +87,8 @@ namespace osu.Game
private BackButton backButton;
private MainMenu menuScreen;
- private Intro introScreen;
+
+ private IntroScreen introScreen;
private Bindable configRuleset;
@@ -264,7 +265,16 @@ namespace osu.Game
{
// The given ScoreInfo may have missing properties if it was retrieved from online data. Re-retrieve it from the database
// to ensure all the required data for presenting a replay are present.
- var databasedScoreInfo = ScoreManager.Query(s => s.OnlineScoreID == score.OnlineScoreID);
+ var databasedScoreInfo = score.OnlineScoreID != null
+ ? ScoreManager.Query(s => s.OnlineScoreID == score.OnlineScoreID)
+ : ScoreManager.Query(s => s.Hash == score.Hash);
+
+ if (databasedScoreInfo == null)
+ {
+ Logger.Log("The requested score could not be found locally.", LoggingTarget.Information);
+ return;
+ }
+
var databasedScore = ScoreManager.GetScore(databasedScoreInfo);
if (databasedScore.Replay == null)
@@ -761,7 +771,7 @@ namespace osu.Game
if (introScreen == null)
return true;
- if (!introScreen.DidLoadMenu || !(screenStack.CurrentScreen is Intro))
+ if (!introScreen.DidLoadMenu || !(screenStack.CurrentScreen is IntroScreen))
{
Scheduler.Add(introScreen.MakeCurrent);
return true;
@@ -796,7 +806,7 @@ namespace osu.Game
{
switch (newScreen)
{
- case Intro intro:
+ case IntroScreen intro:
introScreen = intro;
break;
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreParser.cs b/osu.Game/Scoring/Legacy/LegacyScoreParser.cs
index 0fdbd56c92..2e4b4b3a9a 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreParser.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreParser.cs
@@ -80,6 +80,9 @@ namespace osu.Game.Scoring.Legacy
else if (version >= 20121008)
scoreInfo.OnlineScoreID = sr.ReadInt32();
+ if (scoreInfo.OnlineScoreID <= 0)
+ scoreInfo.OnlineScoreID = null;
+
if (compressedReplay?.Length > 0)
{
using (var replayInStream = new MemoryStream(compressedReplay))
diff --git a/osu.Game/Screens/Loader.cs b/osu.Game/Screens/Loader.cs
index 8add730c4e..de00ba2e9f 100644
--- a/osu.Game/Screens/Loader.cs
+++ b/osu.Game/Screens/Loader.cs
@@ -45,7 +45,15 @@ namespace osu.Game.Screens
private OsuScreen loadableScreen;
private ShaderPrecompiler precompiler;
- protected virtual OsuScreen CreateLoadableScreen() => showDisclaimer ? (OsuScreen)new Disclaimer() : new Intro();
+ protected virtual OsuScreen CreateLoadableScreen()
+ {
+ if (showDisclaimer)
+ return new Disclaimer(getIntroSequence());
+
+ return getIntroSequence();
+ }
+
+ private IntroScreen getIntroSequence() => new IntroCircles();
protected virtual ShaderPrecompiler CreateShaderPrecompiler() => new ShaderPrecompiler();
diff --git a/osu.Game/Screens/Menu/Disclaimer.cs b/osu.Game/Screens/Menu/Disclaimer.cs
index 97231a1331..073ab639e3 100644
--- a/osu.Game/Screens/Menu/Disclaimer.cs
+++ b/osu.Game/Screens/Menu/Disclaimer.cs
@@ -21,7 +21,6 @@ namespace osu.Game.Screens.Menu
{
public class Disclaimer : StartupScreen
{
- private Intro intro;
private SpriteIcon icon;
private Color4 iconColour;
private LinkFlowContainer textFlow;
@@ -32,10 +31,13 @@ namespace osu.Game.Screens.Menu
private const float icon_y = -85;
private const float icon_size = 30;
+ private readonly OsuScreen nextScreen;
+
private readonly Bindable currentUser = new Bindable();
- public Disclaimer()
+ public Disclaimer(OsuScreen nextScreen = null)
{
+ this.nextScreen = nextScreen;
ValidForResume = false;
}
@@ -146,7 +148,8 @@ namespace osu.Game.Screens.Menu
protected override void LoadComplete()
{
base.LoadComplete();
- LoadComponentAsync(intro = new Intro());
+ if (nextScreen != null)
+ LoadComponentAsync(nextScreen);
}
public override void OnEntering(IScreen last)
@@ -170,7 +173,7 @@ namespace osu.Game.Screens.Menu
.Then(5500)
.FadeOut(250)
.ScaleTo(0.9f, 250, Easing.InQuint)
- .Finally(d => this.Push(intro));
+ .Finally(d => this.Push(nextScreen));
}
}
}
diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/IntroCircles.cs
similarity index 51%
rename from osu.Game/Screens/Menu/Intro.cs
rename to osu.Game/Screens/Menu/IntroCircles.cs
index f6fbcf6498..4fa1a81123 100644
--- a/osu.Game/Screens/Menu/Intro.cs
+++ b/osu.Game/Screens/Menu/IntroCircles.cs
@@ -2,7 +2,6 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
-using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
using osu.Framework.Audio.Track;
using osu.Framework.Bindables;
@@ -12,41 +11,24 @@ using osu.Framework.MathUtils;
using osu.Game.Beatmaps;
using osu.Game.Configuration;
using osu.Game.IO.Archives;
-using osu.Game.Screens.Backgrounds;
-using osuTK;
-using osuTK.Graphics;
namespace osu.Game.Screens.Menu
{
- public class Intro : StartupScreen
+ public class IntroCircles : IntroScreen
{
private const string menu_music_beatmap_hash = "3c8b1fcc9434dbb29e2fb613d3b9eada9d7bb6c125ceb32396c3b53437280c83";
- ///
- /// Whether we have loaded the menu previously.
- ///
- public bool DidLoadMenu;
-
- private MainMenu mainMenu;
private SampleChannel welcome;
- private SampleChannel seeya;
- protected override BackgroundScreen CreateBackground() => new BackgroundScreenBlack();
-
- private readonly BindableDouble exitingVolumeFade = new BindableDouble(1);
-
- [Resolved]
- private AudioManager audio { get; set; }
-
- private Bindable menuVoice;
private Bindable menuMusic;
+
private Track track;
+
private WorkingBeatmap introBeatmap;
[BackgroundDependencyLoader]
- private void load(OsuConfigManager config, BeatmapManager beatmaps, Framework.Game game)
+ private void load(OsuConfigManager config, BeatmapManager beatmaps, Framework.Game game, ISampleStore samples)
{
- menuVoice = config.GetBindable(OsuSetting.MenuVoice);
menuMusic = config.GetBindable(OsuSetting.MenuMusic);
BeatmapSetInfo setInfo = null;
@@ -75,15 +57,13 @@ namespace osu.Game.Screens.Menu
introBeatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
track = introBeatmap.Track;
- welcome = audio.Samples.Get(@"welcome");
- seeya = audio.Samples.Get(@"seeya");
+ if (config.Get(OsuSetting.MenuVoice))
+ welcome = samples.Get(@"welcome");
}
private const double delay_step_one = 2300;
private const double delay_step_two = 600;
- public const int EXIT_DELAY = 3000;
-
protected override void LogoArriving(OsuLogo logo, bool resuming)
{
base.LogoArriving(logo, resuming);
@@ -93,86 +73,34 @@ namespace osu.Game.Screens.Menu
Beatmap.Value = introBeatmap;
introBeatmap = null;
- if (menuVoice.Value)
- welcome.Play();
+ welcome?.Play();
Scheduler.AddDelayed(delegate
{
// Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Manu.
if (menuMusic.Value)
{
- track.Start();
+ track.Restart();
track = null;
}
- LoadComponentAsync(mainMenu = new MainMenu());
+ PrepareMenuLoad();
- Scheduler.AddDelayed(delegate
- {
- DidLoadMenu = true;
- this.Push(mainMenu);
- }, delay_step_one);
+ Scheduler.AddDelayed(LoadMenu, delay_step_one);
}, delay_step_two);
- }
- logo.Colour = Color4.White;
- logo.Ripple = false;
-
- const int quick_appear = 350;
-
- int initialMovementTime = logo.Alpha > 0.2f ? quick_appear : 0;
-
- logo.MoveTo(new Vector2(0.5f), initialMovementTime, Easing.OutQuint);
-
- if (!resuming)
- {
logo.ScaleTo(1);
logo.FadeIn();
logo.PlayIntro();
}
- else
- {
- logo.Triangles = false;
-
- logo
- .ScaleTo(1, initialMovementTime, Easing.OutQuint)
- .FadeIn(quick_appear, Easing.OutQuint)
- .Then()
- .RotateTo(20, EXIT_DELAY * 1.5f)
- .FadeOut(EXIT_DELAY);
- }
}
public override void OnSuspending(IScreen next)
{
+ track = null;
+
this.FadeOut(300);
base.OnSuspending(next);
}
-
- public override bool OnExiting(IScreen next)
- {
- //cancel exiting if we haven't loaded the menu yet.
- return !DidLoadMenu;
- }
-
- public override void OnResuming(IScreen last)
- {
- this.FadeIn(300);
-
- double fadeOutTime = EXIT_DELAY;
- //we also handle the exit transition.
- if (menuVoice.Value)
- seeya.Play();
- else
- fadeOutTime = 500;
-
- audio.AddAdjustment(AdjustableProperty.Volume, exitingVolumeFade);
- this.TransformBindableTo(exitingVolumeFade, 0, fadeOutTime).OnComplete(_ => this.Exit());
-
- //don't want to fade out completely else we will stop running updates.
- Game.FadeTo(0.01f, fadeOutTime);
-
- base.OnResuming(last);
- }
}
}
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
new file mode 100644
index 0000000000..27f3c9a45b
--- /dev/null
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -0,0 +1,114 @@
+// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Screens;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Screens.Backgrounds;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Menu
+{
+ public abstract class IntroScreen : StartupScreen
+ {
+ private readonly BindableDouble exitingVolumeFade = new BindableDouble(1);
+
+ public const int EXIT_DELAY = 3000;
+
+ [Resolved]
+ private AudioManager audio { get; set; }
+
+ private SampleChannel seeya;
+
+ private Bindable menuVoice;
+
+ protected override BackgroundScreen CreateBackground() => new BackgroundScreenBlack();
+
+ [BackgroundDependencyLoader]
+ private void load(OsuConfigManager config, BeatmapManager beatmaps, Framework.Game game)
+ {
+ menuVoice = config.GetBindable(OsuSetting.MenuVoice);
+ seeya = audio.Samples.Get(@"seeya");
+ }
+
+ ///
+ /// Whether we have loaded the menu previously.
+ ///
+ public bool DidLoadMenu { get; private set; }
+
+ public override bool OnExiting(IScreen next)
+ {
+ //cancel exiting if we haven't loaded the menu yet.
+ return !DidLoadMenu;
+ }
+
+ public override void OnResuming(IScreen last)
+ {
+ this.FadeIn(300);
+
+ double fadeOutTime = EXIT_DELAY;
+ //we also handle the exit transition.
+ if (menuVoice.Value)
+ seeya.Play();
+ else
+ fadeOutTime = 500;
+
+ audio.AddAdjustment(AdjustableProperty.Volume, exitingVolumeFade);
+ this.TransformBindableTo(exitingVolumeFade, 0, fadeOutTime).OnComplete(_ => this.Exit());
+
+ //don't want to fade out completely else we will stop running updates.
+ Game.FadeTo(0.01f, fadeOutTime);
+
+ base.OnResuming(last);
+ }
+
+ protected override void LogoArriving(OsuLogo logo, bool resuming)
+ {
+ base.LogoArriving(logo, resuming);
+
+ logo.Colour = Color4.White;
+ logo.Triangles = false;
+ logo.Ripple = false;
+
+ if (!resuming)
+ {
+ logo.MoveTo(new Vector2(0.5f));
+ logo.ScaleTo(Vector2.One);
+ logo.Hide();
+ }
+ else
+ {
+ const int quick_appear = 350;
+ int initialMovementTime = logo.Alpha > 0.2f ? quick_appear : 0;
+
+ logo.MoveTo(new Vector2(0.5f), initialMovementTime, Easing.OutQuint);
+
+ logo
+ .ScaleTo(1, initialMovementTime, Easing.OutQuint)
+ .FadeIn(quick_appear, Easing.OutQuint)
+ .Then()
+ .RotateTo(20, EXIT_DELAY * 1.5f)
+ .FadeOut(EXIT_DELAY);
+ }
+ }
+
+ private MainMenu mainMenu;
+
+ protected void PrepareMenuLoad()
+ {
+ LoadComponentAsync(mainMenu = new MainMenu());
+ }
+
+ protected void LoadMenu()
+ {
+ DidLoadMenu = true;
+ this.Push(mainMenu);
+ }
+ }
+}
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 5999cbdfb5..fc8ddd8bd4 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Screens.Menu
var track = Beatmap.Value.Track;
var metadata = Beatmap.Value.Metadata;
- if (last is Intro && track != null)
+ if (last is IntroScreen && track != null)
{
if (!track.IsRunning)
{
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 9b3c15aa91..27d72f3950 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -15,6 +15,7 @@ using osu.Framework.Platform;
using osu.Framework.Testing;
using osu.Framework.Timing;
using osu.Game.Beatmaps;
+using osu.Game.Database;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Mods;
using osu.Game.Tests.Beatmaps;
@@ -43,6 +44,9 @@ namespace osu.Game.Tests.Visual
private readonly Lazy localStorage;
protected Storage LocalStorage => localStorage.Value;
+ private readonly Lazy contextFactory;
+ protected DatabaseContextFactory ContextFactory => contextFactory.Value;
+
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
{
// This is the earliest we can get OsuGameBase, which is used by the dummy working beatmap to find textures
@@ -59,6 +63,14 @@ namespace osu.Game.Tests.Visual
protected OsuTestScene()
{
localStorage = new Lazy(() => new NativeStorage($"{GetType().Name}-{Guid.NewGuid()}"));
+ contextFactory = new Lazy(() =>
+ {
+ var factory = new DatabaseContextFactory(LocalStorage);
+ factory.ResetDatabase();
+ using (var usage = factory.Get())
+ usage.Migrate();
+ return factory;
+ });
}
[Resolved]
@@ -85,6 +97,9 @@ namespace osu.Game.Tests.Visual
if (beatmap?.Value.TrackLoaded == true)
beatmap.Value.Track.Stop();
+ if (contextFactory.IsValueCreated)
+ contextFactory.Value.ResetDatabase();
+
if (localStorage.IsValueCreated)
{
try
diff --git a/osu.Game/Utils/RavenLogger.cs b/osu.Game/Utils/RavenLogger.cs
index 7f4faa60ae..16178e63bd 100644
--- a/osu.Game/Utils/RavenLogger.cs
+++ b/osu.Game/Utils/RavenLogger.cs
@@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.IO;
+using System.Net;
using System.Threading.Tasks;
using osu.Framework.Logging;
using SharpRaven;
@@ -36,31 +37,50 @@ namespace osu.Game.Utils
if (exception != null)
{
- if (exception is IOException ioe)
- {
- // disk full exceptions, see https://stackoverflow.com/a/9294382
- const int hr_error_handle_disk_full = unchecked((int)0x80070027);
- const int hr_error_disk_full = unchecked((int)0x80070070);
-
- if (ioe.HResult == hr_error_handle_disk_full || ioe.HResult == hr_error_disk_full)
- return;
- }
+ if (!shouldSubmitException(exception))
+ return;
// since we let unhandled exceptions go ignored at times, we want to ensure they don't get submitted on subsequent reports.
if (lastException != null &&
lastException.Message == exception.Message && exception.StackTrace.StartsWith(lastException.StackTrace))
- {
return;
- }
lastException = exception;
- queuePendingTask(raven.CaptureAsync(new SentryEvent(exception)));
+ queuePendingTask(raven.CaptureAsync(new SentryEvent(exception) { Message = entry.Message }));
}
else
raven.AddTrail(new Breadcrumb(entry.Target.ToString(), BreadcrumbType.Navigation) { Message = entry.Message });
};
}
+ private bool shouldSubmitException(Exception exception)
+ {
+ switch (exception)
+ {
+ case IOException ioe:
+ // disk full exceptions, see https://stackoverflow.com/a/9294382
+ const int hr_error_handle_disk_full = unchecked((int)0x80070027);
+ const int hr_error_disk_full = unchecked((int)0x80070070);
+
+ if (ioe.HResult == hr_error_handle_disk_full || ioe.HResult == hr_error_disk_full)
+ return false;
+
+ break;
+
+ case WebException we:
+ switch (we.Status)
+ {
+ // more statuses may need to be blocked as we come across them.
+ case WebExceptionStatus.Timeout:
+ return false;
+ }
+
+ break;
+ }
+
+ return true;
+ }
+
private void queuePendingTask(Task task)
{
lock (tasks) tasks.Add(task);
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 0b2baa982b..472f6e9d65 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/osu.iOS.props b/osu.iOS.props
index 55d1afa645..0a19eac2b5 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -105,8 +105,8 @@
-
-
+
+