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

..

Scrolling

Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework

2018-10-12 19:25:08 +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

Add fallback logic in case a ruleset consumer forgets to add the HitObjectContainer

2018-10-12 19:15:11 +09:00

RulesetContainer.cs

Merge remote-tracking branch 'origin/master' into editor-mask-placement

2018-10-16 17:28:16 +09:00

RulesetInputManager.cs

Remove duplicated code

2018-10-04 18:03:34 +09:00