From eda7d062ec4f9608ee2e2d5932cc720bbd79fe90 Mon Sep 17 00:00:00 2001
From: hba56 <hba56@uclive.ac.nz>
Date: Mon, 24 Jul 2017 12:12:12 +1200
Subject: [PATCH] merged in the changes from the master branch so that latter
 mergers can run smoothly #story[1087]

---
 .../src/main/resources/visualiser}/scenes/hostgame.fxml         | 2 +-
 .../src/main/resources/visualiser}/scenes/lobby.fxml            | 2 +-
 .../src/main/resources/visualiser}/scenes/title.fxml            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename {visualiser/src/main/resources => racevisionGame/src/main/resources/visualiser}/scenes/hostgame.fxml (94%)
 rename {visualiser/src/main/resources => racevisionGame/src/main/resources/visualiser}/scenes/lobby.fxml (96%)
 rename {visualiser/src/main/resources => racevisionGame/src/main/resources/visualiser}/scenes/title.fxml (96%)

diff --git a/visualiser/src/main/resources/scenes/hostgame.fxml b/racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
similarity index 94%
rename from visualiser/src/main/resources/scenes/hostgame.fxml
rename to racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
index 5302dd4c..dc991518 100644
--- a/visualiser/src/main/resources/scenes/hostgame.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="connectionWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.Controllers.ConnectionController">
+<AnchorPane fx:id="connectionWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.ConnectionController">
    <children>
       <GridPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <columnConstraints>
diff --git a/visualiser/src/main/resources/scenes/lobby.fxml b/racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml
similarity index 96%
rename from visualiser/src/main/resources/scenes/lobby.fxml
rename to racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml
index 156ea205..1dd34e7d 100644
--- a/visualiser/src/main/resources/scenes/lobby.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml
@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="connectionWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.Controllers.ConnectionController">
+<AnchorPane fx:id="connectionWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.ConnectionController">
    <children>
       <GridPane fx:id="connection" prefHeight="600.0" prefWidth="780.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <columnConstraints>
diff --git a/visualiser/src/main/resources/scenes/title.fxml b/racevisionGame/src/main/resources/visualiser/scenes/title.fxml
similarity index 96%
rename from visualiser/src/main/resources/scenes/title.fxml
rename to racevisionGame/src/main/resources/visualiser/scenes/title.fxml
index aaa4baa8..f87d14d4 100644
--- a/visualiser/src/main/resources/scenes/title.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/title.fxml
@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="connectionWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.Controllers.ConnectionController">
+<AnchorPane fx:id="connectionWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.ConnectionController">
    <children>
       <GridPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <columnConstraints>