55 Commits (69cd44bda8afbea9b47c2d9f1f06effa7b783a52)

Author SHA1 Message Date
Jessica McAuslin 2d983eccfd General code tidy up
9 years ago
fjc40 a32775eab6 Fixed a few javadoc issues.
9 years ago
fjc40 b247244665 Did some large tidy ups, refactoring, and documenting.
9 years ago
fjc40 466e22437b Visualiser. The nullptr issues relating to the XML data files appears to be fixed. Essentially, the StartController.startRaceNoScaling() function was being called as soon possible, before it was even ready - setRaceClock either hadn't been called or hadn't finished executing yet, so the StartController.raceClock member was null, causing crashes.
9 years ago
fjc40 020c0329b0 Merge remote-tracking branch 'origin/TCPDisconnection' into submission
9 years ago
fjc40 83ce9b99d2 Mockoutput's main loop now pops messages off the message queue, rather than iterating over it like an array, and clearing it (this could have threading issues where the iteration starts (with e.g., 5 messages), as it is sending the messages another one is added, and then it ends up clearing the sent messages, and the unsent message.
9 years ago
David Wu 61ecdc2269 Merge branch 'submission' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into submission
9 years ago
David Wu 61afe8d608 Created finish view to see when a race finishes.
9 years ago
cbt24 a6adfb4960 Refactored RaceClock to act as central source of time and duration information throughout visualiser.
9 years ago
Fan-Wu Yang bdf215d0f1 TCP connection at the front menu will no longer bug out if the socket is bugged.
9 years ago
Fan-Wu Yang a20dafea11 Annotations go on top and boundaries now update
9 years ago
Fan-Wu Yang 565b7adaa2 Merge remote-tracking branch 'origin/race-timer-fixes' into layeredCanvas
9 years ago
Fan-Wu Yang 862391d7ef Canvas Layer Created
9 years ago
cbt24 349bd50094 Everything works, don't ask questions
9 years ago
hba56 6888d0bddc fixed all java doc errors
9 years ago
hba56 e409c8752c Fix for now - Need to change
9 years ago
cbt24 89ba0f278d Fixed StartController countdown
9 years ago
cbt24 17afd9f775 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
cbt24 336a15d1a2 Fixed StartController countdown
9 years ago
hba56 1f8941e37c Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
hba56 ccd90b91d7 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
hba56 62ecd40967 fixed all java doc errors
9 years ago
David Wu 545ef7aa7f Fix lobby not entering race when race status is "started".
9 years ago
cbt24 e345f08ad8 Fixed AC35 stream crashing before status sent.
9 years ago
David Wu 88bb568ec7 Set it so the lobby view switches to race view depending on the race status passed in by the mock.
9 years ago
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 23dfc6a6bf Fixed annotation toggles displaying behind course
9 years ago
Connor Taylor-Brown 7d81fc810c Display name of race in lobby.
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 f2e0eec212 Fixed date time parsing problem
9 years ago
Erika Savell 7d1f4209e4 Got mock data being used by visualiser.
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
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
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 ccbe467090 Synchronised GUI with VisualiserInput thread.
9 years ago
Joseph Gardner d977d3f146 Merge branch 'visualiserAndDataLink' into splitIntoTwoModules
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
fjc40 ecebace9f1 Merge branch 'splitIntoTwoModules' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into splitIntoTwoModules
9 years ago
Connor Taylor-Brown 02511db2b9 Implemented marker visualisation from XML in ResizableRaceCanvas
9 years ago