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
2017-09-28 11:32:39 +13:00
parent 58cde8ce44
commit fb8f1640ac
2 changed files with 3 additions and 39 deletions
@@ -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());
    }