Dean Herbert 482a01e7ba Merge branch 'master' into tournament-tools ... # Conflicts: # osu.Game/Online/API/Requests/Responses/APIBeatmap.cs # osu.Game/OsuGameBase.cs # osu.Game/Overlays/ChatOverlay.cs # osu.Game/Screens/Menu/MainMenu.cs # osu.Game/Screens/Tournament/Drawings.cs # osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs # osu.Game/osu.Game.csproj # osu.sln		2019-02-02 19:09:48 +09:00
..
Backgrounds	Merge remote-tracking branch 'origin/master' into iscreen	2019-01-29 21:21:36 +09:00
Charts	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Direct	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Edit	Merge remote-tracking branch 'origin/master' into iscreen	2019-01-29 21:21:36 +09:00
Menu	Merge branch 'master' into tournament-tools	2019-02-02 19:09:48 +09:00
Multi	Don't expose padding	2019-01-31 18:16:28 +09:00
Play	Merge branch 'master' into fix-replay-multiplier-text	2019-01-31 21:17:40 +09:00
Ranking	Merge remote-tracking branch 'origin/master' into iscreen	2019-01-29 21:21:36 +09:00
Select	Don't expose padding	2019-01-31 18:16:28 +09:00
BackgroundScreen.cs	Merge remote-tracking branch 'origin/master' into iscreen	2019-01-29 21:21:36 +09:00
BackgroundScreenStack.cs	Move parallax logic out of BackgroundScreenStack	2019-01-31 18:10:33 +09:00
BlurrableBackgroundScreen.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
IOsuScreen.cs	Move parallax logic out of BackgroundScreenStack	2019-01-31 18:10:33 +09:00
Loader.cs	Merge remote-tracking branch 'origin/master' into iscreen	2019-01-29 21:21:36 +09:00
OsuScreen.cs	Don't expose padding	2019-01-31 18:16:28 +09:00
ScreenWhiteBox.cs	Merge remote-tracking branch 'origin/master' into iscreen	2019-01-29 21:21:36 +09:00