sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-01 10:57:27 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into default-follow-circle-improvements

Browse Source
This commit is contained in:
Dean Herbert 2022-07-19 20:16:35 +09:00 committed by GitHub
commit 6957f02281
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Desktop/Program.cs
View File

@ -37,9 +37,15 @@ namespace osu.Desktop
// See https://www.mongodb.com/docs/realm/sdk/dotnet/#supported-platforms // See https://www.mongodb.com/docs/realm/sdk/dotnet/#supported-platforms
if (windowsVersion.Major < 6 || (windowsVersion.Major == 6 && windowsVersion.Minor <= 2)) if (windowsVersion.Major < 6 || (windowsVersion.Major == 6 && windowsVersion.Minor <= 2))
{ {
// If users running in compatibility mode becomes more of a common thing, we may want to provide better guidance or even consider
// disabling it ourselves.
// We could also better detect compatibility mode if required:
// https://stackoverflow.com/questions/10744651/how-i-can-detect-if-my-application-is-running-under-compatibility-mode#comment58183249_10744730
SDL.SDL_ShowSimpleMessageBox(SDL.SDL_MessageBoxFlags.SDL_MESSAGEBOX_ERROR, SDL.SDL_ShowSimpleMessageBox(SDL.SDL_MessageBoxFlags.SDL_MESSAGEBOX_ERROR,
"Your operating system is too old to run osu!", "Your operating system is too old to run osu!",
"This version of osu! requires at least Windows 8.1 to run.\nPlease upgrade your operating system or consider using an older version of osu!.", IntPtr.Zero); "This version of osu! requires at least Windows 8.1 to run.\n"
+ "Please upgrade your operating system or consider using an older version of osu!.\n\n"
+ "If you are running a newer version of windows, please check you don't have \"Compatibility mode\" turned on for osu!", IntPtr.Zero);
return; return;
} }

2
osu.Game/Online/API/Requests/Responses/APIScoresCollection.cs
View File

@ -13,7 +13,7 @@ namespace osu.Game.Online.API.Requests.Responses
[JsonProperty(@"scores")] [JsonProperty(@"scores")]
public List<SoloScoreInfo> Scores; public List<SoloScoreInfo> Scores;
[JsonProperty(@"userScore")] [JsonProperty(@"user_score")]
public APIScoreWithPosition UserScore; public APIScoreWithPosition UserScore;
} }
} }

4
osu.Game/Online/Spectator/OnlineSpectatorClient.cs
View File

@ -66,10 +66,10 @@ namespace osu.Game.Online.Spectator
await connector.Reconnect(); await connector.Reconnect();
await BeginPlayingInternal(state); await BeginPlayingInternal(state);
return;
} }
throw; // Exceptions can occur if, for instance, the locally played beatmap doesn't have a server-side counterpart.
// For now, let's ignore these so they don't cause unobserved exceptions to appear to the user (and sentry).
} }
} }