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

Merge branch 'master' into mod-consistency-function

Browse Source
This commit is contained in:
Dean Herbert
2021-02-02 20:01:42 +09:00
committed by GitHub
parent 8e70a50af0 4ecbe058f7
commit ac5662b1aa
11 changed files with 250 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Utils/ModUtils.cs
View File

@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using osu.Game.Rulesets.Mods;
@ -45,7 +46,7 @@ namespace osu.Game.Utils
/// <param name="combination">The <see cref="Mod"/> combination to check.</param>
/// <param name="invalidMods">Any invalid mods in the set.</param>
/// <returns>Whether all <see cref="Mod"/>s in the combination are compatible with each-other.</returns>
public static bool CheckCompatibleSet(IEnumerable<Mod> combination, out List<Mod>? invalidMods)
public static bool CheckCompatibleSet(IEnumerable<Mod> combination, [NotNullWhen(false)] out List<Mod>? invalidMods)
{
combination = FlattenMods(combination).ToArray();
invalidMods = null;

2
osu.Game/Utils/SentryLogger.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Utils
var options = new SentryOptions
{
Dsn = new Dsn("https://5e342cd55f294edebdc9ad604d28bbd3@sentry.io/1255255"),
Dsn = "https://5e342cd55f294edebdc9ad604d28bbd3@sentry.io/1255255",
Release = game.Version
};