1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 17:02:55 +08:00
osu-lazer/osu.Game/Screens
smoogipoo eb0e9c0bb1 Merge branch 'match-mod-display'
# Conflicts:
#	osu.Game/Screens/Multi/Match/Components/Info.cs
#	osu.Game/osu.Game.csproj
2018-12-13 17:07:31 +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 Merge branch 'match-mod-display' 2018-12-13 17:07:31 +09:00
Play Add mods to the match info 2018-12-12 14:38:03 +09:00
Ranking Change statistics to be int for now 2018-12-05 19:44:01 +09:00
Select Merge branch 'timeshift' 2018-12-13 17:06:20 +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