Commit Graph

  • 3321727999 Tests for RegattaXMLReader #Story[782] Joseph Gardner 2017-04-19 17:41:53 +1200
  • b825790acd Moved package to correct spot Joseph Gardner 2017-04-19 17:24:00 +1200
  • c40967f972 Added Regatta class and Regatta xml reader. This will be needed for the mock #Story[30] Joseph Gardner 2017-04-19 17:15:08 +1200
  • 316c0dda76 Merge remote-tracking branch 'origin/master' Connor Taylor-Brown 2017-04-19 16:59:29 +1200
  • 764eb9089f Added race data source interface to abstract sources of race data. - Refactored controllers to send data source to consumers (Race, ResizeableRaceCanvas) Connor Taylor-Brown 2017-04-19 16:53:31 +1200
  • 668758f6f8 Fixed boat path not being toggled when annotation is toggled. David Wu 2017-04-19 16:32:24 +1200
  • 8384b1a2ef updated .xmls in the format used by AC35 hba56 2017-04-19 16:25:19 +1200
  • b5bd1c9d6d updated to have main methods for the server and client hba56 2017-04-19 15:04:29 +1200
  • 43af929701 Started a new branch for the networking side of story 29, 30 -added a basic tcp server and client hba56 2017-04-19 15:00:52 +1200
  • 028cb33509 Fixing fxml problems Erika Savell 2017-04-19 13:52:00 +1200
  • 374b31f5c0 Disabled scale buttons once one has been clicked Erika Savell 2017-04-19 13:41:33 +1200
  • b1e55f8c7d Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story28 Erika Savell 2017-04-19 13:40:40 +1200
  • dc32868227 Created countdown clock on start screen. Erika Savell 2017-04-19 13:35:02 +1200
  • fc15c3d151 Added annotation to toggle all boat paths on and off #Pair[jjg64, zwu18] #Story[759] Joseph Gardner 2017-04-19 13:09:45 +1200
  • f5472bf595 Merge remote-tracking branch 'remotes/origin/master' into story28 -anchors now fills stage -added time label hba56 2017-04-19 13:08:06 +1200
  • edabe58b03 Merge remote-tracking branch 'remotes/origin/master' into story28 -anchors now fills stage -added time label hba56 2017-04-19 12:48:03 +1200
  • eb9fce1f22 Track scales with time scale #Pair[jjg64, zwu18] #Story[758] Joseph Gardner 2017-04-19 12:46:26 +1200
  • 71535be143 Merge branch 'story_25' cbt24 2017-04-19 12:42:39 +1200
  • caf1e61391 Documented methods added for track handling. cbt24 2017-04-19 12:39:23 +1200
  • af9d6769e5 Story 25 merged #Story[758] Joseph Gardner 2017-04-19 12:22:52 +1200
  • b07e881edc Merge branch 'story_25' Joseph Gardner 2017-04-19 12:12:12 +1200
  • 2945c8446e Points now last whole race with a lower opacity #Story[25] Joseph Gardner 2017-04-19 11:59:09 +1200
  • a00b066f8d Quick fix to zoneId to make it set correctly - removed local zoneId #story[761] #pair[fwy13, hba56] hba56 2017-04-19 11:55:11 +1200
  • e501102bc5 Refactored the raceClock - created a class that hosts the raceClock - refactored the raceController to use a raceClock. #story[761] Fan-Wu Yang 2017-04-19 02:45:08 +1200
  • 56d51ceaa9 Track point is now removed after its expiry and fades after the boat has stopped Story [758] Joseph 2017-04-18 09:07:02 +1200
  • 4e78ae2ae7 Fixed testing problem where race tests would sometimes fail because a boat did not finish Erika Savell 2017-04-17 15:41:23 +1200
  • f25e2bac32 Changed countdown length to two minutes Erika Savell 2017-04-17 15:25:54 +1200
  • 62d220f1fb Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story27 Erika Savell 2017-04-17 15:08:04 +1200
  • 2d74cdc5dc Fixed DNF position handling - DNF position is now "-" - If boat DNFs during leg, other boats' rankings are updated to remain accurate #story[15] cbt24 2017-04-07 16:26:24 +1200
  • 680c6fb991 Increased minimum opacity so actual track from start is visible. - No longer removes points from track #story[25] cbt24 2017-04-07 15:18:57 +1200
  • 375202e7a0 Fades boat opacity every frame during and after race. - Added TrackPoint with time added and expiry to calculate opacity each frame - Modified drawTrackPoint to compute colour from TrackPoint alpha - Removed getTrackPoint from BoatInRace #pait[jjg64, cbt24] cbt24 2017-04-07 14:20:20 +1200
  • 63591ad1ec Added fixed opacity points of fading and modified race time to keep updating when the race is finished. Pair [jjg64, cbt24] Story [758] Joseph Gardner 2017-04-07 13:06:52 +1200
  • 4eef872a60 Decoupled drawing and adding track points, added combobox selector for visible boats. cbt24 2017-04-07 12:26:43 +1200
  • c31ea51068 Temporarily removed test for countdown timer as countdown timer now uses animation timer. zwu18 2017-04-07 03:42:16 +1200
  • 57d30a7a02 Fixed countdown timer not scaling. -Countdown timer now also uses an animation timer -Added scaling factor to countdown timer zwu18 2017-04-06 20:48:17 +1200
  • 2bf264c6bb Populated starting boat table Jessica McAuslin 2017-04-06 19:29:57 +1200
  • 8112918c13 Attempted to load details in, but ran into problems with the string property/vs string distinction Erika Savell 2017-04-06 17:17:06 +1200
  • 101dadc003 Gave BoatInRace a track property that stores the coordinates of the track. Added a method in ResizableRaceCanvas that draws the points on the track every time the canvas updates. [Story 25] Joseph Gardner 2017-04-06 17:11:24 +1200
  • 7790322e04 Implemented the Time showing on Grid - Added Label to scene - Added Timezone formatting #story[28] #pair[fwy13,hba56] Fan-Wu Yang 2017-04-06 16:55:43 +1200
  • ee65e7eba5 Changed where the saved annotation set is declared. -Annotation set is now initialized along with annotations. David Wu 2017-04-06 16:44:22 +1200
  • d08a1c325f Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 David Wu 2017-04-06 16:37:09 +1200
  • 5c89c1aeb7 Implemented functionality to select which annotations to display. Selected annotations can be temporarily saved and then displayed on a button press. -Added checkboxes to display name, abbreviation, and speed in annotation. -Changed single titlepane to an accordion. -Moved all annotation controls to separate titlepane in accordion. -Added buttons to save and load saved annotation settings. David Wu 2017-04-06 16:37:00 +1200
  • 58cae682ab Merge branch 'story27' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story27 Jessica McAuslin 2017-04-06 16:31:54 +1200
  • 44fac754a7 Created screen for showing starters Jessica McAuslin 2017-04-06 16:31:12 +1200
  • 47df6266d2 Created start race entry point in main controller so it could be called by start race controller Erika Savell 2017-04-06 16:19:31 +1200
  • 71f0085268 Implemented geotimezone from com.github.bfsmith - Calculates timezone from mark #story[28] #pair[fwy13,hba56] Fan-Wu Yang 2017-04-06 16:11:14 +1200
  • 0772ca22c6 Re-engineered fxml controllers to use child controllers Erika Savell 2017-04-06 15:32:12 +1200
  • a689ffc689 Added quick descriptions to params to get javadoc working Erika Savell 2017-04-06 14:31:11 +1200
  • 6866f65adf Ignoring failing test to check CI is working. Erika Savell 2017-04-06 13:53:21 +1200
  • 94444e6662 Negligible change to check CI runner is working Erika Savell 2017-04-06 13:41:04 +1200
  • 8e70dfa2d5 Fixed boat position calculation - Decoupled 'place' column data from position in table - Set position in race after first mark passed Connor Taylor-Brown 2017-04-06 13:19:31 +1200
  • 795b411f08 Added some doc strings - Added doc strings to RaceXML - Added a few minor changes to bermuda_AC35.xml - Changes to the RaceXMLReader Unit Test Fan-Wu Yang 2017-03-31 00:51:08 +1300
  • c105c2d01e Fixed file paths so they work when it becomes an executable - Changed file paths for the FXML files Fan-Wu Yang 2017-03-31 00:00:53 +1300
  • ee72d85f6a removed print messages Erika Savell 2017-03-30 14:33:28 +1300
  • ec9574fd9d Refactoring Erika Savell 2017-03-29 23:58:00 +1300
  • e2f9a710aa Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 Erika Savell 2017-03-29 23:07:57 +1300
  • fc1121b5b7 Removed extra < char from .mailmap Erika Savell 2017-03-29 23:07:42 +1300
  • 6344e12d8f Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 Erika Savell 2017-03-29 23:06:24 +1300
  • 9808c57ca7 GOat boats spread out at startline working Erika Savell 2017-03-29 23:06:16 +1300
  • 9f71c99ecf Updated .mailmap Erika Savell 2017-03-29 23:05:36 +1300
  • 0e7d210cea Amended wake tests to handle markers instead of direct coordinates Erika Savell 2017-03-29 22:02:24 +1300
  • 970f0d0116 Fixed race scaling Erika Savell 2017-03-29 21:51:03 +1300
  • fb409af23b Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 Erika Savell 2017-03-29 19:54:53 +1300
  • 495158a621 Amended and added tests to cope with marker change Erika Savell 2017-03-29 19:47:49 +1300
  • 305326881f Merged Boundaries branch - Merged Boundaries branch. #story[22] Fan-Wu Yang 2017-03-29 17:13:52 +1300
  • 461d894ac8 Merge branch 'boundaries' Fan-Wu Yang 2017-03-29 16:53:28 +1300
  • 6ffe3d02a3 Fixed and merged heading-visualisation - Fixed the boats not appearing at the starting line. - Merged with master #story[24] Fan-Wu Yang 2017-03-29 16:46:23 +1300
  • edd9c2a48d Merge remote-tracking branch 'origin/heading-visualisation' Fan-Wu Yang 2017-03-29 14:36:24 +1300
  • eb97bd6aef Implemented resizable map and boundary scaling. - Map can now be downsized - The boundaries are auto margined and fit in the center of the canvas. #implement Fan-Wu Yang 2017-03-29 13:29:53 +1300
  • 1524ed5a0e Merged annotation toggle and DNF features with heading visualisation. cbt24 2017-03-29 13:27:41 +1300
  • 9960317732 Removed tooltip David Wu 2017-03-29 13:19:34 +1300
  • 68fccc3216 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 David Wu 2017-03-29 13:14:27 +1300
  • 4ee6624ff6 Changed abbreviations for teams -Updated the team abbreviations to official ones -Change methods that were public to private David Wu 2017-03-29 13:14:19 +1300
  • 40a6801477 Marker tests added Erika Savell 2017-03-29 12:37:53 +1300
  • 98be99a975 Merge remote-tracking branch 'origin/master' cbt24 2017-03-29 12:13:20 +1300
  • eb4c02557d Changing xml reader to take both coordinates of a marker Erika Savell 2017-03-29 12:08:40 +1300
  • b943b38d61 Merge remote-tracking branch 'origin/master' David Wu 2017-03-29 11:19:15 +1300
  • 99cb4bd526 Implemented DNF with random chance in Race cbt24 2017-03-29 11:18:04 +1300
  • d2de426f58 Fixed so the animation timer will exit when all boats finish the race -Moved listeners for annotation to initialize -Fixed compass arrow not rescaling properly with canvas -Fixed scaling issue with race clock David Wu 2017-03-29 11:16:57 +1300
  • d1d46f2cf5 Created Marker class Erika Savell 2017-03-29 11:16:37 +1300
  • 6fe80ad52c Fixed speed displayed in table view cbt24 2017-03-29 10:46:18 +1300
  • 45fcd22cc5 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 Erika Savell 2017-03-29 10:46:06 +1300
  • f7477adb36 Added javadoc for new methods used for annotation and fps David Wu 2017-03-29 10:15:31 +1300
  • 33b94cdf5b Changed implementation for Anno(annotations) -drawRaceMap is now called for annotation to update map David Wu 2017-03-29 10:13:51 +1300
  • 224c16a713 Implemented Map Boundaries in XML - RaceXMLReader will calculate the top left latitude and longitude and the bottom right latitude and longitude, and make the layout the map accordingly. - The Boundaries are draw on the Race Canvas in Aqua. #story[22] Fan-Wu Yang 2017-03-29 03:18:47 +1300
  • 2d2f4692a9 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 Erika Savell 2017-03-28 14:42:22 +1300
  • bb6b881392 Adding end coords to get test running gain Erika Savell 2017-03-28 14:38:08 +1300
  • cfbb27513d Fixed wake scale for realistic speeds. #story[21] Connor Taylor-Brown 2017-03-27 20:59:51 +1300
  • 3aaee1291d Implemented heading visualisation - Boats are represented as isosceles triangles - Boats are rotated toward heading while in race - As heading is only available in race, RaceController draws boats on start line and in race separately #story [24] Connor Taylor-Brown 2017-03-27 20:51:20 +1300
  • 879de9869b Implemented XML Reader -XMLReader class for generic XML Reading Created - RaceXML Reader class made specifically for reading races - RaceController COnstants now replced with XML file #implement Fan-Wu Yang 2017-03-27 02:09:59 +1300
  • 176b644aaf Created boat initialise method to run through boats setting correct start position Erika Savell 2017-03-26 18:01:38 +1300
  • d15cd2b881 Wrote method to calculate spread positions across start line Erika Savell 2017-03-26 17:14:21 +1300
  • 24dec0bb2f Fixed participating boats not outputting correctly -toString method in Boat class now uses getValue David Wu 2017-03-26 19:12:58 +1300
  • bd072af0c4 Modified size of mark -Size of the mark changed to avoid confusion between mark and boats. David Wu 2017-03-26 18:47:44 +1300
  • 073bcaa4a3 Added checkbox to change visibility of annotation to GUI -Checkbox is used to toggle the text displayed beside boats -Race Clock is now scaled using the scale factor David Wu 2017-03-26 18:39:23 +1300
  • 0df8235a28 Added TitledPane and Checkbox to GUI. -Checkbox is used to control the visibility of the FPS counter David Wu 2017-03-26 17:40:09 +1300
  • f8dff6359d Merge branch 'story9' David Wu 2017-03-26 16:46:19 +1300
  • 306e98172b Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into heading-visualisation Erika Savell 2017-03-25 22:11:31 +1300
  • bd86690e85 Filled in javadoc, optimised imports, rearranged code Erika Savell 2017-03-25 21:49:43 +1300
  • e8cd9b2ee8 Implemented wake visualisation for each boat - Added and tested wake calculation for BoatInRace - Draws boat in canvas between start and entering Finish leg - Allow boat velocity to be set after initialisation for testing #story [21] Connor Taylor-Brown 2017-03-25 20:41:16 +1300