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

138 Commits (fb6420524d3bcaa468bbaa27d68363442b5b68a1)

Author SHA1 Message Date
David Wu 34ef1172ce Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
David Wu bf12f77796 Set it so the lobby view switches to race view depending on the race status passed in by the mock.
9 years ago
hba56 db43acf935 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
hba56 86db16c83d updated the connection scene to let a user add their own connection
9 years ago
David Wu b60b4b257f Remove start button from StartController.
9 years ago
cbt24 cd55052654 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
cbt24 c1fa760dde Streamlined clock handling.
9 years ago
Erika Savell 98723b88d4 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
Erika Savell cfa6ba1c3f Fixed speed notbeing displayed from AC35 live data
9 years ago
Joseph Gardner 618073d04e Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
Joseph Gardner 94ad164a45 Boat table and positions now update. #story[782]
9 years ago
Joseph Gardner e43353c322 Boat table and positions now update. #story[782]
9 years ago
Erika Savell d38baa9fc4 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
cbt24 09483fff2c Added blocking loop to wait
9 years ago
Erika Savell 23dfc6a6bf Fixed annotation toggles displaying behind course
9 years ago
Erika Savell eb58581e83 Fixed velocity issues with mock data
9 years ago
Connor Taylor-Brown 8886b5db05 Fixed RegattaXMLTest.
9 years ago
Connor Taylor-Brown 7d81fc810c Display name of race in lobby.
9 years ago
Connor Taylor-Brown 1723d0c27f Fixed scaling of wakes (note issues with velocity data)
9 years ago
Connor Taylor-Brown 0e1bf64177 Fixed boat track rendering (points were added before boat position set)
9 years ago
Connor Taylor-Brown e7008ab6db Fixed race playback issue, removed obsolete detail from UI.
9 years ago
Connor Taylor-Brown 5a92dd68f5 Fixed build and interface problems.
9 years ago
Connor Taylor-Brown ac4fbda848 Added connection screen to allow users to select available hosts from a preconfigured list.
9 years ago
cbt24 ad58407021 Began work on ConnectionController for selecting active hosts on startup via GUI.
9 years ago
cbt24 577dea2a56 Fixed time zone label on RaceController.
9 years ago
Erika Savell 08f203a0f8 Added race statuses for before the race has started. 3 min -> 1 min is warning, 1 min -> 0 min is preparatory.
9 years ago
Erika Savell 42ad1f78fc Added heading to boatlocation messages
9 years ago
Erika Savell f2e0eec212 Fixed date time parsing problem
9 years ago
Erika Savell 7d1f4209e4 Got mock data being used by visualiser.
9 years ago
Fan-Wu Yang 84bb4fdb8f Fixed merge issue
9 years ago
Fan-Wu Yang 5444b872bd Fixed GPs Coordinates as well as got Boats to display
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 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
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
cbt24 ccbe467090 Synchronised GUI with VisualiserInput thread.
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
Connor Taylor-Brown 06e65c2cd2 Generate StreamedCourse from VisualiserInput
9 years ago
Connor Taylor-Brown 68a8f64fd3 Generate StreamedCourse from VisualiserInput
9 years ago
Joseph Gardner bbd725d069 Merge
9 years ago
Joseph Gardner d977d3f146 Merge branch 'visualiserAndDataLink' into splitIntoTwoModules
9 years ago
Joseph Gardner 39d3cc7c28 Removed boats being able to store colour, this is now down the in the ResizableRaceCanvas. #refactor #story[782]
9 years ago
Joseph Gardner f377cf6471 Changed it so Boat can be used as a superclass for StreamedBoat and BoatInRace properly and removed ConstantVelocityRace. Everything that used to use BoatInRace or StreamedBoat now uses it superclass (boat). #pair[jjg64, cbt24] #refactor #story[782]
9 years ago
cbt24 7d35312644 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
cbt24 5f3f3770bb Temporarily ignore out-of-bound race markers in testing.
9 years ago
Joseph Gardner 3d284c4a2b Merge branch 'splitIntoTwoModules' into visualiserAndDataLink
9 years ago
fjc40 ecebace9f1 Merge branch 'splitIntoTwoModules' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into splitIntoTwoModules
9 years ago
Connor Taylor-Brown 7f273f8ba0 Fixed time source for visualiser, replacing local time
9 years ago
Connor Taylor-Brown 02511db2b9 Implemented marker visualisation from XML in ResizableRaceCanvas
9 years ago
Joseph 033198ca2c Linked the streamedRace course to the visualiser, linked the boats to the visualiser (this needs to be tests) #story[768]
9 years ago
fjc40 06d786d581 Merge remote-tracking branch 'origin/networkingTest' into splitIntoTwoModules
9 years ago
Erika Savell 83dfe1a60c Renamed some directories, optimized imports, general code clean up
9 years ago
Erika Savell 073102d1a3 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
9 years ago
Joseph Gardner c328c4f3bc Linked raceData from new xml formats to current program. Current app now shows the starting list and course boundary. #story[782]
9 years ago
cbt24 cb40302c13 Merge remote-tracking branch 'remotes/origin/story30_XMLs' into splitIntoTwoModules
9 years ago
cbt24 1653003cf0 Implemented Leg generation from Race.xml format
9 years ago
Joseph Gardner 84c518f89f Timer now shows and updates correctly on the start menu. #story[761]
9 years ago
Erika Savell 03f63b2c61 Added boat data xml tests
9 years ago
Joseph Gardner 26380f2677 Merge branch 'story30_XMLs' into splitIntoTwoModules
9 years ago
Joseph Gardner e89a269565 initialised time in raceclock (1 line)
9 years ago
Joseph Gardner a3e87f2c61 Got rid of test using a deprecated method
9 years ago
Joseph Gardner ea79f47c83 Merge branch 'story30_XMLs' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story30_XMLs
9 years ago
Joseph Gardner 3461a2c0b7 Added the ability to reads boats from both race.xml and boat.xml. Linked the two xmls via the StreamedCource class. #story[782]
9 years ago
cbt24 858db3f45e Fixed interface implementation for StreamedCourse
9 years ago
cbt24 a59342a668 Modified RaceClock to support arbitrary start times
9 years ago
hba56 e9578fc63b refactored networking code from networkingTest
9 years ago
hba56 4b5ebbd9e4 refactored networking code from networkingTest branch
9 years ago
Joseph 22075ee415 Started on the boat XML parser, reads only boat data from the XML and makes a StreamedBoat for each boat in the XML. #story[861]
9 years ago
Joseph Gardner 0d0b9e143f Worked on XML reader to read a given race.xml in the format for the AC35. Added the ability to read the course limit and race settings #Pair[jjg64, cbt24] #Story[782]
9 years ago
Joseph Gardner 9e3ca68df8 added skeleton for StreamedRace and StreamedCourse #Pair[jjg64, cbt24] #Story[782]
9 years ago
Joseph Gardner a85bf292d5 new branch for xml readers for the visuliser
9 years ago
Erika Savell a584400e24 Actually added sub modules this time
9 years ago