michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	src/main/java/seng302/visualiser/controllers/RaceViewController.java
This commit is contained in:
William Muir
2017-09-28 15:29:00 +13:00
parent 54410efa12 a9ce8901f5
commit 6d0835b0cf
9 changed files with 42 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/controllers/RaceViewController.java
+3 -8
View File
@@ -73,7 +73,7 @@ public class RaceViewController extends Thread {
private GameView3D gameView;
private RaceState raceState;
private ChatHistory chatHistory;
private Timer timer = new Timer();
private Timer timer = new Timer();
private ClientYacht player;
private JFXDialog finishScreenDialog;
private FinishDialogController finishDialogController;
@@ -146,12 +146,7 @@ public class RaceViewController extends Thread {
contentStackPane.setVisible(true);
miniMapPane.setVisible(true);
miniMapButton.setVisible(true);
Platform.runLater(new Runnable() {
@Override
public void run() {
contentStackPane.requestFocus();
}
});
Platform.runLater(() -> contentStackPane.requestFocus());
}
/**
@@ -288,7 +283,7 @@ public class RaceViewController extends Thread {
}
}
public void removeIcon(ClientYacht yacht) {
private void removeIcon(ClientYacht yacht) {
if (yacht == player) {
blinkingTimer.cancel();
iconToDisplay.setVisible(false);