Dean Herbert 70d644406f Merge remote-tracking branch 'origin/update-framework' into letterboxing ... # Conflicts: # osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs		2019-01-07 18:53:53 +09:00
..
Backgrounds	Formatting and naming	2019-01-04 15:34:32 +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 Find instead of FirstOrDefault	2019-01-05 19:35:33 +03:00
Menu	Add letterbox/screen scaling support	2019-01-04 13:36:02 +09:00
Multi	Update framework	2019-01-07 18:50:27 +09:00
Play	Merge remote-tracking branch 'upstream/master' into letterboxing	2019-01-07 18:52:48 +09:00
Ranking	Leaderboard design updates	2018-12-27 15:52:40 +09:00
Select	Make leaderboard top not fade by default	2018-12-27 17:29:55 +09:00
Tournament	Use Find instead of FirstOrDefault	2019-01-05 19:35:33 +03: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