5 Commits (60458f0f7a0872e8d387972450ac65a496d9902d)

Author	SHA1	Message	Date
fjc40	60458f0f7a	Merge commit '7990ac9d2ee8c71d50606813e21a0674f442464f' into story31.2_alternateTack. ... This commit (7990ac9d2e) was the commit from master that story49 was merged into. Everything appears to be working. # Conflicts: # mock/src/main/java/seng302/App.java # mock/src/main/java/seng302/Constants.java # mock/src/main/java/seng302/DataInput/RaceXMLReader.java # mock/src/main/java/seng302/DataInput/RegattaXMLReader.java # mock/src/main/java/seng302/Model/Boat.java # mock/src/main/java/seng302/Model/Event.java # mock/src/main/java/seng302/Model/Race.java # mock/src/test/java/seng302/Data/BoatDataTest.java # mock/src/test/java/seng302/Data/RaceDataTest.java # mock/src/test/java/seng302/Model/BoatTest.java # mock/src/test/java/seng302/Model/RaceXMLTest.java # visualiser/src/main/java/seng302/Controllers/StartController.java # visualiser/src/main/java/seng302/RaceXMLReader.java Manually resolved conflicts. :(	9 years ago
Erika Savell	af3dfbad05	Fixed boats not displayinggit stash ... - Was gps coordinates being initialised with X and Y switched around #story[881]	9 years ago
cbt24	f31a987787	Reads BoatDataSource into StreamedCourseXMLReader so the latter can function as a single source of static information for the race. ... - Mock.StreamedCourseXMLReader populates participant and mark list from BoatDataSource - Added CompoundMarker class to accommodate Mark data from Boat XML - Had to check for Yacht type in Visualiser.BoatXMLReader - Added a missing coordinate value to raceTest.xml - Marker class still exists due to large number of tests, which should be transitioned to CompoundMark - IMPORTANT: race is no longer functional #story[881]	9 years ago
cbt24	9902cec688	Added tests for BoatXMLReader ... - Verifies correct operation on boat and mark reading from boatTest.xml #story[782]	9 years ago
cbt24	69cd44bda8	Reads data from boat XML file ... - Creates marks for building CompoundMarks (formerly Markers) - Rearranged Boat constructor and removed velocity #story[782]	9 years ago