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	Improve naming	2019-11-22 02:38:31 +09:00
DatabasedConfigManager.cs	Constrain configuration lookup as enum.	2019-12-09 17:45:26 +08:00
DatabasedSetting.cs	Merge remote-tracking branch 'upstream/master' into databased-sin-setting	2019-06-05 19:03:57 +09:00
InMemoryConfigManager.cs	Constrain configuration lookup as enum.	2019-12-09 17:45:26 +08:00
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	Fix remaining issues	2019-02-28 13:31:40 +09:00
RankingType.cs	Fix remaining issues	2019-02-28 13:31:40 +09:00
ReleaseStream.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
ScalingMode.cs	Fix remaining issues	2019-02-28 13:31:40 +09:00
ScoreMeterType.cs	Add more types to dropdown	2019-12-21 13:32:25 +03:00
ScreenshotFormat.cs	Fix remaining issues	2019-02-28 13:31:40 +09:00
ScrollVisualisationMethod.cs	Fix remaining issues	2019-02-28 13:31:40 +09:00
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	Store databased settings based on string keys rather than ints	2019-05-27 01:53:49 +09:00
StorageConfigManager.cs	Add basic custom data directory support	2020-05-04 17:01:05 +09:00