SENG302

Commit Graph

Author	SHA1	Message	Date
cbt24	2126c44db9	Last minute changes to get ready for DoD #story[875]	9 years ago
Erika Savell	5f23f335e5	Added est time annotation to annotations that can be hidden and shown #story[875]	9 years ago
Erika Savell	0a022e275e	Added checkbox for est time to next mark to gui #story[875]	9 years ago
Fan-Wu Yang	ba5e74ab9c	Merge with master complete - merged with master #story[877]	9 years ago
Fan-Wu Yang	a3ccd75f4c	Merge remote-tracking branch 'origin/sprint4_master' into Story877 # Conflicts: # mock/src/main/java/seng302/DataInput/BoatXMLReader.java # mock/src/main/java/seng302/DataInput/XMLReader.java # mock/src/main/java/seng302/Model/Boat.java # mock/src/main/java/seng302/Model/CompoundMark.java # mock/src/main/java/seng302/Model/Leg.java # mock/src/main/java/seng302/Model/Mark.java # mock/src/main/java/seng302/Model/Marker.java # mock/src/main/java/seng302/Model/Race.java # mock/src/test/java/seng302/Model/LegTest.java # visualiser/src/main/java/seng302/Controllers/RaceController.java # visualiser/src/main/java/seng302/Mock/StreamedRace.java # visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java # visualiser/src/main/resources/scenes/race.fxml	9 years ago
hba56	2a7f264444	Merge remote-tracking branch 'remotes/origin/sprint4_master' into story36 # Conflicts: # visualiser/src/main/java/seng302/Controllers/RaceController.java # visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java #story[878]	9 years ago
Joseph	aa2f234393	Annotations are now clickable #fix	9 years ago
Joseph	6a598c8a04	Arrow fxml I forgot to push	9 years ago
hba56	139d7b41fb	re added story36 racefxml changes after merge #story[878]	9 years ago
Joseph Gardner	40421e5a83	Merge branch 'sprint4_master' into noDependencyArrow # Conflicts: # mock/src/main/java/seng302/Model/Race.java # network/src/main/java/seng302/Networking/Messages/RaceStatus.java # visualiser/src/main/java/seng302/Controllers/RaceController.java # visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java # visualiser/src/main/resources/scenes/race.fxml	9 years ago
Joseph	b678152cf8	Removed breaking dependency and made it so app doesn't need the breaking dependency any more.	9 years ago
Fan-Wu Yang	671d62aeb1	Added Important and Partial Annotations and other refactors and documentation. - Important, Partial, Hidden, Visible are all radiobuttons - Fixed bug where the Visualiser would end the race before the last boat had finished - Refactored the visualiser and the mock to use the race finished status message - Added and Changed many Javadocs #story[877]	9 years ago
Jessica McAuslin	7647a93d7a	Implemented an updating sparkline - sparkline is set with X number of lines - sparkline height fits X lines - lines are updated regularly - size is adjusted relevant to plotted points #story[876]	9 years ago
Joseph Gardner	3bc8ad0a07	Arrow is now displayed on screen more vividly, the arrow can be customised to a different colour scheme if needed. #story[882]	9 years ago
Jessica McAuslin	2d983eccfd	General code tidy up - access modifiers adjusted - unused declarations removed - spelling fixes - removed redundant code	9 years ago
David Wu	61afe8d608	Created finish view to see when a race finishes. -Implemented FinishController -Fixed mock not sending Finish race status. #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	099995c41b	Fixed start controller visibility issues. #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
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	c1fa760dde	Streamlined clock handling. - Set starting time from network - Update RaceClock instance to current time from network #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	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
Erika Savell	83dfe1a60c	Renamed some directories, optimized imports, general code clean up #story[778]	9 years ago
Erika Savell	a584400e24	Actually added sub modules this time #story[778]	9 years ago

29 Commits (dc8403ec00ce72b6ba59bc8d3e55bc4b7d039a74)