smoogipoo 5d59a1ffca Merge remote-tracking branch 'origin/master' into timeshift-wip ... # Conflicts: # osu.Game.Tests/Visual/TestCasePollingComponent.cs # osu.Game/Online/API/APIRequest.cs # osu.Game/osu.Game.csproj		2018-12-21 12:51:31 +09:00
..
Configuration	…
Difficulty	Rename NoModMod	2018-11-30 17:35:13 +09:00
Edit	Merge remote-tracking branch 'upstream/master' into inter-column-movements	2018-11-30 11:57:53 +09:00
Judgements	Move HealthIncreaseFor to Judgement	2018-12-06 15:09:42 +07:00
Mods	Fix incorrect acronym	2018-12-14 13:38:13 +09:00
Objects	Autodetect LowestSuccessfulHitResult	2018-12-12 17:15:59 +07:00
Replays	Re-namespace replay-related classes	2018-11-28 17:20:37 +09:00
Scoring	Remove health from ScoreInfo	2018-12-01 00:17:05 +09:00
Timing	…
UI	Remove mod multipliers	2018-12-20 19:46:39 +09:00
Ruleset.cs	ScoreInfo scoreInfo -> ScoreInfo score	2018-11-30 15:18:52 +09:00
RulesetConfigCache.cs	…
RulesetInfo.cs	Move JsonIgnore specification to interface	2018-11-30 16:39:25 +09:00
RulesetStore.cs	…