Merge remote-tracking branch 'origin/master' into network_on_VPS

racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java

@@ -80,6 +80,9 @@ public class HostGameController extends Controller {
      */
     public void alertMatchBrowser(){
         try{
+            if (matchBrowserInterface == null){
+                return;//private game
+            }
             matchBrowserInterface.startSendingHostData(App.game.getHostedGameData(), udpSocket);
         }catch (IOException e){
             System.err.println("failed to send out hosted game info");

racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java

@@ -321,7 +321,7 @@ public class InGameLobbyController extends Controller {
      * @param interval Countdown interval to check
      */
     private void countdownText(long interval){
-
+        countdownTenPane.setVisible(false);
         //Do nothing if 5 seconds or less to go
         if (interval <=5000){
             countdownTenPane.setVisible(false);

racevisionGame/src/main/java/visualiser/enums/TutorialState.java

@@ -25,7 +25,7 @@ public enum TutorialState {
     /**
      * State for vmg in tutorial
      */
-    VMG(BoatActionEnum.AUTO_PILOT),
+    VMG(BoatActionEnum.VMG),
 
     /**
      * State for sails-in in tutorial

racevisionGame/src/main/java/visualiser/gameController/Keys/SailsToggleKey.java

@@ -12,7 +12,7 @@ public class SailsToggleKey extends ControlKey {
      * Constructor for Control
      */
     public SailsToggleKey() {
-        super("Toggle Sails", BoatActionEnum.NOT_A_STATUS);
+        super("Toggle Sails", BoatActionEnum.TOGGLE_SAILS);
     }
 
     /**

racevisionGame/src/main/java/visualiser/gameController/Keys/VMGKey.java

@@ -11,7 +11,7 @@ public class VMGKey extends ControlKey{
      * Constructor for Control
      */
     public VMGKey() {
-        super("VMG", BoatActionEnum.AUTO_PILOT);
+        super("VMG", BoatActionEnum.VMG);
     }
 
     @Override

racevisionGame/src/main/java/visualiser/gameController/Keys/ZoomInKey.java

@@ -1,12 +1,14 @@
 package visualiser.gameController.Keys;
 
+import network.Messages.Enums.BoatActionEnum;
+
 /**
  * key to zoom into the game
  */
 public class ZoomInKey extends ControlKey {
 
     public ZoomInKey() {
-        super("Zoom In");
+        super("Zoom In", BoatActionEnum.ZOOM_IN);
     }
 
     @Override

racevisionGame/src/main/java/visualiser/gameController/Keys/ZoomOutKey.java

@@ -1,5 +1,7 @@
 package visualiser.gameController.Keys;
 
+import network.Messages.Enums.BoatActionEnum;
+
 /**
  * Key to zoom out of the game.
  */
@@ -9,7 +11,7 @@ public class ZoomOutKey extends ControlKey{
      * Constructor for Control
      */
     public ZoomOutKey() {
-        super("Zoom Out");
+        super("Zoom Out", BoatActionEnum.ZOOM_OUT);
     }
 
     @Override