Merge remote-tracking branch 'origin/develop' into develop

src/main/java/seng302/controllers/RaceViewController.java

@@ -51,6 +51,8 @@ import java.util.stream.Collectors;
  */
 public class RaceViewController extends Thread implements ImportantAnnotationDelegate {
 
+    @FXML
+    private Text windSpeedText;
     @FXML
     private LineChart raceSparkLine;
     @FXML
@@ -335,6 +337,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private void updateWindDirection() {
         windDirectionText.setText(String.format("%.1f°", ClientPacketParser.getWindDirection()));
         windArrowText.setRotate(ClientPacketParser.getWindDirection());
+        windSpeedText.setText(String.format("%.1f Knots", ClientPacketParser.getWindSpeed()));
     }
 
 

src/main/java/seng302/gameServer/GameState.java

@@ -25,7 +25,7 @@ public class GameState {
     
     public GameState(String hostIpAddress) {
         windDirection = 170d;
-        windSpeed = 1300d;
+        windSpeed = 10000d;
         yachts = new HashMap<>();
         players = new ArrayList<>();
 

src/main/java/seng302/server/messages/RaceStatusMessage.java

@@ -11,6 +11,7 @@ public class RaceStatusMessage extends Message{
     private final int MESSAGE_BASE_SIZE = 24;
     private final double windDirFactor = 0x4000 / 90;
 
+
     private long currentTime;
     private long raceId;
     private RaceStatus raceStatus;