fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reworking fxml for lobby.

Browse Source
This commit is contained in:
David Wu
2017-09-13 12:20:42 +12:00
parent 4adcd6322c
commit 7cea1fb11c
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
+1 -1
View File
@@ -667,7 +667,7 @@ public class RaceController extends Controller {
//Set next key to press as the zoom-out key //Set next key to press as the zoom-out key
searchMapForKey("Zoom Out"); searchMapForKey("Zoom Out");
//Update tutorial text //Update tutorial text
tutorialText.setText("Nice! You will also be able to zoom into boats and marks by clicking them. To zoom out press " + keyToPress + "."); tutorialText.setText("Nice! You will also be able to zoom into boats and marks by clicking them. \nTo zoom out press " + keyToPress + ".");
updateTutorialState(); updateTutorialState();
break; break;
case ZOOMOUT: case ZOOMOUT:
racevisionGame/src/main/java/visualiser/network/MatchBrowserInterface.java
+1 -1
View File
@@ -29,7 +29,7 @@ public class MatchBrowserInterface {
public MatchBrowserInterface() { public MatchBrowserInterface() {
//TODO change to ip of cloud server hosting this //TODO change to ip of cloud server hosting this
try { try {
this.IPAddress = InetAddress.getByName("localhost"); this.IPAddress = InetAddress.getByName("132.181.13.223");
} catch (UnknownHostException e) { } catch (UnknownHostException e) {
e.printStackTrace(); e.printStackTrace();
} }
racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
+2 -2
View File
@@ -20,9 +20,9 @@
<?import javafx.scene.layout.RowConstraints?> <?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<AnchorPane fx:id="gameLobbyWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" visible="false" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.InGameLobbyController"> <AnchorPane fx:id="gameLobbyWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" style="-fx-background-color: rgba(100, 100, 100, 0.2); -fx-border-color: black; -fx-border-width: 5;" visible="false" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.InGameLobbyController">
<children> <children>
<GridPane style="-fx-background-color: rgba(0, 0, 0, 0.5);" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> <GridPane style="-fx-background-color: rgba(0, 0, 0, 0.3);" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children> <children>
<Button mnemonicParsing="false" onAction="#menuBtnPressed" text="Quit" GridPane.rowIndex="2"> <Button mnemonicParsing="false" onAction="#menuBtnPressed" text="Quit" GridPane.rowIndex="2">
<GridPane.margin> <GridPane.margin>
settings/keyBindings.xml
+7 -7
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<java version="1.8.0_144" class="java.beans.XMLDecoder"> <java version="1.8.0_111" class="java.beans.XMLDecoder">
<object class="java.util.HashMap"> <object class="java.util.HashMap">
<void method="put"> <void method="put">
<string>SPACE</string> <string>SPACE</string>
@@ -10,8 +10,8 @@
<object class="visualiser.gameController.Keys.SailsToggleKey"/> <object class="visualiser.gameController.Keys.SailsToggleKey"/>
</void> </void>
<void method="put"> <void method="put">
<string>LEFT</string> <string>DOWN</string>
<object class="visualiser.gameController.Keys.UpWindKey"/> <object class="visualiser.gameController.Keys.DownWindKey"/>
</void> </void>
<void method="put"> <void method="put">
<string>X</string> <string>X</string>
@@ -21,13 +21,13 @@
<string>ENTER</string> <string>ENTER</string>
<object class="visualiser.gameController.Keys.TackGybeKey"/> <object class="visualiser.gameController.Keys.TackGybeKey"/>
</void> </void>
<void method="put">
<string>RIGHT</string>
<object class="visualiser.gameController.Keys.DownWindKey"/>
</void>
<void method="put"> <void method="put">
<string>Z</string> <string>Z</string>
<object class="visualiser.gameController.Keys.ZoomInKey"/> <object class="visualiser.gameController.Keys.ZoomInKey"/>
</void> </void>
<void method="put">
<string>UP</string>
<object class="visualiser.gameController.Keys.UpWindKey"/>
</void>
</object> </object>
</java> </java>