1
0
mirror of https://github.com/ppy/osu.git synced 2026-05-18 16:50:21 +08:00
Commit Graph

5 Commits

  • Merge remote-tracking branch 'origin/master' into fix-new-inspections
    # Conflicts:
    #	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
    #	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
    #	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
    #	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
    #	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
    #	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
    #	osu.Game/Graphics/OsuFont.cs
    #	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
    #	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
    #	osu.Game/Overlays/Profile/ProfileHeader.cs
    #	osu.Game/Screens/Select/PlaySongSelect.cs
    #	osu.Game/Skinning/LegacySkinDecoder.cs
  • Fix incorrect usage of InternalChildren
    Could cause overwriting of components added by base DrawableHitObjcet class (such as samples)