SENG302

Commit Graph

Author	SHA1	Message	Date
Fan-Wu Yang	bdf215d0f1	TCP connection at the front menu will no longer bug out if the socket is bugged. - Timeout set on connection socket so that the socket will return false after 5 seconds. #story[782]	9 years ago
Fan-Wu Yang	a20dafea11	Annotations go on top and boundaries now update - Fixed FPS and other annotations being hidden under the map - Fixed boundaries not updating with the visualiser. #story[782]	9 years ago
Fan-Wu Yang	565b7adaa2	Merge remote-tracking branch 'origin/race-timer-fixes' into layeredCanvas # Conflicts: # visualiser/src/main/java/seng302/Controllers/StartController.java	9 years ago
Fan-Wu Yang	862391d7ef	Canvas Layer Created - Canvas is created via layering. - Resizable canvas is now a seperate abstract class #story[782]	9 years ago
cbt24	349bd50094	Everything works, don't ask questions #story[782]	9 years ago
hba56	6888d0bddc	fixed all java doc errors #story[782]	9 years ago
hba56	e409c8752c	Fix for now - Need to change	9 years ago
cbt24	89ba0f278d	Fixed StartController countdown - Removed obsolete timer related code - Consistently use RaceClock throughout StartController #story[782]	9 years ago
cbt24	17afd9f775	Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules # Conflicts: # visualiser/src/main/java/seng302/Controllers/StartController.java	9 years ago
cbt24	336a15d1a2	Fixed StartController countdown - Removed obsolete timer related code - Consistently use RaceClock throughout StartController #story[782]	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 #story[782]	9 years ago
David Wu	545ef7aa7f	Fix lobby not entering race when race status is "started". -Race was previously stuck in lobby screen when race status was not 2. #Story[782]	9 years ago
cbt24	e345f08ad8	Fixed AC35 stream crashing before status sent. #story[782]	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. -Removed start button in lobby as it should be automatic. -TODO: Synchronize the times across the whole race as they do not matching. #Story[782]	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. -Removed start button in lobby as it should be automatic. -TODO: Synchronize the times across the whole race as they do not matching. #Story[782]	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 -added textfields to the fxml -added scaling to the connection scene(in mainController) -added a newConnection method and a method for getting the wrapper anchor pane #story[782]	9 years ago
David Wu	b60b4b257f	Remove start button from StartController. #story[778]	9 years ago
cbt24	cd55052654	Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules	9 years ago
cbt24	c1fa760dde	Streamlined clock handling. - Set starting time from network - Update RaceClock instance to current time from network #story[782]	9 years ago
Erika Savell	23dfc6a6bf	Fixed annotation toggles displaying behind course #story[782]	9 years ago
Connor Taylor-Brown	7d81fc810c	Display name of race in lobby. - Moved Regatta properties and accessors to RegattaXMLReader - StartController update now tolerates any permutation of types of XML messages #story[782]	9 years ago
Connor Taylor-Brown	e7008ab6db	Fixed race playback issue, removed obsolete detail from UI. - Removed race scaling options - Refactored start screen timer formatting for clarity - Removed incomplete countdownTimer override in Streamed Race #story[782]	9 years ago
Connor Taylor-Brown	5a92dd68f5	Fixed build and interface problems. - Ignore online host test (fails on CI) - Disable connect button on startup to prevent bad socket #story[782]	9 years ago
Connor Taylor-Brown	ac4fbda848	Added connection screen to allow users to select available hosts from a preconfigured list. - Added ConnectionController for initial client setup - Added RaceConnection class for socket data and checking - Configures StartController with a socket drawn from a host table #story[782]	9 years ago
cbt24	ad58407021	Began work on ConnectionController for selecting active hosts on startup via GUI. #story[782]	9 years ago
cbt24	577dea2a56	Fixed time zone label on RaceController. #story[782]	9 years ago
Erika Savell	f2e0eec212	Fixed date time parsing problem #story[778]	9 years ago
Erika Savell	7d1f4209e4	Got mock data being used by visualiser. - Issue with zonedTimeDate not parsing - Fixed race crashing once one boat finished #story[778]	9 years ago
cbt24	e40bb6c4cb	Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules # Conflicts: # visualiser/src/main/java/seng302/VisualiserInput.java	9 years ago
cbt24	2e7527b325	Update boat position according to boat location messages in StreamedRace - Added StreamedRace constructor accepting VisualiserInput - Modified VisualiserInput constructor to accept Socket - Refactored controller setup of Race #story[782]	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. - Made StreamedCourse extend Observable - Initialised StartController after data pulled from network - Moved VisualiserInput to visualiser module - Deleted Networking subpackage from visualiser module #story[782]	9 years ago
Joseph Gardner	d977d3f146	Merge branch 'visualiserAndDataLink' into splitIntoTwoModules # Conflicts: # visualiser/src/main/java/seng302/Controllers/RaceController.java # visualiser/src/main/java/seng302/Controllers/StartController.java # visualiser/src/main/java/seng302/Mock/BoatXMLReader.java # visualiser/src/main/java/seng302/Mock/StreamedBoat.java # visualiser/src/main/java/seng302/Mock/StreamedCourse.java # visualiser/src/main/java/seng302/Mock/StreamedRace.java # visualiser/src/main/java/seng302/Model/BoatInRace.java # visualiser/src/main/java/seng302/Model/ConstantVelocityRace.java # visualiser/src/main/java/seng302/Model/Race.java # visualiser/src/main/java/seng302/RaceXMLReader.java # visualiser/src/test/java/seng302/Model/ConstantVelocityRaceTest.java	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 - Replaced and deprecated Constants - Added getMarkers to RaceDataSource interface - Added boundary testing for source data #story[782]	9 years ago
Erika Savell	83dfe1a60c	Renamed some directories, optimized imports, general code clean up #story[778]	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
Joseph Gardner	84c518f89f	Timer now shows and updates correctly on the start menu. #story[761]	9 years ago
cbt24	a59342a668	Modified RaceClock to support arbitrary start times - Amended RaceDataSource interface to require time instead of mark for calculating time. #story[758]	9 years ago
Erika Savell	a584400e24	Actually added sub modules this time #story[778]	9 years ago

46 Commits (bdf215d0f192544722ac366f463ee1c089a59fb4)