smoogipoo 5d59a1ffca Merge remote-tracking branch 'origin/master' into timeshift-wip ... # Conflicts: # osu.Game.Tests/Visual/TestCasePollingComponent.cs # osu.Game/Online/API/APIRequest.cs # osu.Game/osu.Game.csproj		2018-12-21 12:51: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	Add joining/parting room requests	2018-12-20 20:58:34 +09:00
Play	Merge remote-tracking branch 'origin/master' into timeshift-wip	2018-12-21 12:51:31 +09:00
Ranking	Separate out Leaderboard into BeatmapLeaderboard	2018-12-14 19:51:27 +09:00
Select	Separate out Leaderboard into BeatmapLeaderboard	2018-12-14 19:51:27 +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