Dean Herbert 46865bbacd Merge remote-tracking branch 'upstream/master' into taiko-hitsounds-fix ... # Conflicts: # osu.Game/Audio/SampleInfo.cs		2017-12-23 14:50:35 +09:00
..
ArmedState.cs	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
DrawableHitObject.cs	Merge remote-tracking branch 'upstream/master' into taiko-hitsounds-fix	2017-12-23 14:50:35 +09:00
DrawableScrollingHitObject.cs	Disable masking optimisations for scrolling hit objects	2017-09-13 15:57:40 +09:00
HitResult.cs	Combine Judgement.HitResults into one.	2017-09-06 17:01:48 +09:00
IDrawableHitObjectWithProxiedApproach.cs	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
IScrollingHitObject.cs	Reduce implementation overhead in actually positioning hitobjects and making them scroll.	2017-08-07 16:02:38 +09:00