Dean Herbert 976cff9af6 Merge remote-tracking branch 'upstream/master' into catch ... # Conflicts: # osu.Desktop.Tests/Visual/TestCaseScrollingPlayfield.cs		2017-08-09 15:08:43 +09:00
..
Beatmaps	Split ControlPoint into different types.	2017-05-23 14:03:40 +09:00
Judgements	Rename EasingTypes to Easing	2017-07-22 20:53:53 +02:00
Mods	HitRenderer -> RulesetContainer	2017-08-09 13:28:29 +09:00
Objects	Don't set RelativePositionAxes when setting ScrollingAxes	2017-08-08 13:02:23 +09:00
Replays	CI fixes	2017-04-29 02:30:34 +08:00
Scoring	HitRenderer -> RulesetContainer	2017-08-09 13:28:29 +09:00
Timing	Fix possible incorrect reversing behavior for horizontal playfields.	2017-08-09 14:50:52 +09:00
UI	Merge remote-tracking branch 'upstream/master' into catch	2017-08-09 15:08:43 +09:00
BeatmapStatistic.cs	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
Ruleset.cs	HitRenderer -> RulesetContainer	2017-08-09 13:28:29 +09:00
RulesetInfo.cs	Give HitRenderer a reference to Ruleset	2017-08-09 13:05:52 +09:00
RulesetStore.cs	Give HitRenderer a reference to Ruleset	2017-08-09 13:05:52 +09:00