michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 1cac7cc189 Calculation of upwind downwind leg given a boat, wind and next mark now works. created GeometryUtils class William Muir 2017-05-24 14:57:22 +12:00
  • c42942430f Fixed bug that grid panel pushes annotation panel up out of window. Haoming Yin 2017-05-24 14:57:06 +12:00
  • 7abb36c362 The axis is labeled correctly and is scaled accordingly. Kusal Ekanayake 2017-05-24 14:42:41 +12:00
  • a1e8d29b9c Merge remote-tracking branch 'origin/develop' into develop Michael Rausch 2017-05-24 14:36:04 +12:00
  • c449da2916 [WIP] created finishScreenView.fxml, finishScreenViewController.java Zhi You Tan 2017-05-24 14:24:14 +12:00
  • 3fd0c0a2dd Merge remote-tracking branch 'origin/37-display_map_on_canvas' into 37-display_map_on_canvas Haoming Yin 2017-05-24 13:55:42 +12:00
  • 397f7d003a Fixed the size of race canvas and race view so that canvas won't be stretched Haoming Yin 2017-05-24 13:54:05 +12:00
  • f85d3bf5fe Plugged Canvas map to canvas view controller to display map Haoming Yin 2017-05-24 13:52:49 +12:00
  • d22d758757 Fix issues caused by not updating the time since last mark value frequently. BoatAnnotations now has an update() function that must be called somewhat regularly. Calum 2017-05-24 03:23:02 +12:00
  • acbde5aad8 Moved boat annotations into their own class. Implemented observer pattern. Calum 2017-05-24 03:09:11 +12:00
  • 8f93956ff1 Added methods to calculate optimal map size given a geo boundary. Haoming Yin 2017-05-15 19:57:23 +12:00
  • 4fe4ac1079 Added get map size (width and height) method in canvasMap with given boundary Haoming Yin 2017-05-15 17:06:28 +12:00
  • 8a2f0a9f45 Added unit tests for Mercator projection class. Haoming Yin 2017-05-15 13:23:04 +12:00
  • 5cc865f0af Created Mercator projection to convert between Geo location and planar projection point. Haoming Yin 2017-05-15 12:24:36 +12:00
  • 189ba93e64 Created a canvas map class to fetch map image from google Haoming Yin 2017-05-10 20:52:46 +12:00
  • 89464e033e Initial work on calculating when a gate is upwind or downwind William Muir 2017-05-24 00:08:55 +12:00
  • 6d7c36e31f Updated code to check if boat is in the race before displaying in the leaderboard Zhi You Tan 2017-05-23 20:00:23 +12:00
  • ca8ea03870 Added method in mark group to draw lay lines, also added next mark to Yacht class. Michael Rausch 2017-05-23 18:54:42 +12:00
  • 3f57adb9cf Merge branch 'develop' into Story34_Sparklines Kusal Ekanayake 2017-05-23 14:06:24 +12:00
  • 2686dac62e Fixed Yacht position initialise. TO-DO: check if the boat is participating before showing up on leaderboard. Zhi You Tan 2017-05-23 11:53:23 +12:00
  • ffd40fef6d Merge remote-tracking branch 'origin/develop' into issue#5_fix_pre-race_boats_on_leaderboard Zhi You Tan 2017-05-23 11:31:18 +12:00
  • e1b8e19966 Initial work on finding next marks for boats as from mark rounding messages William Muir 2017-05-22 18:54:07 +12:00
  • dec742cf54 Merge remote-tracking branch 'origin/develop' into 38b_LayLines William Muir 2017-05-22 18:15:58 +12:00
  • 6f1b0b06c3 Fixed est time to next mark and time from last mark annotation update after commit e0750f53 in BoatGroup.java Zhi You Tan 2017-05-22 16:17:52 +12:00
  • 408d70c420 Merge branch 'issue#10_unifying_marks' into 'develop' Michael Rausch 2017-05-22 16:07:50 +12:00
  • e51c966969 Made sure only boats in participant list are replaced. Also removed mark coloring as it wasn't as accurate as was necessary. #story[923] Alistair McIntyre 2017-05-22 16:05:24 +12:00
  • 08eacacfd4 Polar table is now parsed form the stored file in resources on startup in main William Muir 2017-05-22 15:45:16 +12:00
  • 87150b3c72 Merge remote-tracking branch 'origin/develop' into 38b_LayLines William Muir 2017-05-22 15:40:11 +12:00
  • e385ac5c09 Initial work on static parser class for polar files William Muir 2017-05-22 15:39:53 +12:00
  • c30629542b Merged develop into issue10 branch. Fixed merge issues and completed manual testing before merge request. #story[923] Alistair McIntyre 2017-05-22 15:27:23 +12:00
  • 3f9fa24c69 Merge branch 'develop' into issue#10_unifying_marks Alistair McIntyre 2017-05-22 15:13:48 +12:00
  • 78573fa837 Made start/finish lines a different color. #story[923] Alistair McIntyre 2017-05-22 15:10:05 +12:00
  • d4837cacda Merge branch 'Issue#4_boat_movement' into 'develop' Michael Rausch 2017-05-22 15:03:11 +12:00
  • 0367805f0f fixed bug from merge where est time to next mark was null on some boats #story[923] Peter Galloway 2017-05-22 15:01:04 +12:00
  • e0750f5341 Merge branch 'develop' into Issue#4_boat_movement Peter Galloway 2017-05-22 14:56:08 +12:00
  • 80528c9c42 fixed bug in canvas controller Calum 2017-05-22 14:30:31 +12:00
  • e26f2af93d Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop Michael Rausch 2017-05-22 13:30:48 +12:00
  • be633c0e60 Marks display correctly on the canvas, no double ups or anything like that left. #[issue10] alistairjmcintyre 2017-05-22 13:22:55 +12:00
  • 97f1ccb6c1 Fixed a bug where an error was caused when attempting to flip the race around the prime meridian. cir27 2017-05-22 05:41:57 +12:00
  • 68a243725b Fixed a bug where an error was caused when attempting to flip the race around the prime meridian. cir27 2017-05-22 05:39:36 +12:00
  • 8f81060a18 Managed to make the sparklines coordinate with their colour. Kusal Ekanayake 2017-05-21 19:49:11 +12:00
  • 07c76f12e1 Merge branch 'develop' into Story34_Sparklines Kusal Ekanayake 2017-05-21 17:37:41 +12:00
  • c6ab96a86f Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop cir27 2017-05-21 16:05:37 +12:00
  • 059c0de1fa Quickfix for null pointer in boatObject Kusal Ekanayake 2017-05-21 15:58:17 +12:00
  • 8e147bd1bd Making the boat sparkline initialise after the race screen is shown. Kusal Ekanayake 2017-05-21 14:56:05 +12:00
  • 4d3cfe71f7 Merge branch 'develop' into Issue#4_boat_movement Michael Rausch 2017-05-19 21:40:16 +12:00
  • 5adb7c3762 Fixed failing ColorsTest Michael Rausch 2017-05-19 20:57:40 +12:00
  • 937b309b07 Added boat trails to the boat group, fixed annotations Michael Rausch 2017-05-19 20:55:02 +12:00
  • 48d58ea660 Sparklines now update when a boat passes a mark. Kusal Ekanayake 2017-05-19 18:08:26 +12:00
  • aaf2e6a3f0 Added boat wakes back to the visualiser Michael Rausch 2017-05-19 16:57:29 +12:00
  • 422dcd4501 Sparklines now update with boat position change. Kusal Ekanayake 2017-05-19 15:15:05 +12:00
  • 951a726309 The line chart now has series which display on it. Kusal Ekanayake 2017-05-18 20:56:42 +12:00
  • b692ddcbe6 Marks and gates correctly displaying from XML messages and mark(boat) position packets. Will need a little polishing but marks and gates are moving around. #story[923] #pair[ajm412, ptg19] Alistair McIntyre 2017-05-18 18:39:23 +12:00
  • 5d6b356602 all marks displaying except currently gate marks are displaying as a single dot #story[923] #pair[ajm412, ptg19] Alistair McIntyre 2017-05-18 18:02:25 +12:00
  • 08057edb28 Merge branch 'Issue#4_boat_movement' into issue#10_unifying_marks Alistair McIntyre 2017-05-18 17:04:00 +12:00
  • 390aabc78f Adding race yacht series to the sparkline. Kusal Ekanayake 2017-05-18 14:44:10 +12:00
  • a2123df0c5 Fixed Boat selection and lost annotations (Estimated and Leg Time) William Muir 2017-05-18 14:41:08 +12:00
  • 6a6ed3ed44 Server sends mark locations to test Michael Rausch 2017-05-18 13:32:24 +12:00
  • b87008f590 Merge branch 'develop' into Story34_Sparklines Kusal Ekanayake 2017-05-18 13:22:51 +12:00
  • ecc0e722b5 Started sparkline prototype Kusal Ekanayake 2017-05-18 13:19:59 +12:00
  • 6f9a8e5581 Merge remote-tracking branch 'origin/develop' into issue#5_fix_pre-race_boats_on_leaderboard Zhi You Tan 2017-05-18 12:20:02 +12:00
  • b17bba3629 Fixed leaderboard on start screen and race view to show all boats correctly during pre-race. Zhi You Tan 2017-05-18 12:18:51 +12:00
  • cf4d7e03f5 Merge branch 'issue#1_wakes_3.0' into 'develop' Michael Rausch 2017-05-18 11:45:28 +12:00
  • 73eeeb0ef9 Removed extra print stmt and changed default server back to official Michael Rausch 2017-05-18 11:45:06 +12:00
  • 0f79353936 fixes from merge #story[923] Peter Galloway 2017-05-17 20:15:47 +12:00
  • 38b44fa92b Merge branch 'develop' into Issue#4_boat_movement Peter Galloway 2017-05-17 20:05:40 +12:00
  • 3fd13ddc0a Adjusted XMLParser to use model Mark objects rather than the simple datatype that existed in the XMLParser previously. Began attempting to implement them into the canvas controller but have issues alistairjmcintyre 2017-05-17 19:46:05 +12:00
  • 2e375978bd cleaned up code for merging back to develop #story[923] Peter Galloway 2017-05-17 19:18:31 +12:00
  • 45db731a60 Fixed a merge issue. Calum 2017-05-17 18:06:36 +12:00
  • 95e353c14e fixed initialization bug #story[923] Peter Galloway 2017-05-17 17:55:21 +12:00
  • 8a3a41294a Fixed error causing build failure. Calum 2017-05-17 17:41:45 +12:00
  • f41858e2c7 Tidied variable names. Calum 2017-05-17 17:35:59 +12:00
  • aaa3dc93f1 boat movement working reliably now, still need to fix one bug at initialization #story[923] Peter Galloway 2017-05-17 17:34:47 +12:00
  • e5eab0a6c8 Merge remote-tracking branch 'origin/develop' into issue#1_wakes_3.0 Calum 2017-05-17 17:27:34 +12:00
  • 7c39368126 Removed unnecessary constant Calum 2017-05-17 17:23:10 +12:00
  • ade926e2f2 StreamParser class now only shares thread safe classes. Calum 2017-05-17 16:44:05 +12:00
  • c63c8e4d73 Stripped out excess code in Wake class. Calum 2017-05-17 16:33:45 +12:00
  • 3c418b2aa4 Changed boat location message to milliseconds Michael Rausch 2017-05-17 14:57:31 +12:00
  • d34a158c34 Merge branch '38a_Select_Boats' into 'develop' Michael Rausch 2017-05-17 14:38:23 +12:00
  • 6e3d037021 Merge branch 'develop' into 38a_Select_Boats Michael Rausch 2017-05-17 14:34:10 +12:00
  • 7d160eaf54 Removed unused imports from controller.java Zhi You Tan 2017-05-17 13:16:00 +12:00
  • 4fc99edbd6 Merge branch 'issue#14_split_start_screen_view&controller' into 'develop' Peter Galloway 2017-05-17 13:07:48 +12:00
  • 4da8c1645e Split Start Screen out from Main View view and controller. Zhi You Tan 2017-05-17 12:56:13 +12:00
  • 1c01aab1e7 Merge on to develop William Muir 2017-05-17 10:34:00 +12:00
  • 6a85b0800f Merge on to develop William Muir 2017-05-17 10:06:50 +12:00
  • 1acb0fbac4 Merge on to develop William Muir 2017-05-17 10:04:28 +12:00
  • 2b294702a9 Merge remote-tracking branch 'origin/develop' into 38a_Select_Boats William Muir 2017-05-17 09:53:18 +12:00
  • afd97d6e05 Reformating of code to google style. William Muir 2017-05-17 00:34:36 +12:00
  • 2d5a7a8a49 Large tidying of RaceViewController class. Fixing updating for combo boxes William Muir 2017-05-16 15:06:01 +12:00
  • 9e3036e134 Stripped down the boatgroup to the basic movement components and then tried to adjust how position updates are being dealt with to make everything more logically understandable. I made some progress in terms of understanding but the position update is still not as reliable as I would like. I will be explaining to other team members how this part of the code is working so the time I have spent is not completely wasted #story[923] Peter Galloway 2017-05-15 23:17:36 +12:00
  • 8dec458ba9 Added methods to calculate optimal map size given a geo boundary. Haoming Yin 2017-05-15 19:57:23 +12:00
  • da07d885da Merge branch 'Story47CourseLimits' into 'develop' Michael Rausch 2017-05-15 18:43:49 +12:00
  • a9de005e1a Removed a extraneous print stmt Michael Rausch 2017-05-15 18:41:44 +12:00
  • e03e121da4 Merge branch 'develop' into Story47CourseLimits Michael Rausch 2017-05-15 18:37:31 +12:00
  • fc3ca70e5d Merge branch 'issue#10_unifying_marks' into Issue#4_boat_movement Peter Galloway 2017-05-15 18:09:47 +12:00
  • 9c7144c918 Removed dud print statement Kusal Ekanayake 2017-05-15 17:55:06 +12:00
  • ed8d70c3b3 commented out buffered code and cleaned up some other areas to try and make the boatgroup clear enough to modify #story[923] Peter Galloway 2017-05-15 17:53:11 +12:00
  • fa501460cb Cleaned up code for merge. Kusal Ekanayake 2017-05-15 17:21:56 +12:00
  • 110143ae6e Added a dynamically updating course limits file to the model. Kusal Ekanayake 2017-05-15 17:09:12 +12:00
  • eda3d76077 Added get map size (width and height) method in canvasMap with given boundary Haoming Yin 2017-05-15 17:06:28 +12:00