cir27 a0624cfef6 Merge branch 'wake_remake' into Mark_to_MarkGroup ...

# Conflicts:
#	src/main/java/seng302/controllers/CanvasController.java
#	src/main/java/seng302/models/BoatGroup.java
#	src/main/java/seng302/models/Wake.java
#	src/main/java/seng302/models/parsers/StreamParser.java
#	src/main/resources/views/RaceView.fxml

2017-04-29 14:29:12 +12:00

..

CanvasController.java

Merge branch 'wake_remake' into Mark_to_MarkGroup

2017-04-29 14:29:12 +12:00

Controller.java

Updated welcome screen to show if race is finished or starting

2017-04-28 21:28:34 +12:00

RaceController.java

Controllers and Fxml nicely refactored, tests still broken #story[463]

2017-03-29 14:59:37 +13:00

RaceResultController.java

Added the race results to the RaceResultController. Also fixed some bugs

2017-03-22 22:30:49 +13:00

RaceViewController.java

Merge branch 'wake_remake' into Mark_to_MarkGroup

2017-04-29 14:29:12 +12:00