Merge branch 'master' into add-bindable-for-break-times

This commit is contained in:
Salman Ahmed
2019-07-26 12:57:52 +03:00
committed by GitHub
15 changed files with 166 additions and 49 deletions

View File

@ -21,11 +21,11 @@ namespace osu.Game.Screens.Play
private const float remaining_time_container_max_size = 0.3f;
private const int vertical_margin = 25;
private List<BreakPeriod> breaks;
private readonly Container fadeContainer;
public List<BreakPeriod> Breaks
private IReadOnlyList<BreakPeriod> breaks;
public IReadOnlyList<BreakPeriod> Breaks
{
get => breaks;
set