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

  • 28569506f0 Merge remote-tracking branch 'origin/develop' into develop William Muir 2017-08-16 20:09:20 +12:00
  • dad2ebf693 Fixed double thread issue! :D William Muir 2017-08-16 20:09:05 +12:00
  • 02a7b804c1 Boat Names Change. Colors Change too. Updates clients during lobby when a change is made. Alistair McIntyre 2017-08-16 19:31:27 +12:00
  • 9dbb31dcef Merge branch 'Story40_Zooming' into 'develop' Peter Galloway 2017-08-16 18:25:58 +12:00
  • a932f41cc2 Removed unused boolean in boat objects Kusal Ekanayake 2017-08-16 18:19:55 +12:00
  • 3570a3d2eb Removed unneeded imports Kusal Ekanayake 2017-08-16 18:16:55 +12:00
  • 85852df176 Modified limits to zooming Kusal Ekanayake 2017-08-16 18:06:39 +12:00
  • 6d045e9976 Merge branch 'develop' into Story80_BoatCustomization Alistair McIntyre 2017-08-16 17:59:11 +12:00
  • 4fc00f8a3c Boat names now change, just the issue of the lobby not updating unless another person joins/leaves to try and fix. Alistair McIntyre 2017-08-16 17:57:22 +12:00
  • 9c2bac36b6 Merge branch 'develop' into Story40_Zooming Kusal Ekanayake 2017-08-16 17:27:09 +12:00
  • 8501fc0b6d Added limits to zooming Kusal Ekanayake 2017-08-16 17:25:51 +12:00
  • e9e7f306cd Merge branch 'Story1117_Course_Boundary_Collision' into 'develop' Michael Rausch 2017-08-16 17:25:14 +12:00
  • fa68a5fdff Fixed commented out test Michael Rausch 2017-08-16 17:23:52 +12:00
  • 07a39722fb Minor bug fix to velocity calculation William Muir 2017-08-16 17:23:14 +12:00
  • 1d4ab0e1fa Merge remote-tracking branch 'origin/develop' into develop William Muir 2017-08-16 17:22:14 +12:00
  • 653651f97f Minor bug fix to velocity calculation William Muir 2017-08-16 17:22:00 +12:00
  • b1ba6e729a Merge branch 'StartScreen' into 'develop' Haoming Yin 2017-08-16 17:12:17 +12:00
  • 99685d76a9 Merge remote-tracking branch 'origin/develop' into develop Haoming Yin 2017-08-16 16:55:53 +12:00
  • 711c94001b Fixed game crash, and improved timer Michael Rausch 2017-08-16 16:34:31 +12:00
  • 7f3d66d01d Checked if a boat has crossed the boundary/course limit, if so, bounce the boat back. Zhi You Tan 2017-08-16 16:33:14 +12:00
  • 1db75a8ae4 Request Messages now sending to server, need to update game and send response packet. Alistair McIntyre 2017-08-16 14:54:50 +12:00
  • 7b9d28ade9 Progress made on the improper tracking of boats (boats aren't being correctly centered). Kusal Ekanayake 2017-08-16 14:51:52 +12:00
  • 5843fc9212 The merge went well!! Michael Rausch 2017-08-16 14:51:44 +12:00
  • 3542c646f8 Marker class can now store and show multiple arrows sequentially Calum 2017-08-16 14:51:05 +12:00
  • 8fb5ea2223 Merge branch 'develop' into StartScreen Michael Rausch 2017-08-16 14:31:14 +12:00
  • 958c1e216f Fixed sail toggling issues and test. Kusal Ekanayake 2017-08-16 14:30:37 +12:00
  • 100689a20b Merged develop onto zooming for easier merge later on. Kusal Ekanayake 2017-08-16 13:15:15 +12:00
  • 2da887e677 Merge branch 'develop' into Story40_Zooming Kusal Ekanayake 2017-08-16 13:13:39 +12:00
  • bd213bcd9e Merge branch 'develop' into Story80_BoatCustomization Alistair McIntyre 2017-08-16 13:06:31 +12:00
  • bf016356a6 Finish screen now displays correctly on finishing. William Muir 2017-08-16 13:04:34 +12:00
  • 76a750a764 Moved sendRaceStatus Message out of S2C Thread into MS Thread (minor refactor) William Muir 2017-08-16 11:53:29 +12:00
  • 000d562ffe SailIn / out animation on client is now correct again William Muir 2017-08-16 11:27:46 +12:00
  • d02f2385dd Merge remote-tracking branch 'origin/develop' into develop Haoming Yin 2017-08-16 10:11:58 +12:00
  • a5261494cd Merge remote-tracking branch 'origin/1124_broadcast_mark_rounding_message' into 1124_broadcast_mark_rounding_message Haoming Yin 2017-08-16 10:06:25 +12:00
  • ac47e9d88a Game state now updates based on boat position. Arrows drawn as boat travels course. Currently do not point in correct direction, also the sparkline does not work. Calum 2017-08-16 03:51:48 +12:00
  • 7329f7dc65 Merge branch 'develop' into story1118_map_arrows Calum 2017-08-16 01:35:15 +12:00
  • 7c5f146b11 Merge to integrate develop with separated Yacht classes. Functionality from this branch is not yet completed. Calum 2017-08-16 01:23:38 +12:00
  • e3fbbd4590 Fixed sails in and out test. Calum 2017-08-16 01:19:34 +12:00
  • dc8baa09a3 Re-implemented collision tests. Calum 2017-08-16 01:17:40 +12:00
  • 720ce0ae5b Merged with develop. Moved all collision logic into game state. Calum 2017-08-16 01:04:16 +12:00
  • a7a667b4bc Merge branch 'develop' into 1124_switching_to_finish_screen Calum 2017-08-15 23:45:50 +12:00
  • 4e68cf31cf Fixed finish screen switch Calum 2017-08-15 23:30:27 +12:00
  • d03460d69e Implemented boat tracking when boat is selected by either clicking or selecting from sidebar combo box. Clicking tracked boat will cancel tracking, but using combobox will always result in one boat being selected. Zhi You Tan 2017-08-15 23:16:25 +12:00
  • 50baf6f85b implemented race finish functionality, finish screen not loading properly yet #story[1124] Peter Galloway 2017-08-15 20:48:51 +12:00
  • 23a04facbe ServerYachts now send now have their own boat status. William Muir 2017-08-15 20:24:51 +12:00
  • 7fbecc8b3d Fixed juttery movements when zooming and sometimes tracking. Kusal Ekanayake 2017-08-15 19:14:16 +12:00
  • 9cb5956f3c Updated lobby controller to pass the player ID through, and the lobby view to have a customize button. Alistair McIntyre 2017-08-15 16:48:23 +12:00
  • 366ebb3adb Merge branch 'Story66_Collision' into 'develop' Alistair McIntyre 2017-08-15 15:53:36 +12:00
  • 458bd5408f Merge remote-tracking branch 'origin/1124_broadcast_mark_rounding_message' into 1124_broadcast_mark_rounding_message Haoming Yin 2017-08-15 15:21:10 +12:00
  • c00d165f47 Merge remote-tracking branch 'origin/1124_broadcast_mark_rounding_message' into 1124_broadcast_mark_rounding_message Calum 2017-08-15 15:13:40 +12:00
  • d2bb15471a Changed the velocity equation for boats to handle outlying scenarios such as 0 velocity. Calum 2017-08-15 15:12:39 +12:00
  • c0cd260610 Fixed junit fail Zhi You Tan 2017-08-15 15:06:11 +12:00
  • 6a9357f598 Merged Develop onto refactored yacht branch Haoming Yin 2017-08-15 15:04:35 +12:00
  • 6909f99773 Merge remote-tracking branch 'origin/develop' into 1124_broadcast_mark_rounding_message Haoming Yin 2017-08-15 14:58:13 +12:00
  • ce5424cc79 Fixed develop merge and now collision works Zhi You Tan 2017-08-15 14:53:15 +12:00
  • c125708a4a Final commit for yacht refactor Haoming Yin 2017-08-15 14:49:16 +12:00
  • 2dc0ba07d9 WIP: Second commit for seperating server and client yacht classes tags: #story[1124] Haoming Yin 2017-08-15 14:30:39 +12:00
  • 2a3231d334 Merge remote-tracking branch 'origin/develop' into Story66_Collision Zhi You Tan 2017-08-15 14:30:01 +12:00
  • d6a436d2eb WIP: Initial commit for seperating server and client yacht classes tags: #story[1124] Haoming Yin 2017-08-15 14:18:48 +12:00
  • baacd8a9c0 Refactor. Taken Rounding logic out of yacht and into game state. William Muir 2017-08-14 23:52:06 +12:00
  • e1dddd317d WIP: Minor fixes William Muir 2017-08-14 17:57:41 +12:00
  • b9ae9c4730 made server send appropriate racestatus flags in the race status packet #pair[mra106, ptg19] #story[1109] Peter Galloway 2017-08-14 17:55:53 +12:00
  • fab5f9229f Got the boat's to track and center correctly. Kusal Ekanayake 2017-08-14 17:27:14 +12:00
  • ff92262a78 fixed race clock countdown/count up #story[1109] Peter Galloway 2017-08-14 16:32:50 +12:00
  • a4547e12cb Merged develop into this branch and resolved conflicts William Muir 2017-08-14 16:21:18 +12:00
  • 1a39b6e4a3 Merge branch 'develop' into 1124_broadcast_mark_rounding_message William Muir 2017-08-14 16:16:04 +12:00
  • 58446ffaed MarkRounding Message now sent out correctly. William Muir 2017-08-14 16:11:32 +12:00
  • 1f09005147 Message types for Request and Response created, and Messages for them also created. tags: #story[1142] Alistair McIntyre 2017-08-14 15:30:42 +12:00
  • 3754b71f4d Merged updated develop into branch. tags: #story[1142] Alistair McIntyre 2017-08-14 14:31:02 +12:00
  • 1d2222b599 Merge branch 'develop' into Story80_BoatCustomization Alistair McIntyre 2017-08-14 14:23:05 +12:00
  • 89ceab0c4b Merge branch 'Story64_SailsAnimations' into 'develop' Alistair McIntyre 2017-08-14 14:19:00 +12:00
  • 76dabb8138 Merge remote-tracking branch 'origin/Story64_SailsAnimations' into Story64_SailsAnimations Alistair McIntyre 2017-08-14 14:17:10 +12:00
  • 8b543488e3 Fixed faulty develop merge and completed manual testing before merging back into develop. Alistair McIntyre 2017-08-14 14:15:34 +12:00
  • c52c345e53 Merge branch 'develop' into Story64_SailsAnimations Alistair McIntyre 2017-08-14 14:04:53 +12:00
  • 9420717b44 Added Messages to MessageType, continued working on request. Alistair McIntyre 2017-08-14 13:38:41 +12:00
  • 9c1fe72f6b Merge and tests fix Kusal Ekanayake 2017-08-14 13:35:18 +12:00
  • 2e892f35ea Merge branch 'develop' into Story64_SailsAnimations Kusal Ekanayake 2017-08-14 13:32:57 +12:00
  • bedd742c93 Started on Request/Response packets for the Boat customization to begin the boat customization process. Alistair McIntyre 2017-08-14 13:26:51 +12:00
  • add6856727 Merge remote-tracking branch 'origin/Story64_SailsAnimations' into Story64_SailsAnimations Kusal Ekanayake 2017-08-14 13:22:56 +12:00
  • 4dc6b2af2b Merge fix Kusal Ekanayake 2017-08-14 13:20:15 +12:00
  • e65558b8ac Merge branch 'develop' into Story40_Zooming Kusal Ekanayake 2017-08-14 13:17:39 +12:00
  • e4cc5a0950 Fixing develop (sort of) William Muir 2017-08-14 12:52:58 +12:00
  • 4b4f8a25a3 Merge branch 'issue38_irregular_key_event_packets' into 'develop' William Muir 2017-08-14 12:49:52 +12:00
  • c77adf385e Terminating client thread before server thread to prevent alert box popping up Zhi You Tan 2017-08-14 11:21:33 +12:00
  • 9b7f4a93d8 Merge remote-tracking branch 'origin/issue38_irregular_key_event_packets' into issue38_irregular_key_event_packets Zhi You Tan 2017-08-14 11:02:19 +12:00
  • e780b47160 Fix javafx error on ci Zhi You Tan 2017-08-14 11:02:07 +12:00
  • 028fc44dce Yacht now extends observable and can notify server to client thread to broadcast message. Haoming Yin 2017-08-14 10:48:11 +12:00
  • a185c9dc96 Implemented a factory class that creates mark arrows as needed. Needs to integrated with the real world data and tested to work. Works with all test data so far. cir27 2017-08-14 03:44:46 +12:00
  • 52e10997f1 Build issues caused by vm unable to open socket connections. Leaving as is for now. Calum 2017-08-13 21:07:21 +12:00
  • f2f750298c Added print statements for determining where javaFX is accessed from in the test. Calum 2017-08-13 21:05:28 +12:00
  • 1755b00079 Unncommented test to see if it breaks the build at remote repo. Calum 2017-08-13 20:59:03 +12:00
  • a844585faf Empty tests to check where bug is occuring Calum 2017-08-13 20:54:13 +12:00
  • b7fe79a5cc Attempted fix for build issues due to javaFX toolkit not being initialized. Calum 2017-08-13 20:44:23 +12:00
  • 2d5492601f Fixed build issues caused by changes to a yacht step turn constant. Calum 2017-08-13 20:40:18 +12:00
  • 0ee12021e2 Fixed bug that stopped clients from getting updated xml data. Calum 2017-08-13 20:29:10 +12:00
  • 6218d5506b Fixed bug that stopped clients from getting updated xml data. Calum 2017-08-13 20:24:03 +12:00
  • d79b0421c2 Fixed merged conflicts with merge onto develop. Calum 2017-08-13 19:00:06 +12:00
  • 0b978593d4 Solved the fps counter zoom together with canvas problem. Workaround used was changing fps counter on game view to race view. Zhi You Tan 2017-08-13 18:52:42 +12:00
  • 8cb5b8caec Merge branch 'develop' into issue38_irregular_key_event_packets Calum 2017-08-13 18:44:34 +12:00
  • 2093e79b6a Rather than a high frequency loop sending all packets a low frequency loop is made then destroyed on button press for sending turn packets. This means a fast response time on button press but fewer packets sent. Calum 2017-08-13 18:38:24 +12:00