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

..

Drawables

Merge remote-tracking branch 'upstream/master' into taiko-hitsounds-fix

2017-12-23 14:50:35 +09:00

BarLine.cs

Mode -> Ruleset.

2017-04-18 16:05:58 +09:00

CentreHit.cs

Mode -> Ruleset.

2017-04-18 16:05:58 +09:00

DrumRoll.cs

Make HitObjects construct nested hit objects

2017-12-22 21:42:54 +09:00

DrumRollTick.cs

Mode -> Ruleset.

2017-04-18 16:05:58 +09:00

Hit.cs

Make HitObjects construct nested hit objects

2017-12-22 21:42:54 +09:00

RimHit.cs

Mode -> Ruleset.

2017-04-18 16:05:58 +09:00

Swell.cs

Mode -> Ruleset.

2017-04-18 16:05:58 +09:00

TaikoHitObject.cs

Remove usings.

2017-09-12 11:51:19 +09:00

TaikoHitObjectDifficulty.cs

CI fixes.

2017-04-26 17:04:57 +09:00