Merge branch 'develop' into story1118_map_arrows

# Conflicts:
#	src/main/java/seng302/gameServer/GameState.java
#	src/main/java/seng302/gameServer/MainServerThread.java
#	src/main/java/seng302/model/RaceState.java
#	src/main/java/seng302/visualiser/GameClient.java

src/main/java/seng302/visualiser/controllers/LobbyController.java

@@ -1,8 +1,7 @@
 package seng302.visualiser.controllers;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
+
 import javafx.application.Platform;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
@@ -14,6 +13,8 @@ import javafx.scene.image.ImageView;
 import javafx.scene.text.Text;
 import seng302.gameServer.GameStages;
 import seng302.gameServer.GameState;
+import seng302.model.RaceState;
+import seng302.visualiser.GameClient;
 
 /**
  * A class describing the actions of the lobby screen
@@ -67,9 +68,14 @@ public class LobbyController {
     private ImageView seventhImageView;
     @FXML
     private ImageView eighthImageView;
+    @FXML
+    private Text timeUntilStart;
+    @FXML
+    private Text courseNameText;
 
     private List<ImageView> imageViews = new ArrayList<>();
     private List<TextArea> listViews = new ArrayList<>();
+    private RaceState raceState;
 
     private int MAX_NUM_PLAYERS = 8;
 
@@ -89,6 +95,8 @@ public class LobbyController {
             fifthImageView, sixthImageView, seventhImageView, eighthImageView
         );
         initialiseImageView();
+
+        timeUntilStart.setText("Waiting For Host...");
     }
 
     /**
@@ -133,7 +141,9 @@ public class LobbyController {
 
     @FXML
     public void readyButtonPressed() {
-        GameState.setCurrentStage(GameStages.RACING);
+        GameState.setCurrentStage(GameStages.PRE_RACE);
+        // Do countdown logic here
+
         for (LobbyCloseListener readyListener : lobbyListeners)
             readyListener.notify(CloseStatus.READY);
     }
@@ -142,6 +152,10 @@ public class LobbyController {
         lobbyIpText.setText(title);
     }
 
+    public void setCourseName(String courseName){
+        courseNameText.setText(courseName);
+    }
+
     public void addCloseListener(LobbyCloseListener listener) {
         lobbyListeners.add(listener);
     }
@@ -154,6 +168,11 @@ public class LobbyController {
         Platform.runLater(this::updatePlayers);
     }
 
+    public void updateRaceState(RaceState raceState){
+        this.raceState = raceState;
+        timeUntilStart.setText("Starting in: " + raceState.getRaceTimeStr());
+    }
+
     public void disableReadyButton () {
         readyButton.setDisable(true);
         readyButton.setVisible(false);

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

@@ -71,7 +71,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private Button selectAnnotationBtn;
     @FXML
     private ComboBox<ClientYacht> yachtSelectionComboBox;
-
+    @FXML
+    private Text fpsDisplay;
     //Race Data
     private Map<Integer, ClientYacht> participants;
     private Map<Integer, CompoundMark> markers;
@@ -115,11 +116,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         initialiseSparkLine();
 
         gameView = new GameView();
-        Platform.runLater(() -> contentAnchorPane.getChildren().add(gameView));
-        gameView.setBoats(new ArrayList<>(participants.values()));
-        gameView.updateBorder(raceData.getCourseLimit());
-        gameView.updateCourse(
-            new ArrayList<>(raceData.getCompoundMarks().values()), raceData.getMarkSequence()
+        gameView.setFrameRateFXText(fpsDisplay);
+        Platform.runLater(() -> contentAnchorPane.getChildren().add(0, gameView));
+            gameView.setBoats(new ArrayList<>(participants.values()));
+            gameView.updateBorder(raceData.getCourseLimit());
+            gameView.updateCourse(
+                new ArrayList<>(raceData.getCompoundMarks().values()), raceData.getMarkSequence()
         );
         gameView.setBoatAsPlayer(player);
         gameView.startRace();
@@ -370,12 +372,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
      * Updates the clock for the race
      */
     private void updateRaceTime() {
-        if (!raceState.isRaceStarted()) {
-            timerLabel.setFill(Color.RED);
-            timerLabel.setText("Race Finished!");
-        } else {
-            timerLabel.setText(raceState.getRaceTimeStr());
-        }
+//        if (!raceState.isRaceStarted()) {
+//            timerLabel.setFill(Color.RED);
+//            timerLabel.setText("Race Finished!");
+//        } else {
+        timerLabel.setText(raceState.getRaceTimeStr());
+//        }
     }
 
     /**