Merge remote-tracking branch 'remotes/origin/temp77' into story77

# Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java # racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml # racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
2017-09-13 15:17:37 +12:00
parent aafc0dc9db
commit 00780e17e9
6 changed files with 66 additions and 7 deletions
@@ -29,7 +29,7 @@ public class MatchBrowserInterface {
    public MatchBrowserInterface() {
        //TODO change to ip of cloud server hosting this
        try {
-            this.IPAddress = InetAddress.getByName("132.181.13.223");
+            this.IPAddress = InetAddress.getLocalHost();//InetAddress.getByName("132.181.13.223");
        } catch (UnknownHostException e) {
            e.printStackTrace();
        }