Merge remote-tracking branch 'remotes/origin/master' into raceView_UI

# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
#	racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml

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

@@ -135,8 +135,9 @@ public class RaceViewController extends Controller {
         deathPane.setVisible(false);
         tutorialCheck();
         initKeypressHandler();
-        initialiseRaceVisuals();
         healthLoop();
+        initialiseRaceVisuals();
+
     }
 
     /**
@@ -316,8 +317,6 @@ public class RaceViewController extends Controller {
         //nextMarkPane.toFront();
         speedometerLoop();
         new Sparkline(this.raceState, this.sparklineChart);
-        timeZone.setText(this.raceState.getRaceClock().getTimeZone());
-        arrowController.setWindProperty(this.raceState.windProperty());
     }
 
 

racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml

@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.image.*?>
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.chart.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
 <?import java.lang.*?>
 <?import javafx.geometry.*?>
 <?import javafx.scene.chart.*?>
@@ -36,7 +29,6 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.StackPane?>
-<?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
 <SplitPane fx:id="racePane" prefHeight="431.0" prefWidth="610.0" visible="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.RaceViewController">
@@ -106,15 +98,11 @@
                         <Image url="@../../images/raceViewUI_LowerLeft.png" />
                      </image>
                   </ImageView>
-                        <Label fx:id="FPS" mouseTransparent="true" text="FPS: 0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
+                        <Label fx:id="FPS" mouseTransparent="true" text="FPS: 0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                             <font>
                                 <Font name="System Bold" size="15.0" />
                             </font>
-                     <padding>
-                        <Insets top="20.0" />
-                     </padding>
                         </Label>
-                        <Label fx:id="timeZone" text="Label" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
                   <GridPane fx:id="playerHealthContainer" prefHeight="75.0" prefWidth="75.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
                     <columnConstraints>
                       <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@@ -126,29 +114,6 @@
                         <Insets left="10.0" top="10.0" />
                      </padding>
                   </GridPane>
-                  <VBox alignment="CENTER" prefHeight="54.0" prefWidth="608.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                     <children>
-
-                                    <Label fx:id="timer" alignment="CENTER" maxHeight="20.0" text="0:0">
-                                  <font>
-                                      <Font name="System Bold" size="15.0" />
-                                  </font>
-                              </Label>
-                              <Label fx:id="timeZone" text="Label">
-                                  <font>
-                                      <Font name="System Bold" size="15.0" />
-                                  </font>
-                              </Label>
-                     </children>
-                  </VBox>
-                        <Label fx:id="FPS" text="FPS: 0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0">
-                            <font>
-                                <Font name="System Bold" size="15.0" />
-                            </font>
-                            <padding>
-                                <Insets bottom="200.0" />
-                            </padding>
-                        </Label>
                         <Label fx:id="tutorialText" alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" style="-fx-border-color: orange; -fx-border-radius: 5px; -fx-background-color: #ffffcc; -fx-text-fill: #3399ff; -fx-border-width: 3; -fx-border-insets: -3;" text="This is the tutorial text" visible="false" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="150.0" AnchorPane.topAnchor="150.0" />
                   <StackPane fx:id="speedPane" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="14.0" AnchorPane.rightAnchor="2.0">
                      <padding>