SENG302

Commit Graph

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	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	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
fjc40	aeee8ca748	Added polar data file. Added PolarParse class - currently commented out as it depends on polar table class. #story[900]	9 years ago
cbt24	9aa4183a7c	Merge remote-tracking branch 'origin/49Mock' into 49Mock	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
Erika Savell	16d3fe2ef2	Added marker boats with correct gps positions into boats xml read by mock #story[881]	9 years ago
Erika Savell	83d6cdbd59	Edited race xml read by mock - It now includes source ids - Legs are in the correct sequence order for the example race #story[881]	9 years ago
cbt24	6e9386f4fb	Switched mock to send out official xmls. - Not reading official xmls yet #story[881], #pair[cbt24, esa46]	9 years ago
Erika Savell	1b6693a19b	Added xml files for mock to read in - In process of switching to reading official xml format instead of our own #story[881]	9 years ago
fjc40	3481a882de	Fixed Team Oracle's boat name in mock data file. #story[778]	9 years ago
Erika Savell	2dab427092	Quick way of adding extra leg to mock data - To be redundant when the mock feed pulls from a proper xml instead of having two parsers #story[778]	9 years ago
Erika Savell	060db182a8	Minor tweaks to get streaming from mock working - Key point there being boats, raceand regatta xml files are being read from mock #story[778]	9 years ago
zwu18	c5df90d276	Created RegattaDataSource and regattaTest.xml. -Event regattaData will now get data from the XML instead of having static data. #story[778]	9 years ago
Erika Savell	c365d5a344	Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock	9 years ago
David Wu	5397d14d3c	Added sourceID to boats in race. -All boats in race will now have a sourceID. -SourceID will be used in XML object for boat. #story[778]	9 years ago
Erika Savell	94ba18cf0c	Began xml creator for race info message #story[778]	9 years ago
Erika Savell	3326da4f5d	Started removing fx component from mock module. - Stuck on animation timer not running #story[778]	9 years ago
Erika Savell	a584400e24	Actually added sub modules this time #story[778]	9 years ago

20 Commits (748a516d162c9ddf04d1d3cd0c7f7d5542e6d0b3)