Kusal Ekanayake b3fd735f5c Merge branch 'develop' into Story34_Sparklines ...

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

2017-05-24 21:50:15 +12:00

..

annotations

Implemented elapsed time since last mark on annotation.

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

CanvasController.java

Merge branch 'develop' into Story34_Sparklines

2017-05-24 21:50:15 +12:00

Controller.java

Merge branch 'develop' into Issue#4_boat_movement

2017-05-17 20:05:40 +12:00

RaceController.java

Merge remote-tracking branch 'origin/develop' into issue#5_fix_pre-race_boats_on_leaderboard

2017-05-23 11:31:18 +12:00

RaceViewController.java

Merge branch 'develop' into Story34_Sparklines

2017-05-24 18:56:04 +12:00

StartScreenController.java

Updated code to check if boat is in the race before displaying in the leaderboard

2017-05-23 20:00:23 +12:00