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

Merge remote-tracking branch 'remotes/origin/master' into minimap_test

Browse Source
This commit is contained in:
hba56
2017-09-20 23:46:02 +12:00
parent b787b5a71b 951c3771fa
commit dacaf58271
28 changed files with 612 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml
+31 -26
View File
@@ -10,6 +10,7 @@
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
<AnchorPane fx:id="lobbyWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.LobbyController">
@@ -40,30 +41,6 @@
<Font size="36.0" />
</font>
</Label>
<GridPane fx:id="buttonsGridPane" GridPane.columnIndex="1" GridPane.rowIndex="2">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Button fx:id="joinGameBtn" mnemonicParsing="false" onAction="#connectSocket" text="Connect to Game" GridPane.columnIndex="2">
<GridPane.margin>
<Insets right="20.0" />
</GridPane.margin></Button>
<Button mnemonicParsing="false" onAction="#refreshBtnPressed" text="Refresh" GridPane.columnIndex="1">
<GridPane.margin>
<Insets left="10.0" right="10.0" />
</GridPane.margin></Button>
<Button mnemonicParsing="false" onAction="#addConnectionPressed" text="Add">
<GridPane.margin>
<Insets left="20.0" />
</GridPane.margin></Button>
</children>
</GridPane>
<GridPane fx:id="ipPortGridPane" GridPane.rowIndex="2">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
@@ -79,16 +56,44 @@
</GridPane.margin>
<opaqueInsets>
<Insets />
</opaqueInsets></TextField>
</opaqueInsets>
</TextField>
<TextField fx:id="portFld" promptText="Port Number" GridPane.columnIndex="1">
<GridPane.margin>
<Insets left="20.0" right="20.0" />
</GridPane.margin></TextField>
</GridPane.margin>
</TextField>
</children>
<GridPane.margin>
<Insets />
</GridPane.margin>
</GridPane>
<GridPane fx:id="buttonsGridPane" GridPane.columnIndex="1" GridPane.rowIndex="2">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Button mnemonicParsing="false" onAction="#refreshBtnPressed" text="Refresh" GridPane.columnIndex="1">
<GridPane.margin>
<Insets left="10.0" right="10.0" />
</GridPane.margin></Button>
<Button mnemonicParsing="false" onAction="#addConnectionPressed" text="Add">
<GridPane.margin>
<Insets left="20.0" />
</GridPane.margin></Button>
<VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0" spacing="8.0" GridPane.columnIndex="2">
<children>
<Button fx:id="joinGameBtn" mnemonicParsing="false" onAction="#connectParticipate" text="Participate!" />
<Button fx:id="spectateButton" mnemonicParsing="false" onAction="#connectSpectate" text="Spectate!" />
</children>
</VBox>
</children>
</GridPane>
<Button mnemonicParsing="false" onAction="#menuBtnPressed" text="Main Menu">
<GridPane.margin>
<Insets left="50.0" />