1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 23:47:32 +08:00
osu-lazer/osu.Game/Screens
smoogipoo c2a00b84c7 Merge remote-tracking branch 'peppy/modular-results-screen' into timeshift-wip
# Conflicts:
#	osu.Game/Screens/Multi/IMultiplayerScreen.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/SoloResults.cs
#	osu.Game/Screens/Ranking/IResultPageInfo.cs
#	osu.Game/Screens/Ranking/ResultMode.cs
#	osu.Game/Screens/Ranking/ResultModeButton.cs
#	osu.Game/Screens/Ranking/ResultModeTabControl.cs
#	osu.Game/Screens/Ranking/Results.cs
2018-12-22 16:22:02 +09:00
..
Backgrounds Fix potential exception during async load callback 2018-09-21 16:31:09 +09:00
Charts Normalize all the line endings 2018-04-13 18:26:38 +09:00
Direct Normalize all the line endings 2018-04-13 18:26:38 +09:00
Edit Use input events rather than scene graph traversals 2018-11-30 15:47:55 +09:00
Menu Block going into multiplayer while logged out 2018-12-04 17:43:27 +09:00
Multi Rename variable 2018-12-22 15:46:04 +09:00
Play Merge remote-tracking branch 'peppy/modular-results-screen' into timeshift-wip 2018-12-22 16:22:02 +09:00
Ranking Merge remote-tracking branch 'peppy/modular-results-screen' into timeshift-wip 2018-12-22 16:22:02 +09:00
Select Split results screen to allow for extensibility 2018-12-22 15:39:06 +09:00
Tournament OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
BackgroundScreen.cs OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
BlurrableBackgroundScreen.cs OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Loader.cs OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
OsuScreen.cs Only allow replay screen changes in menu + songselect 2018-11-30 18:25:54 +09:00
ScreenWhiteBox.cs OpenTK -> osuTK 2018-11-20 17:14:59 +09:00