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

Merge branch 'master' into fix-blocked-volume-overlay

Browse Source
This commit is contained in:
Dean Herbert
2019-04-04 17:28:46 +09:00
committed by GitHub
parent 1ba608f01f 35c4ee7452
commit 1709e22763
148 changed files with 833 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/OsuGame.cs
View File

@ -254,6 +254,12 @@ namespace osu.Game
if (menuScreen.IsCurrentScreen())
menuScreen.LoadToSolo();
// we might even already be at the song
if (Beatmap.Value.BeatmapSetInfo.Hash == databasedSet.Hash)
{
return;
}
// Use first beatmap available for current ruleset, else switch ruleset.
var first = databasedSet.Beatmaps.Find(b => b.Ruleset == ruleset.Value) ?? databasedSet.Beatmaps.First();
@ -579,7 +585,7 @@ namespace osu.Game
{
Schedule(() => notifications.Post(new SimpleNotification
{
Icon = entry.Level == LogLevel.Important ? FontAwesome.ExclamationCircle : FontAwesome.Bomb,
Icon = entry.Level == LogLevel.Important ? FontAwesome.Solid.ExclamationCircle : FontAwesome.Solid.Bomb,
Text = entry.Message + (entry.Exception != null && IsDeployedBuild ? "\n\nThis error has been automatically reported to the devs." : string.Empty),
}));
}
@ -587,7 +593,7 @@ namespace osu.Game
{
Schedule(() => notifications.Post(new SimpleNotification
{
Icon = FontAwesome.EllipsisH,
Icon = FontAwesome.Solid.EllipsisH,
Text = "Subsequent messages have been logged. Click to view log files.",
Activated = () =>
{