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

  • 672194adb4 changed Peter Galloway's name to specified format Peter Galloway 2017-04-23 19:04:45 +12:00
  • fdb84b6675 Update .mailmap for Haoming Yin's information. Haoming Yin 2017-04-23 18:51:36 +12:00
  • ba352183bf added functionality to check the CRC for the packet. I ran into a lot of trouble with this regarding everything in java being signed by twos compliment #story[817] Peter 2017-04-23 16:53:35 +12:00
  • dd480080c9 Updated .mailmap to have the correct username for Kusal Ekanayake. Kusal Ekanayake 2017-04-23 14:57:26 +12:00
  • 4047978ea2 Renamed file to match its functionality more accurately . kre39 2017-04-23 14:43:18 +12:00
  • a649b11bbf Reading relevant information (boats and race related info) from the stream so it can be moved to a parse and turned into objects for the actual race. kre39 2017-04-23 14:42:10 +12:00
  • 247560ee43 converted prototype to be reading the stream byte by byte rather than by lines and characters which was very confusing and unreliable. currently extracting message type and payload length. #story[817] Peter 2017-04-22 16:39:03 +12:00
  • 50e7ece477 Checking for the header of each packet as the stream parser checks for each byte to see if it matches with the desired header sequence. Kusal Ekanayake 2017-04-20 19:17:12 +12:00
  • b5129c5c80 Moved the canvas drawing implementation from team27's codebase to team13's. Calum 2017-04-20 19:06:32 +12:00
  • 6a27dedd74 Simple test to get stream data Alistair McIntyre 2017-04-20 15:08:50 +12:00
  • edc306da22 Created AC35 Streaming server Michael Rausch 2017-04-19 19:05:19 +12:00
  • 15ded667fe Started to implement the group over the canvas in the code. Removed basic boat redrawing and timeline and replaced with boats being placed into a group and given coordinates. Kusal Ekanayake 2017-04-11 17:46:02 +12:00
  • 34872a822b Stripped back codebase to make to create basic model for streaming data William Muir 2017-04-08 17:49:50 +12:00
  • 9817fc9093 Fixed JavaDoc errors by adding missing @params Michael Rausch 2017-04-04 19:29:05 +12:00
  • dde4b2fcba gitlab ci test (passing) Michael Rausch 2017-04-04 19:15:41 +12:00
  • 623600a8a9 gitlab ci test (failing) Michael Rausch 2017-04-04 19:15:01 +12:00
  • bff4986242 Gitlab CI Build Test Michael Rausch 2017-04-04 19:10:01 +12:00
  • c689530068 Gitlab CI Build Test Michael Rausch 2017-04-04 19:03:45 +12:00
  • 7022be1979 Fixed unit test which failed due to the change of configure file. sprint_2.3 Haoming Yin 2017-03-30 16:16:30 +13:00
  • 971a3920a3 Fixed race timer to display real race time, and made race time scalable. sprint_2.2 Haoming Yin 2017-03-30 16:12:01 +13:00
  • b252797e9b Removed test case that failed when the config file was changed sprint_2.1 Michael Rausch 2017-03-30 14:48:47 +13:00
  • c758afe3e3 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 Michael Rausch 2017-03-30 14:46:22 +13:00
  • f8d3f53158 changed boat speed to a lower value Peter 2017-03-30 14:45:33 +13:00
  • 4a8672a20b Updated race timer test to use new controller Tags:story[455] Michael Rausch 2017-03-30 14:44:57 +13:00
  • 32109e8565 Merge branch 'controller-refacto' into origin/master sprint_2.0 Peter 2017-03-29 15:03:38 +13:00
  • 5d6060c690 Merge remote-tracking branch 'origin/master' into controller-refacto Peter 2017-03-29 15:01:38 +13:00
  • a95d030817 Controllers and Fxml nicely refactored, tests still broken #story[463] Peter 2017-03-29 14:59:37 +13:00
  • ffa84c6e87 Removed testNextColor for now as the test seems to be broken.. Michael Rausch 2017-03-29 13:27:18 +13:00
  • 4a6978ff79 Fxml refactored, partway through refactoring controllers (app does not run) #story[463] Peter 2017-03-29 12:58:49 +13:00
  • 1497858cc0 Deleted the print exception stack statement to make terminal more tidy. Haoming Yin 2017-03-28 19:38:57 +13:00
  • 2c125d4ce0 Fixed test case for the boat heading #story[466] Michael Rausch 2017-03-28 19:25:04 +13:00
  • 8bf5455f42 Updated fxml and canvas controller to display a resizable canvas. Zhi You Tan 2017-03-27 17:05:49 +13:00
  • 48f7e41905 Merge branch 'master' of /home/cosc/student/zyt10/Documents/[SENG302]/team-13 with conflicts. Zhi You Tan 2017-03-27 16:52:31 +13:00
  • b50ac62a4b Merge branch 'add-fps-counter' Peter 2017-03-27 16:47:34 +13:00
  • 6fc55bb82c Added toggle for fps #story[463] Peter 2017-03-27 16:45:02 +13:00
  • 65ac864bf2 added count for fps inside handle loop and displayed fps on the canvas #story[463] Peter 2017-03-27 16:34:54 +13:00
  • cf6bbdd1f1 Fixed boat heading calculation method to get a correct direction Haoming Yin 2017-03-27 14:29:03 +13:00
  • bbe7cbee8f Use canvas polygon to draw a triangle Haoming Yin 2017-03-27 14:26:38 +13:00
  • 55ba343426 Merge branch 'change-to-short-names' into 'master' Michael Rausch 2017-03-24 21:01:55 +13:00
  • e6ace5fb2f Changed the team names to their abbreviated versions Michael Rausch 2017-03-24 20:56:52 +13:00
  • 550ab59231 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 Michael Rausch 2017-03-24 20:45:49 +13:00
  • 213303d674 Merge branch 'create-wake-line' Michael Rausch 2017-03-24 20:39:21 +13:00
  • 74c81eb7b3 Removed a character that was accidentally inserted Michael Rausch 2017-03-24 20:37:32 +13:00
  • c33586e7f5 Changed test to work with the new getHeading method, and removed an unused import that was causing tests to fail Michael Rausch 2017-03-24 20:33:53 +13:00
  • 5dd5e50738 Implemented wake lines Michael Rausch 2017-03-24 20:27:17 +13:00
  • 304f30ece6 Reformatted and refactored the fileparser to get xml from resource folder Haoming Yin 2017-03-24 12:55:11 +13:00
  • e8b1720fee Created a toggle checkbox to show and hide all annotation zyt10 2017-03-24 12:15:39 +13:00
  • e0cea098c1 Merge remote-tracking branch 'origin/master' Peter 2017-03-24 11:52:17 +13:00
  • 50ab481b18 added knots beside boat name #story[447] Peter 2017-03-24 11:51:07 +13:00
  • d39aacba83 RaceController now uses new parsers & deleted OldApp and OldFileParser zyt10 2017-03-24 11:34:34 +13:00
  • 798fe4da0e Changed FPS to 30 Michael Rausch 2017-03-24 11:15:46 +13:00
  • e19f110f19 Merge branch 'origin/addBoatPositionsInSideBar' Peter 2017-03-24 11:06:03 +13:00
  • 59a4a74a97 changed boatPositionController to also add velocity to the boat ordering shown in the side bar #story[447] Peter 2017-03-23 22:50:04 +13:00
  • 590ef557d3 fixed bugs from last commit and updated some tests #story[426] Peter 2017-03-23 22:24:42 +13:00
  • 7bc5c8f8a4 Merge remote-tracking branch 'refs/remotes/origin/master' Peter 2017-03-23 22:17:45 +13:00
  • bf8244ce49 tried to test BoatPositionController but as it's connected to the fxml I am unsure if it is possible to test (test code is commented out) #story[426] Peter 2017-03-23 22:04:25 +13:00
  • a860cc0ec1 connected up all the javafx components and got team positions displaying on the sidebar #story[426] Peter 2017-03-23 21:21:54 +13:00
  • bb8c681270 added a markpos value to event for use in displaying the team positions #story[426] Peter 2017-03-23 21:19:39 +13:00
  • 9872095e50 Merge branch 'boat-labels' into 'master' Michael Rausch 2017-03-23 18:06:31 +13:00
  • 403aaa76ae Display team name and speed beside boat Michael Rausch 2017-03-23 18:04:00 +13:00
  • 8578bc4a5b changed the "sea" color of the canvas to be actually drawn on the canvas rather than the pane behind #story[377] Peter 2017-03-23 16:18:42 +13:00
  • ed004d1423 Merge branch 'master' Peter 2017-03-23 15:16:11 +13:00
  • a91b2b4f7e Merge branch 'create-race-timer' into 'master' Michael Rausch 2017-03-23 14:20:25 +13:00
  • 24f9607e5a Added tests for the RaceTimerController #test #story[16] Michael Rausch 2017-03-23 14:18:27 +13:00
  • 2384013139 Created race timer Michael Rausch 2017-03-23 14:11:12 +13:00
  • 42ffd1b1f8 Add rotated wind direction arrow to race view. Haoming Yin 2017-03-23 01:10:07 +13:00
  • a2d06909c9 Finished config parser to read race info from external xml file Haoming Yin 2017-03-23 00:21:18 +13:00
  • c8b7b95df8 Merge branch 'finish-race-results' into 'master' Michael Rausch 2017-03-22 22:42:05 +13:00
  • 9e22eac4d8 Added the race results to the RaceResultController. Also fixed some bugs Michael Rausch 2017-03-22 22:30:49 +13:00
  • a41f2e4bde Changed marks from circles to squares #fix Michael Rausch 2017-03-22 15:10:57 +13:00
  • 039e61def6 Fixed broken JavaFX file #fix Michael Rausch 2017-03-22 14:50:28 +13:00
  • 54d329c5cf changed raceView javafx structure and added an example of how the handle function works with keyframes #story[426] Peter 2017-03-22 14:44:40 +13:00
  • f46a98fad9 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 Michael Rausch 2017-03-22 14:39:37 +13:00
  • 6a6816dda1 Merge branch 'create-finish-display' Michael Rausch 2017-03-22 14:31:06 +13:00
  • f6ea2953e9 Changed lat/long for gates to midpoint and added colours for the marks Michael Rausch 2017-03-22 14:28:51 +13:00
  • 7591a79323 Fixed course rotation #fix Michael Rausch 2017-03-22 14:05:55 +13:00
  • c12760b70a Inserted missing } #fix Michael Rausch 2017-03-22 12:53:42 +13:00
  • a526b0d65a Rotated map by 180 degrees #fix Michael Rausch 2017-03-22 12:52:43 +13:00
  • ef098e63d7 Added finishing events #implement and rotated the map by 180 degrees#fix Michael Rausch 2017-03-22 12:51:03 +13:00
  • 29a0b23670 Reformatted double value lat and lon to final double VIEW_CORNER_LAT and VIEW_CORNER_LON zyt10 2017-03-22 12:03:46 +13:00
  • 44b5b0b771 Added side pane to GUI and resize to 1280x960 zyt10 2017-03-22 11:46:39 +13:00
  • 00f9cc4698 Merge branch 'fix-boat-postions-and-keyframes' into 'master' Michael Rausch 2017-03-21 17:42:13 +13:00
  • 3d4d5a3dab Fixed x and y coordinates #fix #story[9] Michael Rausch 2017-03-20 21:13:30 +13:00
  • ed577fad6a adding files missed in previous commit Peter 2017-03-20 17:58:40 +13:00
  • ae61260665 created a javafx view for the race finish and created a rough wireframe for the controller to change the view from race to finish #story[414] Peter 2017-03-20 17:56:14 +13:00
  • 0e4bb0f942 Changed getMark to getThisMark. Added start point to KeyFrame. Race now starts from start point and ends at finish point zyt10 2017-03-20 17:34:24 +13:00
  • ee34e5028f Reformatted and refactored the canvas controller Haoming Yin 2017-03-20 17:23:33 +13:00
  • 3b8dd11758 Added drawBoats for use in animation timer, also fixed gate marks only drawing one mark #story[378] Peter 2017-03-20 16:11:04 +13:00
  • cc04e2dd6d Fixed boat colour, was in the wrong constructor zyt10 2017-03-20 16:03:07 +13:00
  • b88cf6a101 Merge branch 'refactor-file-parser' Haoming Yin 2017-03-18 21:38:38 +13:00
  • d10985f890 Finished team parser to read team info from external xml file Haoming Yin 2017-03-18 21:32:12 +13:00
  • c08504293b Created canvas and race controllers to display boats on canvas and modified marks and parsers to support them. zyt10 2017-03-17 18:21:11 +13:00
  • 4bc49da10d Merge remote-tracking branch 'origin/master' zyt10 2017-03-17 16:18:24 +13:00
  • 683f4ba94e Mostly got boats going to marks on the canvas (code currently broken) #story[377] #pair[zyt10, ptg19] zyt10 2017-03-17 16:18:01 +13:00
  • 8fd06c84ac Merged the refactored mark related class with course parser. Haoming Yin 2017-03-17 15:56:37 +13:00
  • 23b163e6c1 Merge branch 'master' into refactor-file-parser Haoming Yin 2017-03-17 15:44:16 +13:00
  • 6383b9a6f8 Deleted the old Mark and GateMark files Haoming Yin 2017-03-17 15:26:38 +13:00
  • 0b3ebf229f Refactor mark related classes. Haoming Yin 2017-03-17 15:21:04 +13:00
  • d6fe155d4d Changed distance calculation to use latitude and longitude Michael Rausch 2017-03-17 11:08:35 +13:00
  • 8829728f19 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 Michael Rausch 2017-03-17 10:27:04 +13:00