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

  • 8ec6490627 Started trying to get the zoomed in gave view to follow the boat. Kusal Ekanayake 2017-08-13 17:02:35 +12:00
  • 0a7a9018f3 Merge branch 'develop' into Story64_SailsAnimations Kusal Ekanayake 2017-08-13 15:27:25 +12:00
  • 93cb0ca600 Updated yacht-yacht collision to push back both yacht. Tweaked acceleration to increase time to top speed. Zhi You Tan 2017-08-13 15:14:14 +12:00
  • 25c2de63a2 Working cucumber tests for sails toggle. Kusal Ekanayake 2017-08-13 14:55:33 +12:00
  • 2411a3cc2c Merge branch 'develop' into Story64_SailsAnimations Kusal Ekanayake 2017-08-13 14:34:42 +12:00
  • fda233f5ad Merge branch 'Story71_TackAndGybeSmoothly' into 'develop' Zhi You Tan 2017-08-13 14:22:28 +12:00
  • c58cb1a476 WIP: Researched and implemented a simple right of way calculation (might be wrong). Zhi You Tan 2017-08-11 23:57:27 +12:00
  • d2fd9ebaea Started work on start screen - Server now sends out race start status messages during lobby & pre-start stages - Added timer in lobby Michael Rausch 2017-08-11 19:03:57 +12:00
  • fda6625256 Merge remote-tracking branch 'origin/develop' into Story66_Collision Zhi You Tan 2017-08-10 20:23:56 +12:00
  • 6ddaaa0dfa Removed extra print statement from test. alistairjmcintyre 2017-08-10 20:18:36 +12:00
  • 55c22fa7e2 Merge branch 'MessageExtensions' into 'develop' William Muir 2017-08-10 20:17:50 +12:00
  • a7b8b0dbc3 Removed redundant input & output streams Michael Rausch 2017-08-10 20:15:08 +12:00
  • 7e1686a980 Packets are sent out when collision happens and receiver is able to interpret and display as visual alert. Updated visual alert to looks better. - Created yacht event code message to be sent out as packet. - Added observers to main server thread on yacht so when collision detected, main server thread will send out yacht event message to all server to client threads. - Updated collision visual alert using circle and animation timer. Zhi You Tan 2017-08-10 19:50:30 +12:00
  • 32b231e78a Added testing for the vmg autopilot Alistair McIntyre 2017-08-10 19:19:41 +12:00
  • 3ad37faedc Merge branch 'develop' into MessageExtensions Michael Rausch 2017-08-10 19:01:46 +12:00
  • 09c4f98056 Implemented new client - server handshake protocol Michael Rausch 2017-08-10 19:01:30 +12:00
  • 1c2870649a Added testing for the tack/gybe settings. Alistair McIntyre 2017-08-10 18:58:38 +12:00
  • a2ee4411be Merge branch 'develop' into Story71_TackAndGybeSmoothly Alistair McIntyre 2017-08-10 17:59:19 +12:00
  • a23352ef85 Merge branch 'develop' into Story71_TackAndGybeSmoothly Alistair McIntyre 2017-08-10 17:59:10 +12:00
  • f9d5bd10b1 Merge branch 'develop' into Story71_TackAndGybeSmoothly Alistair McIntyre 2017-08-10 17:58:19 +12:00
  • 0b8ad137b3 Minor fixes for merge William Muir 2017-08-10 17:47:24 +12:00
  • a746191dba VMG works correctly, auto pilot is interupted by a repeated keypress or an upwind/downwind press. Alistair McIntyre 2017-08-10 17:46:28 +12:00
  • 1772d1c05e Merge branch '1124_Mark_Rounding_Implementation' into 'develop' Michael Rausch 2017-08-10 17:20:33 +12:00
  • 1d7b527130 Tidied code. Added tests William Muir 2017-08-10 16:45:30 +12:00
  • 430779c943 Boat auto pilots correctly for tacking/gybing. Needs proper testing. Alistair McIntyre 2017-08-10 14:53:24 +12:00
  • 9c79897e01 Tidied code, added MidPoint to CompoundMark class William Muir 2017-08-10 13:58:32 +12:00
  • 07386ed2db Improved boat bounce-back calculation Michael Rausch 2017-08-10 13:01:31 +12:00
  • abb15f6edf Fixed Mark rounding Algorithm William Muir 2017-08-10 12:08:03 +12:00
  • 87f2f1fe63 Fixed Mark rounding Algorithm William Muir 2017-08-10 12:07:47 +12:00
  • 249ad9e5c0 Fixed Mark rounding Algorithm William Muir 2017-08-10 12:02:19 +12:00
  • 9d02d2fbea Implemented a fairly simple auto pilot setting for the yacht, on update if the boat is set to autopilot it will adjust the heading towards the desired heading. Needs some refinement. #story[1105] alistairjmcintyre 2017-08-10 02:04:51 +12:00
  • b1598ccb0f Changed testUpdateYachtWithCollision to use MARK_COLLISION_DISTANCE Michael Rausch 2017-08-09 22:36:34 +12:00
  • 08304f9c3e Fixed failing test Michael Rausch 2017-08-09 22:05:49 +12:00
  • 4cc48a355e Added mark collisions Michael Rausch 2017-08-09 21:57:50 +12:00
  • 2c5fddb695 Implemented zooming and clipping of race border. Implementation is still hackish. Calum 2017-08-09 16:56:46 +12:00
  • 126d8ea870 Added factory class for producing mark arrows. Calum 2017-08-09 15:24:32 +12:00
  • 30a6cb98ec Action packets now sent at regular 20ms intervals Calum 2017-08-09 14:03:21 +12:00
  • 8813d06010 Created a simple red blink on a top of a yacht given source id. Created and updated methods reading yacht event packet to translate to collision alert on visualiser. WIP: sending yacht event packet to inform collision Zhi You Tan 2017-08-09 01:26:59 +12:00
  • 0fbca89030 Merge branch 'develop' into Story64_SailsAnimations Kusal Ekanayake 2017-08-08 19:45:08 +12:00
  • 421ef3c65a Started progress on zooming, can now use z and x keys to zoom into map. Kusal Ekanayake 2017-08-08 19:41:51 +12:00
  • 5937f8b640 Merge remote-tracking branch 'origin/develop' into Story66_Collision Zhi You Tan 2017-08-08 17:04:34 +12:00
  • 5ec67d0b80 Added junit for update yacht (after collision implementation). Removed another version of initialise boat positions. Zhi You Tan 2017-08-08 16:51:29 +12:00
  • 941febaf62 Tried to fix cucumber tests, getting closer. Kusal Ekanayake 2017-08-08 16:31:27 +12:00
  • a545e9dbc3 Removing '>' characters from docstrings to fix build William Muir 2017-08-08 16:14:13 +12:00
  • b0e7dddaf3 Fixed gate passing algorithm William Muir 2017-08-08 15:58:13 +12:00
  • ed0a783374 Fixed the bug that boats could round over a gate but still "across" it. Added unit test to ensure the algorithm works. Haoming Yin 2017-08-08 10:42:36 +12:00
  • 97696cc95b Started work on cucumber tests. Trying to sort through threads, getting inconsistent results. Kusal Ekanayake 2017-08-07 17:54:34 +12:00
  • 4375b73257 Implemented algorithm for checking if boat passes through a mark. William Muir 2017-08-07 17:28:12 +12:00
  • f97b18d594 Sailsin graphics moving and working as expected. Kusal Ekanayake 2017-08-07 16:48:30 +12:00
  • c7857872ce Luffing sails animation working correctly, working on sailsin animation now. Kusal Ekanayake 2017-08-07 15:24:01 +12:00
  • 79105a1bdc Created a simple collision detection by iterating each boats per update. Working but sequential checks can be costly. Zhi You Tan 2017-08-07 12:01:26 +12:00
  • a4b22190c0 Changed the spawn point to behind start line and calculated quadrant to make sure yachts spawn behind start line in different map scenario. Zhi You Tan 2017-08-07 11:50:07 +12:00
  • a3ce5998ff Action packets now sent at regular 20ms intervals Calum 2017-08-07 10:58:07 +12:00
  • 7f0329dda6 WIP: Implemented basic mark rounding algorithm. William Muir 2017-08-07 00:23:54 +12:00
  • 8a40119a98 Action packets now sent at regular 20ms intervals Calum 2017-08-06 22:17:08 +12:00
  • a470cb66a2 Updated initialise boat function so it can now initialise boats with distance apart in meters. Zhi You Tan 2017-08-06 21:16:14 +12:00
  • ecf2c52cfa Added tests, and sails to all clients. Kusal Ekanayake 2017-08-06 15:43:22 +12:00
  • 43788bd153 Added a method to test if a geo point is located in a triangle which is formed by other three geo points. The method helps to check the mark rounding. Haoming Yin 2017-08-06 12:36:17 +12:00
  • 81c2a8e0fd WIP: Added test initialise boat position test. Corrected ColorsTest after addition of two new colours. Zhi You Tan 2017-08-05 23:59:58 +12:00
  • e90a0ce435 Merge branch '1124_Mark_Sequence_From_RaceXML' into 'develop' William Muir 2017-08-05 15:18:26 +12:00
  • a727014fcb Implemented boats spawning in parallel at the start line with spacing. Zhi You Tan 2017-08-05 00:31:36 +12:00
  • ae28ccf228 Made sails luff in the right direction. Kusal Ekanayake 2017-08-04 16:24:34 +12:00
  • 281ce2d842 Loading course mark order from RaceXML Michael Rausch 2017-08-04 13:20:50 +12:00
  • f8af9cc259 Works for clients and server. Kusal Ekanayake 2017-08-03 19:07:30 +12:00
  • 8af80e6c3a WIP: Connected game client to main server thread to pass compound mark variable. Boats are initialised in main server thread behind start line before game starts. Zhi You Tan 2017-08-03 18:39:15 +12:00
  • 874cdec654 Added booleans: has entered rounding zone, has crossed first line, has crossed second line William Muir 2017-08-03 17:39:07 +12:00
  • 99d5545ed3 Made the sails work properly by toggling. Kusal Ekanayake 2017-08-03 16:33:51 +12:00
  • 423f1acdb6 Merge remote-tracking branch 'origin/develop' into develop William Muir 2017-08-03 16:29:22 +12:00
  • 454e9ac9f1 Added an attribute to each yacht: 'DistanceToNextMark' William Muir 2017-08-03 16:29:12 +12:00
  • a8e70b3631 Merge branch 'develop' into Story64_SailsAnimations Kusal Ekanayake 2017-08-03 15:19:13 +12:00
  • eb83e9dcc5 Working idle sail animation. Kusal Ekanayake 2017-08-03 14:50:56 +12:00
  • 1ab849fd0d Added cucumber dependency. Zhi You Tan 2017-08-03 14:02:52 +12:00
  • db078538ff Minor cleaning in yacht class William Muir 2017-08-03 13:53:30 +12:00
  • 1c0d869894 Corrected a value in the race.xml Calum 2017-08-03 13:49:53 +12:00
  • f9e6df46c1 Fixed issues caused by merge. Calum 2017-08-03 13:23:43 +12:00
  • 5228c078bc Merge branch 'develop' into 1124_Mark_Sequence_From_RaceXML Calum 2017-08-03 12:27:11 +12:00
  • f5f73ede6b Merge branch 'story61_player_perspective' into 'develop' William Muir 2017-08-03 12:11:20 +12:00
  • 1160f274ee Reformatted code in appropriate style William Muir 2017-08-03 12:06:07 +12:00
  • 53f5d63f15 Fixed build. (Actually this time) ((NOW WERE READY TO MERGE))) William Muir 2017-08-03 11:50:07 +12:00
  • 1150ec3e43 Merge branch 'develop' into story61_player_perspective William Muir 2017-08-03 11:48:54 +12:00
  • c655cb3fab Fixed build. (Actually this time) William Muir 2017-08-03 11:45:14 +12:00
  • 8e24c204fd Fixed build. William Muir 2017-08-03 11:26:44 +12:00
  • 7885b3fae2 Loading course mark order from RaceXML Michael Rausch 2017-08-02 22:03:10 +12:00
  • b01d39f19f Merge remote-tracking branch 'origin/develop' into develop Michael Rausch 2017-08-02 20:42:22 +12:00
  • bbf494e9a1 Merge branch 'master' into 'develop' Michael Rausch 2017-08-02 20:42:07 +12:00
  • eae201cb4b Merge remote-tracking branch 'origin/develop' into develop Michael Rausch 2017-08-02 20:32:43 +12:00
  • 87ef37a689 Fixed connecting to hosts. Fixed issue34 and 35 to the point where they can be developed off of. Calum 2017-08-02 00:26:57 +12:00
  • b2c7b65191 Merge branch 'Logging' into 'master' Alistair McIntyre 2017-08-01 15:20:41 +12:00
  • 908c0749cf Boats now move on screen as intended. Calum 2017-08-01 02:37:55 +12:00
  • 47c5e6f155 Reverting some new graphics classes back to how they were on master. Calum 2017-07-31 23:35:28 +12:00
  • 9deba732b0 Added dependencies for slf4j Michael Rausch 2017-07-31 18:34:55 +12:00
  • b82d0d0137 Boats and map are now updated using the observer pattern. Calum 2017-07-31 05:23:41 +12:00
  • f1ad03e913 Refactored the setup for MarkObjects (now renamed Markers) and made the CompoundMark + Mark + GeoPoint classes the standard across all classes instead of GateMark + SingleMark + Mark. Calum 2017-07-31 02:19:19 +12:00
  • 6cae338c1e Began fixing bugs with caused by asynchronous listener calls. Calum 2017-07-30 20:12:19 +12:00
  • 7894e31926 Merge branch 'develop' into story61_player_perspective Calum 2017-07-30 18:07:28 +12:00
  • 25d8c8f9c4 Minor bug fixes. sprint_5.0 Michael Rausch 2017-07-27 14:15:55 +12:00
  • 1d9dd76356 For client's lobby view, it now can shows the connected host IP Zhi You Tan 2017-07-27 13:12:53 +12:00
  • c2c34705d5 removed an unnecessary print statement and caught an exception Zhi You Tan 2017-07-27 13:01:04 +12:00
  • 96ed5e445e Replaced print stack trace with print statements Zhi You Tan 2017-07-27 12:47:18 +12:00
  • 870dc07fd2 Slight improvements to hosting. Kusal Ekanayake 2017-07-27 12:45:22 +12:00