smoogipoo 577ff4cc7f Merge remote-tracking branch 'origin/master' into mania-mask-container ...

# Conflicts:
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
#	osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
#	osu.Game.Rulesets.Mania/UI/ManiaStage.cs

2018-07-17 13:13:57 +09:00

..

Configuration

Make ruleset config manager variants nullable

2018-06-11 13:13:36 +09:00

Difficulty

Fix up performance calculators

2018-06-14 16:04:48 +09:00

Edit

Merge remote-tracking branch 'origin/master' into mania-mask-container

2018-06-07 19:19:20 +09:00

Judgements

Adjust xmldoc

2018-06-29 17:21:55 +09:00

Mods

Merge branch 'master' into fix-object-ordering

2018-06-11 17:53:33 +09:00

Objects

Merge remote-tracking branch 'origin/master' into mania-mask-container

2018-07-17 13:13:57 +09:00

Replays

Use Enum.HasFlag

2018-07-16 16:18:46 +09:00

Scoring

Merge branch 'master' into catch-scoring

2018-06-29 14:59:15 +09:00

Timing

Normalize all the line endings

2018-04-13 18:26:38 +09:00

UI

Fix DI regression

2018-07-11 17:54:01 +09:00

Ruleset.cs

Split out into separate interface + add xmldocs

2018-06-29 13:24:33 +09:00

RulesetConfigCache.cs

Fix xmldoc

2018-06-11 15:44:59 +09:00

RulesetInfo.cs

Normalize all the line endings

2018-04-13 18:26:38 +09:00

RulesetStore.cs

Fix rulesets not loading in debug builds after running a release build

2018-07-01 18:03:15 +09:00