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

# Conflicts:
#	src/main/resources/views/RaceView.fxml
This commit is contained in:
Zhi You Tan
2017-09-22 21:22:06 +12:00
35 changed files with 267 additions and 189 deletions
@@ -338,6 +338,8 @@ public class ViewManager {
stage.setMinHeight(500);
stage.setMinWidth(800);
stage.setTitle("Party Parrots At Sea");
stage.getIcons().add(new Image(getClass().getResourceAsStream("/PP.png")));
stage.setOnCloseRequest(e -> closeAll());
stage.setScene(scene);
stage.show();