smoogipoo ff559a3a1b Merge remote-tracking branch 'origin/master' into playfield-scaling-rework ... # Conflicts: # osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs # osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs		2018-10-05 10:40:16 +09:00
..
Scrolling	Merge remote-tracking branch 'origin/master' into playfield-scaling-rework	2018-10-05 10:40:16 +09:00
HitObjectContainer.cs	Simplify creation of a playfield	2018-09-21 14:35:50 +09:00
JudgementContainer.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
ModIcon.cs	Split out Special mods into Automation and Conversion	2018-07-31 18:00:42 +09:00
Playfield.cs	Simplify creation of a playfield	2018-09-21 14:35:50 +09:00
RulesetContainer.cs	Remove GetAspectAdjustedSize() and PlayfieldArea	2018-09-21 15:14:49 +09:00
RulesetInputManager.cs	Fix gameplay mouse button disable setting no longer having any effect	2018-10-04 03:07:00 +09:00