sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 23:24:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into colourise-control-point-table

Browse Source
This commit is contained in:
Dan Balasescu
2020-10-05 20:47:06 +09:00
committed by GitHub
parent fcc6cb36e4 54f1bcf2ce
commit 783a463772
111 changed files with 2102 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
View File

@ -79,7 +79,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
};
volume.BindValueChanged(volume => volumeBox.Height = volume.NewValue / 100f, true);
bank.BindValueChanged(bank => text.Text = $"{bank.NewValue}", true);
bank.BindValueChanged(bank => text.Text = bank.NewValue, true);
}
}
}

2
osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
View File

@ -86,8 +86,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
MidColour = colours.BlueDark,
HighColour = colours.BlueDarker,
},
controlPoints = new TimelineControlPointDisplay(),
ticks = new TimelineTickDisplay(),
controlPoints = new TimelineControlPointDisplay(),
}
},
});