Alistair McIntyre 08057edb28 Merge branch 'Issue#4_boat_movement' into issue#10_unifying_marks ...

# Conflicts:
#	src/main/java/seng302/controllers/CanvasController.java
#	src/main/java/seng302/controllers/RaceViewController.java
#	src/main/java/seng302/models/BoatGroup.java
#	src/main/java/seng302/models/mark/MarkGroup.java

2017-05-18 17:04:00 +12:00

..

controllers

Fixed Boat selection and lost annotations (Estimated and Leg Time)

2017-05-18 14:41:08 +12:00

models

Merge branch 'Issue#4_boat_movement' into issue#10_unifying_marks

2017-05-18 17:04:00 +12:00

server

boat movement working reliably now, still need to fix one bug at initialization #story[923]

2017-05-17 17:34:47 +12:00

App.java

Merge branch 'develop' into Issue#4_boat_movement

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