Merge branch 'master' into disable-in-game-chat-reports

2024-11-13 18:07:25 +08:00 · 2023-06-07 09:52:46 +03:00 · 2023-06-07 09:52:46 +03:00 · f23ada1a3f
commit f23ada1a3f
parent 30f17d5869 2a76348481
51 changed files with 0 additions and 102 deletions
--- a/osu.Game.Rulesets.Mania/Objects/HeadNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HeadNote.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Rulesets.Mania.Objects
 {
    public class HeadNote : Note
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPosition.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPosition.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 {
    public enum SliderPosition
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/IRequireTracking.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/IRequireTracking.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
    public interface IRequireTracking
--- a/osu.Game.Rulesets.Osu/Objects/ISliderProgress.cs
+++ b/osu.Game.Rulesets.Osu/Objects/ISliderProgress.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Rulesets.Osu.Objects
 {
    public interface ISliderProgress
--- a/osu.Game.Rulesets.Taiko/Objects/HitType.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/HitType.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Rulesets.Taiko.Objects
 {
    /// <summary>
--- a/osu.Game.Tests/Rulesets/TestSceneBrokenRulesetHandling.cs
+++ b/osu.Game.Tests/Rulesets/TestSceneBrokenRulesetHandling.cs
@ -73,7 +73,5 @@ namespace osu.Game.Tests.Rulesets
            public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => null;
            public override DifficultyCalculator CreateDifficultyCalculator(IWorkingBeatmap beatmap) => null;
        }
-
-#nullable enable
    }
 }
--- a/osu.Game.Tournament/IPC/TourneyState.cs
+++ b/osu.Game.Tournament/IPC/TourneyState.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Tournament.IPC
 {
    public enum TourneyState
--- a/osu.Game.Tournament/Screens/Ladder/Components/ConditionalTournamentMatch.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/ConditionalTournamentMatch.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 using osu.Game.Tournament.Models;

 namespace osu.Game.Tournament.Screens.Ladder.Components
--- a/osu.Game/Beatmaps/DifficultyRating.cs
+++ b/osu.Game/Beatmaps/DifficultyRating.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Beatmaps
 {
    public enum DifficultyRating
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardSize.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardSize.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Beatmaps.Drawables.Cards
 {
    /// <summary>
--- a/osu.Game/Beatmaps/Legacy/LegacyOrigins.cs
+++ b/osu.Game/Beatmaps/Legacy/LegacyOrigins.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Beatmaps.Legacy
 {
    internal enum LegacyOrigins
--- a/osu.Game/Configuration/IntroSequence.cs
+++ b/osu.Game/Configuration/IntroSequence.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Configuration
 {
    public enum IntroSequence
--- a/osu.Game/Configuration/ReleaseStream.cs
+++ b/osu.Game/Configuration/ReleaseStream.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Configuration
 {
    public enum ReleaseStream
--- a/osu.Game/Configuration/ToolbarClockDisplayMode.cs
+++ b/osu.Game/Configuration/ToolbarClockDisplayMode.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Configuration
 {
    public enum ToolbarClockDisplayMode
--- a/osu.Game/Database/ISoftDelete.cs
+++ b/osu.Game/Database/ISoftDelete.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Database
 {
    /// <summary>
--- a/osu.Game/Graphics/UserInterface/MenuItemType.cs
+++ b/osu.Game/Graphics/UserInterface/MenuItemType.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Graphics.UserInterface
 {
    public enum MenuItemType
--- a/osu.Game/Graphics/UserInterface/SelectionState.cs
+++ b/osu.Game/Graphics/UserInterface/SelectionState.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Graphics.UserInterface
 {
    public enum SelectionState
--- a/osu.Game/Graphics/UserInterface/TernaryState.cs
+++ b/osu.Game/Graphics/UserInterface/TernaryState.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Graphics.UserInterface
 {
    /// <summary>
--- a/osu.Game/Online/API/APIRequestCompletionState.cs
+++ b/osu.Game/Online/API/APIRequestCompletionState.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Online.API
 {
    public enum APIRequestCompletionState
--- a/osu.Game/Online/Chat/ChannelType.cs
+++ b/osu.Game/Online/Chat/ChannelType.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Online.Chat
 {
    public enum ChannelType
--- a/osu.Game/Online/Leaderboards/LeaderboardState.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardState.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Online.Leaderboards
 {
    public enum LeaderboardState
--- a/osu.Game/Online/Multiplayer/ForceGameplayStartCountdown.cs
+++ b/osu.Game/Online/Multiplayer/ForceGameplayStartCountdown.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 using MessagePack;

 namespace osu.Game.Online.Multiplayer
--- a/osu.Game/Online/Multiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerServer.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Online.Multiplayer
 {
    /// <summary>
--- a/osu.Game/Online/Multiplayer/MultiplayerUserState.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerUserState.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Online.Multiplayer
 {
    public enum MultiplayerUserState
--- a/osu.Game/Online/Spectator/SpectatedUserState.cs
+++ b/osu.Game/Online/Spectator/SpectatedUserState.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Online.Spectator
 {
    public enum SpectatedUserState
--- a/osu.Game/Overlays/OverlayActivation.cs
+++ b/osu.Game/Overlays/OverlayActivation.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Overlays
 {
    public enum OverlayActivation
--- a/osu.Game/Overlays/SortDirection.cs
+++ b/osu.Game/Overlays/SortDirection.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Overlays
 {
    public enum SortDirection
--- a/osu.Game/Rulesets/Configuration/IRulesetConfigManager.cs
+++ b/osu.Game/Rulesets/Configuration/IRulesetConfigManager.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 using System;
 using osu.Framework.Configuration.Tracking;

--- a/osu.Game/Rulesets/Objects/Drawables/ArmedState.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/ArmedState.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Drawables
 {
    public enum ArmedState
--- a/osu.Game/Rulesets/Objects/IBarLine.cs
+++ b/osu.Game/Rulesets/Objects/IBarLine.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Rulesets.Objects
 {
    /// <summary>
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@ -586,7 +586,5 @@ namespace osu.Game.Rulesets.Objects.Legacy

            public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), Filename);
        }
-
-#nullable disable
    }
 }
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHit.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHit.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 using osu.Game.Rulesets.Objects.Types;

 namespace osu.Game.Rulesets.Objects.Legacy.Mania
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSlider.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 using osu.Game.Rulesets.Objects.Types;

 namespace osu.Game.Rulesets.Objects.Legacy.Mania
--- a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHit.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHit.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Legacy.Taiko
 {
    /// <summary>
--- a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSlider.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Legacy.Taiko
 {
    /// <summary>
--- a/osu.Game/Rulesets/Objects/Types/IHasColumn.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasColumn.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Types
 {
    /// <summary>
--- a/osu.Game/Rulesets/Objects/Types/IHasCombo.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasCombo.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Types
 {
    /// <summary>
--- a/osu.Game/Rulesets/Objects/Types/IHasDistance.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasDistance.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Types
 {
    /// <summary>
--- a/osu.Game/Rulesets/Objects/Types/IHasDuration.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasDuration.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Types
 {
    /// <summary>
--- a/osu.Game/Rulesets/Objects/Types/IHasHold.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasHold.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Types
 {
    /// <summary>
--- a/osu.Game/Rulesets/Objects/Types/IHasLegacyLastTickOffset.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasLegacyLastTickOffset.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Types
 {
    /// <summary>
--- a/osu.Game/Rulesets/Objects/Types/IHasXPosition.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasXPosition.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Types
 {
    /// <summary>
--- a/osu.Game/Rulesets/Objects/Types/IHasYPosition.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasYPosition.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Types
 {
    /// <summary>
--- a/osu.Game/Rulesets/Objects/Types/PathType.cs
+++ b/osu.Game/Rulesets/Objects/Types/PathType.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Rulesets.Objects.Types
 {
    public enum PathType
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingDirection.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingDirection.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Rulesets.UI.Scrolling
 {
    public enum ScrollingDirection
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorType.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorType.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Screens.Edit.Compose.Components
 {
    public enum BeatDivisorType
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerPlaylistDisplayMode.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerPlaylistDisplayMode.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match.Playlist
 {
    /// <summary>
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MasterClockState.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MasterClockState.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
    public enum MasterClockState
--- a/osu.Game/Screens/Ranking/PanelState.cs
+++ b/osu.Game/Screens/Ranking/PanelState.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Screens.Ranking
 {
    public enum PanelState
--- a/osu.Game/Screens/ScorePresentType.cs
+++ b/osu.Game/Screens/ScorePresentType.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Screens
 {
    public enum ScorePresentType
--- a/osu.Game/Screens/Select/Filter/Operator.cs
+++ b/osu.Game/Screens/Select/Filter/Operator.cs
@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-#nullable disable
-
 namespace osu.Game.Screens.Select.Filter
 {
    /// <summary>