From 66699a4660e9f6272580137d82c3fac9bc4c4263 Mon Sep 17 00:00:00 2001 From: hba56 Date: Fri, 1 Sep 2017 14:31:01 +1200 Subject: [PATCH 01/15] Added a draft for a new Course layout #story[1193] --- .../resources/mock/mockXML/oMapLayout.xml | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 racevisionGame/src/main/resources/mock/mockXML/oMapLayout.xml diff --git a/racevisionGame/src/main/resources/mock/mockXML/oMapLayout.xml b/racevisionGame/src/main/resources/mock/mockXML/oMapLayout.xml new file mode 100644 index 00000000..b8cbf54a --- /dev/null +++ b/racevisionGame/src/main/resources/mock/mockXML/oMapLayout.xml @@ -0,0 +1,54 @@ + + + 5326 + FLEET + RACE_CREATION_TIME + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 8287fbf6ba6917aa490ae8ca664fa1dcd0143a6e Mon Sep 17 00:00:00 2001 From: hba56 Date: Mon, 4 Sep 2017 15:05:31 +1200 Subject: [PATCH 02/15] Updated the HostGame window to support maps #story[1193] --- .../Controllers/HostController.java | 11 ++++++ .../resources/visualiser/scenes/hostgame.fxml | 36 +++++++++++++------ 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java index 1609e700..993847cb 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java @@ -1,7 +1,9 @@ package visualiser.Controllers; import javafx.fxml.FXML; +import javafx.scene.control.Button; import javafx.scene.control.TextField; +import javafx.scene.image.ImageView; import javafx.scene.layout.AnchorPane; import mock.app.Event; import org.xml.sax.SAXException; @@ -35,6 +37,15 @@ public class HostController extends Controller { @FXML AnchorPane hostWrapper; + @FXML + Button previousButton; + + @FXML + Button nextButton; + + @FXML + ImageView mapImage; + private Event game; diff --git a/racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml b/racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml index ced36627..cb830237 100644 --- a/racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml +++ b/racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml @@ -1,39 +1,55 @@ + + + + + - + + - + - - + + - - + + - -