Shane Woolcock ec12a21088 Merge branch 'master' into confine-during-gameplay ... # Conflicts: # osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs		2020-10-07 11:07:00 +10:30
..
BackgroundSource.cs
DatabasedConfigManager.cs
DatabasedSetting.cs
InMemoryConfigManager.cs
IntroSequence.cs	Change "Fallback" to "Welcome" visually	2020-06-02 11:25:57 +02:00
OsuConfigManager.cs	Maintain the current gameplay state in OsuGame	2020-10-06 22:39:35 +10:30
RandomSelectAlgorithm.cs
RankingType.cs
ReleaseStream.cs
ScalingMode.cs
ScoreMeterType.cs
ScreenshotFormat.cs
ScrollVisualisationMethod.cs
SessionStatics.cs	Revert commit 939441ae	2020-07-23 11:56:46 +02:00
SettingSourceAttribute.cs	Make SettingsItem conform to IHasCurrentValue	2020-10-06 17:18:54 +09:00
SettingsStore.cs
StorageConfigManager.cs