Merge branch 'master' into fix-checkbox-sounds

This commit is contained in:
Dean Herbert 2018-02-08 15:56:34 +09:00 committed by GitHub
commit e3a4cebd48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -123,9 +123,7 @@ namespace osu.Game.Rulesets.Osu.Objects
StartTime = EndTime,
Position = StackedEndPosition,
IndexInCurrentCombo = IndexInCurrentCombo,
ComboColour = ComboColour,
Samples = Samples,
SampleControlPoint = SampleControlPoint
ComboColour = ComboColour
};
AddNested(HeadCircle);