Merge remote-tracking branch 'origin/master' into timeshift-wip

# Conflicts:
#	osu.Game.Tests/Visual/TestCasePollingComponent.cs
#	osu.Game/Online/API/APIRequest.cs
#	osu.Game/osu.Game.csproj
This commit is contained in:
smoogipoo
2018-12-21 12:51:31 +09:00
57 changed files with 907 additions and 292 deletions

View File

@ -22,7 +22,8 @@ namespace osu.Game.Online
private double timeBetweenPolls;
/// <summary>
/// The time that should be waited between polls.
/// The time in milliseconds to wait between polls.
/// Setting to zero stops all polling.
/// </summary>
public double TimeBetweenPolls
{
@ -35,6 +36,15 @@ namespace osu.Game.Online
}
}
/// <summary>
///
/// </summary>
/// <param name="timeBetweenPolls">The initial time in milliseconds to wait between polls. Setting to zero stops al polling.</param>
protected PollingComponent(double timeBetweenPolls = 0)
{
TimeBetweenPolls = timeBetweenPolls;
}
protected override void LoadComplete()
{
base.LoadComplete();