From 7cea1fb11c5d8bfe06d52e27faac56334343c01a Mon Sep 17 00:00:00 2001
From: David Wu <zwu18@uclive.ac.nz>
Date: Wed, 13 Sep 2017 12:20:42 +1200
Subject: [PATCH] Reworking fxml for lobby.

---
 .../visualiser/Controllers/RaceController.java     |  2 +-
 .../visualiser/network/MatchBrowserInterface.java  |  2 +-
 .../resources/visualiser/scenes/gameLobby.fxml     |  4 ++--
 settings/keyBindings.xml                           | 14 +++++++-------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
index f4eacb5e..47bae7e6 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
@@ -667,7 +667,7 @@ public class RaceController extends Controller {
                 //Set next key to press as the zoom-out key
                 searchMapForKey("Zoom Out");
                 //Update tutorial text
-                tutorialText.setText("Nice! You will also be able to zoom into boats and marks by clicking them. To zoom out press " + keyToPress + ".");
+                tutorialText.setText("Nice! You will also be able to zoom into boats and marks by clicking them. \nTo zoom out press " + keyToPress + ".");
                 updateTutorialState();
                 break;
             case ZOOMOUT:
diff --git a/racevisionGame/src/main/java/visualiser/network/MatchBrowserInterface.java b/racevisionGame/src/main/java/visualiser/network/MatchBrowserInterface.java
index 85f22230..e6777c87 100644
--- a/racevisionGame/src/main/java/visualiser/network/MatchBrowserInterface.java
+++ b/racevisionGame/src/main/java/visualiser/network/MatchBrowserInterface.java
@@ -29,7 +29,7 @@ public class MatchBrowserInterface {
     public MatchBrowserInterface() {
         //TODO change to ip of cloud server hosting this
         try {
-            this.IPAddress = InetAddress.getByName("localhost");
+            this.IPAddress = InetAddress.getByName("132.181.13.223");
         } catch (UnknownHostException e) {
             e.printStackTrace();
         }
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml b/racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
index 49b1bce3..920b83cf 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
@@ -20,9 +20,9 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="gameLobbyWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" visible="false" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.InGameLobbyController">
+<AnchorPane fx:id="gameLobbyWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" style="-fx-background-color: rgba(100, 100, 100, 0.2); -fx-border-color: black; -fx-border-width: 5;" visible="false" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.InGameLobbyController">
     <children>
-      <GridPane style="-fx-background-color: rgba(0, 0, 0, 0.5);" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <GridPane style="-fx-background-color: rgba(0, 0, 0, 0.3);" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
             <Button mnemonicParsing="false" onAction="#menuBtnPressed" text="Quit" GridPane.rowIndex="2">
                <GridPane.margin>
diff --git a/settings/keyBindings.xml b/settings/keyBindings.xml
index 8aa46d6c..2b807e17 100644
--- a/settings/keyBindings.xml
+++ b/settings/keyBindings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<java version="1.8.0_144" class="java.beans.XMLDecoder">
+<java version="1.8.0_111" class="java.beans.XMLDecoder">
  <object class="java.util.HashMap">
   <void method="put">
    <string>SPACE</string>
@@ -10,8 +10,8 @@
    <object class="visualiser.gameController.Keys.SailsToggleKey"/>
   </void>
   <void method="put">
-   <string>LEFT</string>
-   <object class="visualiser.gameController.Keys.UpWindKey"/>
+   <string>DOWN</string>
+   <object class="visualiser.gameController.Keys.DownWindKey"/>
   </void>
   <void method="put">
    <string>X</string>
@@ -21,13 +21,13 @@
    <string>ENTER</string>
    <object class="visualiser.gameController.Keys.TackGybeKey"/>
   </void>
-  <void method="put">
-   <string>RIGHT</string>
-   <object class="visualiser.gameController.Keys.DownWindKey"/>
-  </void>
   <void method="put">
    <string>Z</string>
    <object class="visualiser.gameController.Keys.ZoomInKey"/>
   </void>
+  <void method="put">
+   <string>UP</string>
+   <object class="visualiser.gameController.Keys.UpWindKey"/>
+  </void>
  </object>
 </java>