fanwuyang
/
SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1611 Commits
1 Branch
0 Tags
227 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'main'
${ noResults }
Commit Graph

1611 Commits (main)
 

Author SHA1 Message Date
Erika Savell d1baf021ac Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
Erika Savell 984617ce57 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
Fan-Wu Yang 44a5b9a38f Fixed merge issue
9 years ago
Fan-Wu Yang 84bb4fdb8f Fixed merge issue
9 years ago
Erika Savell 63ee51d938 Fixed compoundMarkID typo that was causing a parse int exception
9 years ago
Fan-Wu Yang 5444b872bd Fixed GPs Coordinates as well as got Boats to display
9 years ago
Joseph Gardner 9eae70fb82 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
Joseph Gardner 32dabdb187 Fixed course xml reader. #story[782]
9 years ago
Fan-Wu Yang 04366c2e4c Fixed small Merge issue
9 years ago
Fan-Wu Yang 0fc1da4090 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
Fan-Wu Yang 560af8c21d Added more data types to Visualiser Input that can be take from InputStream
9 years ago
Joseph Gardner 18e9234240 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
Joseph Gardner f0943d232a Date formatting now supports both old and new formatting and dnf has been added to boat. #story[782]
9 years ago
cbt24 e40bb6c4cb Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
cbt24 2e7527b325 Update boat position according to boat location messages in StreamedRace
9 years ago
Erika Savell 4b485fe5ca Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
Erika Savell 060db182a8 Minor tweaks to get streaming from mock working
9 years ago
Fan-Wu Yang 2c414d3061 Added way to get the Race Status and Boat Status'
9 years ago
Erika Savell 0ef96258ad Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
Joseph Gardner 2a2fe6de59 Race clock now works and the setup for the racestart now checks if the tag has "Start" or "Time". #story[782]
9 years ago
Erika Savell 185c65e54d Editing MockOutput to send actual generated boat/race/regatta xmls
9 years ago
hba56 8bbea28cab refactored the boat message to not use boats
9 years ago
Joseph Gardner 9eefbbd7fa Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
Joseph Gardner 8117e11ff2 Merge branch 'NetworkedVisualiser' into splitIntoTwoModules
9 years ago
Joseph Gardner 41a94495aa Changed the XML reader to take an InputStream rather than InputSource- this has changed everything that used an InputSource to use an InputStream. Made the XML Readers actually read after they received a new InputStream. Changed it so the table updates when the boats in the race change. #pair[jjg64, cbt24] #story[782]
9 years ago
David Wu 4811b7f4ea Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
David Wu 0bfc9a5a39 Added test for race dnf in Race class.
9 years ago
hba56 7cb4b2228d Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
hba56 a271952e0c fixed boat parser for the mock
9 years ago
cbt24 3f42d56502 Merge remote-tracking branch 'remotes/origin/splitIntoTwoModules' into NetworkedVisualiser
9 years ago
cbt24 b1db9ee5be Merge remote-tracking branch 'remotes/origin/splitIntoTwoModules' into NetworkedVisualiser
9 years ago
Erika Savell 69fca43534 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
Erika Savell 9acd519d7b Removed the rest of the shared model classes needed by mock
9 years ago
hba56 cdcbb07dc6 removed unused conversion
9 years ago
hba56 40a7ca808f added .trim to remove the unwanted bytes at the end of xml
9 years ago
cbt24 ccbe467090 Synchronised GUI with VisualiserInput thread.
9 years ago
Erika Savell d34dfc537e Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
Fan-Wu Yang 444a4432c6 Fixed stream from messing up
9 years ago
Erika Savell e927242707 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
Erika Savell 3f748bfdb6 Removed BoatInRace from shared model, refactored
9 years ago
Joseph Gardner 10dd066302 Removed error checking within XML readers and ensured XML readers fail. Did this so an XML reader is not made with an invalid file. #story[782]
9 years ago
Erika Savell 7e569b59b7 Commenting out tests just to get CI working, will investigate on different branch
9 years ago
Erika Savell 2320675b7e Fixing build
9 years ago
Erika Savell 0126d29524 Fixing some of the SharedModel/seng302 import conflicts
9 years ago
Erika Savell c972dd7caf Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
Erika Savell 067beed1e3 Attempted to write test for calls to MockOutput
9 years ago
Erika Savell bbd282bd9b Set race to send out status messages (including boat location details)
9 years ago
Fan-Wu Yang c3717b7fc5 Added Classes to help Visualiser
9 years ago
Connor Taylor-Brown 06e65c2cd2 Generate StreamedCourse from VisualiserInput
9 years ago
Connor Taylor-Brown 68a8f64fd3 Generate StreamedCourse from VisualiserInput
9 years ago