mirror of
https://github.com/ppy/osu
synced 2024-12-16 20:05:41 +00:00
d7c09e7dbd
# 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 |
||
---|---|---|
.. | ||
TestCaseBeatSyncedContainer.cs | ||
TestCaseBreadcrumbs.cs | ||
TestCaseButtonSystem.cs | ||
TestCaseContextMenu.cs | ||
TestCaseCursors.cs | ||
TestCaseDialogOverlay.cs | ||
TestCaseDrawableDate.cs | ||
TestCaseHoldToConfirmOverlay.cs | ||
TestCaseIconButton.cs | ||
TestCaseLabelledTextBox.cs | ||
TestCaseLoadingAnimation.cs | ||
TestCaseLogoTrackingContainer.cs | ||
TestCaseMods.cs | ||
TestCaseMusicController.cs | ||
TestCaseNotificationOverlay.cs | ||
TestCaseOnScreenDisplay.cs | ||
TestCaseOsuIcon.cs | ||
TestCaseParallaxContainer.cs | ||
TestCasePopupDialog.cs | ||
TestCaseScreenBreadcrumbControl.cs | ||
TestCaseTabControl.cs | ||
TestCaseTwoLayerButton.cs | ||
TestCaseUpdateableBeatmapBackgroundSprite.cs | ||
TestCaseVolumePieces.cs |