Merge branch 'master' into issue_18_track_alpha

# Conflicts:
#	racevisionGame/src/main/java/visualiser/model/VisualiserRaceState.java
This commit is contained in:
fjc40
2017-08-17 13:00:13 +12:00
29 changed files with 536 additions and 322 deletions
@@ -100,7 +100,7 @@ public class VisualiserBoat extends Boat {
//Calculate the new coordinate.
GPSCoordinate wakeCoordinate = GPSCoordinate.calculateNewPosition(getCurrentPosition(), wakeDistanceMeters, reverseAzimuth);
GPSCoordinate wakeCoordinate = GPSCoordinate.calculateNewPosition(getPosition(), wakeDistanceMeters, reverseAzimuth);
return wakeCoordinate;
}