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

Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story13

Browse Source 
# Conflicts:
#	src/main/java/seng302/Controllers/RaceController.java
This commit is contained in:
cbt24
2017-03-17 11:43:30 +13:00
parent 456925c4c6 ddbb77a610
commit 85f4117666
5 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/scenes/racepane.fxml
+1 -1
View File
@@ -11,7 +11,7 @@
<items>
<AnchorPane fx:id="canvasBase" minHeight="0.0" minWidth="0.0">
<children>
<Canvas fx:id="raceMap" height="600.0" width="600.0" />
<Canvas fx:id="raceMap" height="600.0" width="600.0" AnchorPane.bottomAnchor="-202.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="-155.0" AnchorPane.topAnchor="0.0" />
</children>
</AnchorPane>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">