Fixed and merged heading-visualisation

- Fixed the boats not appearing at the starting line.
- Merged with master
#story[24]
This commit is contained in:
Fan-Wu Yang
2017-03-29 16:46:23 +13:00
parent edd9c2a48d
commit 6ffe3d02a3
7 changed files with 30 additions and 34 deletions
+6 -6
View File
@@ -2,37 +2,37 @@
<boats>
<boat>
<name>ORACLE TEAM USA</name>
<speed>300</speed>
<speed>30</speed>
<abbr>USA</abbr>
<colour>BLUEVIOLET</colour>
</boat>
<boat>
<name>Land Rover BAR</name>
<speed>500</speed>
<speed>50</speed>
<abbr>GBR</abbr>
<colour>BLACK</colour>
</boat>
<boat>
<name>SoftBank Team Japan</name>
<speed>400</speed>
<speed>40</speed>
<abbr>JPN</abbr>
<colour>RED</colour>
</boat>
<boat>
<name>Groupama Team France</name>
<speed>350</speed>
<speed>35</speed>
<abbr>FRA</abbr>
<colour>ORANGE</colour>
</boat>
<boat>
<name>Artemis Racing</name>
<speed>440</speed>
<speed>44</speed>
<abbr>SWE</abbr>
<colour>DARKOLIVEGREEN</colour>
</boat>
<boat>
<name>Emirates Team New Zealand</name>
<speed>620</speed>
<speed>62</speed>
<abbr>NZL</abbr>
<colour>LIMEGREEN</colour>
</boat>
-1
View File
@@ -98,5 +98,4 @@
</items>
</SplitPane>
</children>
>>>>>>> Temporary merge branch 2
</AnchorPane>