Merge branch 'master' into story_64_sails

# Conflicts:
#	racevisionGame/src/main/java/mock/model/MockRace.java
#	racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java
#	racevisionGame/src/main/java/visualiser/model/VisualiserBoat.java
This commit is contained in:
Joseph Gardner
2017-08-17 16:04:53 +12:00
38 changed files with 2292 additions and 136 deletions
@@ -225,11 +225,7 @@ public class VisualiserRaceState extends RaceState {
Leg startingLeg = getLegs().get(0);
for (VisualiserBoat boat : boats) {
boat.setCurrentLeg(startingLeg);
boat.setTimeAtLastMark(getRaceClock().getCurrentTime());
boat.setPosition(new GPSCoordinate(0, 0));
}
}