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

Merged master into branch. #story[1301]

Browse Source
This commit is contained in:
David Wu
2017-09-28 13:48:25 +13:00
parent 52da88b1a1
commit bab7749138
5 changed files with 271 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
-2
View File
@@ -137,7 +137,6 @@ public class TitleController extends Controller {
*/
public void setDayMode(){
dayModeRD.getScene().getStylesheets().clear();
menuPane.getStylesheets().clear();
dayModeRD.getScene().getStylesheets().add("/css/dayMode.css");
nightModeRD.setSelected(false);
App.dayMode = true;
@@ -148,7 +147,6 @@ public class TitleController extends Controller {
*/
public void setNightMode(){
nightModeRD.getScene().getStylesheets().clear();
menuPane.getStylesheets().clear();
nightModeRD.getScene().getStylesheets().add("/css/nightMode.css");
dayModeRD.setSelected(false);
App.dayMode = false;
racevisionGame/src/main/resources/css/dayMode.css
+18
View File
@@ -317,3 +317,21 @@
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
#startButton {
-fx-background-image: url("/visualiser/images/startBtn.png");
-fx-background-size: 115px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
#startButton:pressed {
-fx-background-image: url("/visualiser/images/startBtnPressed.png");
-fx-background-size: 115px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
racevisionGame/src/main/resources/css/nightMode.css
+233
View File
@@ -102,3 +102,236 @@
-fx-border-color: #012256;
-fx-border-width: 3;
}
/* Title menu buttons */
#hostAGameBtn {
-fx-background-image: url("/visualiser/images/hostAGameBtn.png");
-fx-background-size: 150px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
#hostAGameBtn:pressed {
-fx-background-image: url("/visualiser/images/hostAGameBtnPressed.png");
-fx-background-size: 150px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
#btnJoin {
-fx-background-image: url("/visualiser/images/JoinAGameBtn.png");
-fx-background-size: 150px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
#btnJoin:pressed {
-fx-background-image: url("/visualiser/images/JoinAGameBtnPressed.png");
-fx-background-size: 150px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
#tutorialButton {
-fx-background-image: url("/visualiser/images/howToPlayBtn.png");
-fx-background-size: 150px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
#tutorialButton:pressed {
-fx-background-image: url("/visualiser/images/howToPlayBtnPressed.png");
-fx-background-size: 150px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
#controlsBtn {
-fx-background-image: url("/visualiser/images/controlsBtn.png");
-fx-background-size: 150px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
#controlsBtn:pressed {
-fx-background-image: url("/visualiser/images/controlsBtnPressed.png");
-fx-background-size: 150px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
/* host game lobby buttons */
#hostGameBtn {
-fx-background-image: url("/visualiser/images/startGameBtn.png");
-fx-background-size: 150px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
#hostGameBtn:pressed {
-fx-background-image: url("/visualiser/images/startGameBtnPressed.png");
-fx-background-size: 150px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
#mainMenuBtn {
-fx-background-image: url("/visualiser/images/mainMenuBtn.png");
-fx-background-size: 115px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
#mainMenuBtn:pressed {
-fx-background-image: url("/visualiser/images/mainMenuBtnPressed.png");
-fx-background-size: 115px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
/* match browsing lobby buttons */
#addBtn {
-fx-background-image: url("/visualiser/images/addBtn.png");
-fx-background-size: 115px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
#addBtn:pressed {
-fx-background-image: url("/visualiser/images/addBtnPressed.png");
-fx-background-size: 115px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
#refreshBtn {
-fx-background-image: url("/visualiser/images/refreshBtn.png");
-fx-background-size: 115px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
#refreshBtn:pressed {
-fx-background-image: url("/visualiser/images/refreshBtnPressed.png");
-fx-background-size: 115px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
#refreshBtn {
-fx-background-image: url("/visualiser/images/refreshBtn.png");
-fx-background-size: 115px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
#joinGameBtn {
-fx-background-image: url("/visualiser/images/participateBtn.png");
-fx-background-size: 115px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
#joinGameBtn:pressed {
-fx-background-image: url("/visualiser/images/participateBtnPressed.png");
-fx-background-size: 115px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
#spectateButton {
-fx-background-image: url("/visualiser/images/spectateBtn.png");
-fx-background-size: 115px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
#spectateButton:pressed {
-fx-background-image: url("/visualiser/images/spectateBtnPressed.png");
-fx-background-size: 115px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
/* in-game lobby buttons */
#quitBtn {
-fx-background-image: url("/visualiser/images/quitBtn.png");
-fx-background-size: 115px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
#quitBtn:pressed {
-fx-background-image: url("/visualiser/images/quitBtnPressed.png");
-fx-background-size: 115px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
#startButton {
-fx-background-image: url("/visualiser/images/startBtn.png");
-fx-background-size: 115px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
#startButton:pressed {
-fx-background-image: url("/visualiser/images/startBtnPressed.png");
-fx-background-size: 115px;
-fx-background-repeat: no-repeat;
-fx-background-position: center center;
-fx-focus-color: transparent;
-fx-background-color: transparent;
}
racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
+8 -3
View File
@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import java.lang.*?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
@@ -9,11 +14,11 @@
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.text.Font?>
<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);" xmlns="http://javafx.com/javafx/8.0.112" 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);" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.InGameLobbyController">
<children>
<GridPane style="-fx-background-color: #f1f1d4;" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children>
<Button fx:id="quitBtn" maxHeight="500.0" maxWidth="125.0" mnemonicParsing="false" onAction="#menuBtnPressed" GridPane.rowIndex="2">
<Button fx:id="quitBtn" maxHeight="50.0" maxWidth="125.0" mnemonicParsing="false" onAction="#menuBtnPressed" GridPane.rowIndex="2">
<GridPane.margin>
<Insets left="20.0" />
</GridPane.margin>
@@ -66,7 +71,7 @@
<Font name="Cabin-Bold" size="17.0" />
</font>
</Label>
<Button fx:id="startButton" disable="true" mnemonicParsing="false" onAction="#startBtnPressed" text="Start!" visible="false" GridPane.columnIndex="2" GridPane.rowIndex="2" />
<Button fx:id="startButton" disable="true" maxHeight="50.0" maxWidth="125.0" mnemonicParsing="false" onAction="#startBtnPressed" visible="false" GridPane.columnIndex="2" GridPane.rowIndex="2" />
</children>
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
racevisionGame/src/main/resources/visualiser/scenes/hostGame.fxml
+12 -6
View File
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import java.lang.*?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
@@ -11,7 +17,7 @@
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.text.Font?>
<AnchorPane fx:id="hostWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" style="-fx-background-color: #f1f1d4;" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.HostGameController">
<AnchorPane fx:id="hostWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" style="-fx-background-color: #f1f1d4;" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.HostGameController">
<children>
<GridPane layoutY="14.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<columnConstraints>
@@ -20,13 +26,13 @@
<ColumnConstraints hgrow="NEVER" prefWidth="170.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints prefHeight="50.0" vgrow="NEVER" />
<RowConstraints prefHeight="419.5" vgrow="NEVER" />
<RowConstraints prefHeight="50.0" vgrow="NEVER" />
<RowConstraints prefHeight="80.0" vgrow="NEVER" />
<RowConstraints maxHeight="82.0" minHeight="56.0" prefHeight="78.0" vgrow="NEVER" />
<RowConstraints maxHeight="414.0" minHeight="359.0" prefHeight="359.0" vgrow="NEVER" />
<RowConstraints maxHeight="81.0" minHeight="14.0" prefHeight="55.0" vgrow="NEVER" />
<RowConstraints maxHeight="138.0" minHeight="86.0" prefHeight="108.0" vgrow="NEVER" />
</rowConstraints>
<children>
<Button fx:id="hostGameBtn" maxHeight="80.0" maxWidth="200.0" mnemonicParsing="false" onAction="#hostGamePressed" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="CENTER">
<Button fx:id="hostGameBtn" maxHeight="80.0" maxWidth="200.0" mnemonicParsing="false" onAction="#hostGamePressed" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER">
<font>
<Font size="20.0" />
</font>