mirror of
https://github.com/ppy/osu
synced 2024-12-17 12:25:19 +00:00
Merge branch 'master' into fix-checkbox-sounds
This commit is contained in:
commit
e3a4cebd48
@ -123,9 +123,7 @@ namespace osu.Game.Rulesets.Osu.Objects
|
|||||||
StartTime = EndTime,
|
StartTime = EndTime,
|
||||||
Position = StackedEndPosition,
|
Position = StackedEndPosition,
|
||||||
IndexInCurrentCombo = IndexInCurrentCombo,
|
IndexInCurrentCombo = IndexInCurrentCombo,
|
||||||
ComboColour = ComboColour,
|
ComboColour = ComboColour
|
||||||
Samples = Samples,
|
|
||||||
SampleControlPoint = SampleControlPoint
|
|
||||||
};
|
};
|
||||||
|
|
||||||
AddNested(HeadCircle);
|
AddNested(HeadCircle);
|
||||||
|
Loading…
Reference in New Issue
Block a user