10 Commits (37828ef0fee086dad5755d3b39670b6f33c425e1)

Author	SHA1	Message	Date
Fan-Wu Yang	a3ccd75f4c	Merge remote-tracking branch 'origin/sprint4_master' into Story877 ... # Conflicts: # mock/src/main/java/seng302/DataInput/BoatXMLReader.java # mock/src/main/java/seng302/DataInput/XMLReader.java # mock/src/main/java/seng302/Model/Boat.java # mock/src/main/java/seng302/Model/CompoundMark.java # mock/src/main/java/seng302/Model/Leg.java # mock/src/main/java/seng302/Model/Mark.java # mock/src/main/java/seng302/Model/Marker.java # mock/src/main/java/seng302/Model/Race.java # mock/src/test/java/seng302/Model/LegTest.java # visualiser/src/main/java/seng302/Controllers/RaceController.java # visualiser/src/main/java/seng302/Mock/StreamedRace.java # visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java # visualiser/src/main/resources/scenes/race.fxml	9 years ago
Fan-Wu Yang	671d62aeb1	Added Important and Partial Annotations and other refactors and documentation. ... - Important, Partial, Hidden, Visible are all radiobuttons - Fixed bug where the Visualiser would end the race before the last boat had finished - Refactored the visualiser and the mock to use the race finished status message - Added and Changed many Javadocs #story[877]	9 years ago
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
fjc40	be9f19eae5	Mock.Polars: ... Finished PolarsTest test cases. Fixed a number of javadoc errors across the codebase. #story[873]	9 years ago
Fan-Wu Yang	b065b8d9c7	Merged Mock49 and fixed bugs ... - Error where mock would not read in the files when running from the jar. - Error where the AC35 stream now no longer sends us packets with information that is set for 0 for boat location. #story[881] #pair[fwy13, esa46	9 years ago
Erika Savell	fd036c1835	Refactored countdown timer in race class ... - Also fixed all boats having ame velocity #story[881]	9 years ago
Erika Savell	ffa3d530ae	Event takes string and sets time of race ... - RaceXmlReaders can handle strings now - Not working with visualiser, gps coords may be worng #story[881]	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
David Wu	a95a0c2543	Added documentation for multiple classes. ... #Story[782]	9 years ago
Erika Savell	83dfe1a60c	Renamed some directories, optimized imports, general code clean up ... #story[778]	9 years ago