smoogipoo 70f1d17b7e Merge remote-tracking branch 'origin/master' into editor-mask-placement ... # Conflicts: # osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs # osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs # osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs # osu.Game/Rulesets/UI/RulesetContainer.cs		2018-10-16 17:28:16 +09:00
..
Backgrounds	Fix potential exception during async load callback	2018-09-21 16:31:09 +09:00
Charts
Direct
Edit	Merge remote-tracking branch 'origin/master' into editor-mask-placement	2018-10-16 17:28:16 +09:00
Menu	Adjust usage of Handle(Non)PositionalInput to follow framework update	2018-10-02 14:45:33 +09:00
Multi	Change signature to new event handler	2018-10-02 12:02:47 +09:00
Play	Merge branch 'master' into consistent-terminology-format	2018-10-10 19:19:36 +09:00
Ranking	Apply changes in-line with framework localisation changes	2018-09-19 14:07:46 +09:00
Select	Merge pull request #3568 from smoogipoo/fix-beatmap-details	2018-10-10 20:14:58 +09:00
Tournament	Update framework	2018-09-07 19:00:43 +09:00
BackgroundScreen.cs	Change signature to new event handler	2018-10-02 12:02:47 +09:00
BlurrableBackgroundScreen.cs	Make menu background blurrable	2018-09-21 03:13:34 +09:00
Loader.cs	Fix notifications appearing too early in load process	2018-08-23 11:21:56 +09:00
OsuScreen.cs	Revert async changes	2018-08-31 07:07:10 +09:00
ScreenWhiteBox.cs