Merge remote-tracking branch 'remotes/origin/master' into storyB-)

This commit is contained in:
Connor Taylor-Brown
2017-09-12 17:23:47 +12:00
43 changed files with 893 additions and 1776 deletions
@@ -3,6 +3,7 @@ package shared.model;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import org.jetbrains.annotations.Nullable;
import visualiser.Controllers.RaceStartController;
import visualiser.model.ResizableRaceCanvas;
import java.time.Duration;
@@ -15,8 +16,8 @@ import java.util.Date;
* This class is used to implement a clock which keeps track of and
* displays times relevant to a race. This is displayed on the
* {@link ResizableRaceCanvas} via the
* {@link visualiser.Controllers.RaceController} and the
* {@link visualiser.Controllers.StartController}.
* {@link visualiser.Controllers.RaceViewController} and the
* {@link RaceStartController}.
*/
public class RaceClock {