Zhi You Tan 5ed02a1fe1 Merge remote-tracking branch 'origin/develop' into issue#8_create_finish_screen ...

# Conflicts:
#	src/main/java/seng302/controllers/CanvasController.java

2017-05-25 12:32:10 +12:00

..

CanvasView.fxml

Fixed the size of race canvas and race view so that canvas won't be stretched

2017-05-24 13:54:05 +12:00

FinishScreenView.fxml

Finish screen will show when race finishes, added functionality to return to start screen when in finish screen, updated finishScreenView.fxml to have controller and also four corner anchors to fit to parent

2017-05-24 16:17:56 +12:00

importantAnnotationSelectView.fxml

Implemented elapsed time since last mark on annotation.

2017-05-15 16:31:04 +12:00

MainView.fxml

Split Start Screen out from Main View view and controller.

2017-05-17 12:56:13 +12:00

RaceView.fxml

Merge branch 'develop' into Story34_Sparklines

2017-05-24 18:45:01 +12:00

StartScreenView.fxml

Split Start Screen out from Main View view and controller.

2017-05-17 12:56:13 +12:00

TestMapView.fxml

Created a canvas map class to fetch map image from google

2017-05-24 00:49:03 +12:00