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 'Story29' into merge_branch_front

Browse Source 
# Conflicts:
#	src/main/java/seng302/App.java
#	src/main/java/seng302/controllers/CanvasController.java
#	src/main/java/seng302/controllers/Controller.java
#	src/main/java/seng302/controllers/RaceViewController.java
#	src/main/java/seng302/models/Boat.java
#	src/main/java/seng302/models/Colors.java
#	src/main/java/seng302/models/Event.java
#	src/main/java/seng302/models/Race.java
#	src/main/java/seng302/models/mark/GateMark.java
#	src/main/java/seng302/models/mark/Mark.java
#	src/main/java/seng302/models/mark/MarkType.java
#	src/main/java/seng302/models/mark/SingleMark.java
#	src/main/java/seng302/models/parsers/CourseParser.java
#	src/main/java/seng302/models/parsers/TeamsParser.java
#	src/main/resources/views/MainView.fxml
#	src/main/resources/views/RaceView.fxml
#	src/test/java/seng302/BoatTest.java
#	src/test/java/seng302/ColorsTest.java
#	src/test/java/seng302/EventTest.java
#	src/test/java/seng302/models/mark/MarkTest.java
#	src/test/java/seng302/models/parsers/CourseParserTest.java
This commit is contained in:
Haoming Yin
2017-05-01 17:06:17 +12:00
parent c80cff87f7 a670f677e9
commit 978493853d
56 changed files with 2729 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/config/course.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<course>
<markers>
<marks>
<gate>
<name type="start-line">Start</name>
@@ -77,4 +77,4 @@
<five>Leeward Gate</five>
<six>Finish</six>
</order>
</course>
</markers>