michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'story1275_host_customization' into 1273_Skybox

Browse Source 
# Conflicts:
#	src/main/java/seng302/visualiser/GameView3D.java
#	src/main/java/seng302/visualiser/controllers/LobbyController.java
#	src/main/java/seng302/visualiser/controllers/ViewManager.java
#	src/main/resources/views/LobbyView.fxml
#	src/main/resources/views/RaceView.fxml
This commit is contained in:
Calum
2017-09-26 01:19:47 +13:00
parent d0844e861d e990c68d40
commit d9c832168b
71 changed files with 2156 additions and 1847 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/RaceView.fxml
+3 -3
View File
@@ -302,7 +302,7 @@
</StackPane>
</children>
<stylesheets>
<String fx:value="/css/Master.css" />
<String fx:value="/css/RaceView.css" />
<String fx:value="/css/Master.css"/>
<String fx:value="/css/RaceView.css"/>
</stylesheets>
</AnchorPane>
</StackPane>