Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit

# Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/MainController.java
2017-09-08 16:50:28 +12:00
parent a2b3ba44c0 321359be07
commit a5d3434a70
19 changed files with 695 additions and 43 deletions
@@ -48,4 +48,11 @@ public class Wind {
        return windSpeed;
    }

+    public void setWindSpeed(double windSpeed) {
+        this.windSpeed = windSpeed;
+    }
+
+    public void setWindDirection(Bearing windDirection) {
+        this.windDirection = windDirection;
+    }
 }