2 Commits

Author	SHA1	Message	Date
Haoming Yin	978493853d	Merge branch 'Story29' into merge_branch_front ... # 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	2017-05-01 17:06:17 +12:00
Haoming Yin	7f38191d03	Rewrote course parser to parse race xml file specified in AC35 spec. ... #story[828]	2017-04-26 22:52:18 +12:00