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

  • a08a38c985 - Fixed Merge Errors alistairjmcintyre 2017-09-27 22:25:32 +13:00
  • 810dde6a21 Merge branch 'develop' into 1276_Next_Mark_Indicator alistairjmcintyre 2017-09-27 22:15:02 +13:00
  • 7a76efa2ce - Added ability to color the indicators. alistairjmcintyre 2017-09-27 22:07:24 +13:00
  • ff4c2cd5b6 Merge branch '1273_Skybox' into 'develop' William Muir 2017-09-27 21:52:34 +13:00
  • c5e6302f86 - Added circle to boat to indicate which boat is the players and to show where the arrow is pointing. alistairjmcintyre 2017-09-27 21:31:02 +13:00
  • cd199767ae created new models for all pickups #story[1293] Peter Galloway 2017-09-27 20:40:40 +13:00
  • 5cc4898ab5 Fixed failing tests & other bug fixes Michael Rausch 2017-09-27 20:37:29 +13:00
  • 22e1e57c24 Issue #73: If you change controls to 'Continuously turning' before moving into game, it is not applied Haoming Yin 2017-09-27 20:18:06 +13:00
  • c5d2016733 Merge branch 'issue_#67_early_start' into 'develop' Haoming Yin 2017-09-27 19:42:05 +13:00
  • efc71f2003 Resolved issue #69 and added dock icon for splash screen. Kusal Ekanayake 2017-09-27 19:27:13 +13:00
  • be72062c8e Merge branch 'develop' into 1276_Next_Mark_Indicator Alistair McIntyre 2017-09-27 19:25:08 +13:00
  • 0d212a4a1d - Indicator works correctly, sits in the right place, rotates around the boat correctly and sits on top of the water now. Alistair McIntyre 2017-09-27 19:20:33 +13:00
  • 0e9b818071 - Indicator points towards the next mark. Seems to do some funny stuff when entering a compound mark(gate). Alistair McIntyre 2017-09-27 18:50:38 +13:00
  • 452e83c1c3 - Marker seems to be detecting the correct mark but somethings wrong with the maths. Alistair McIntyre 2017-09-27 17:52:54 +13:00
  • aded794a67 - Added new indicator for direction to next mark. - Marker rotates towards a given heading. Alistair McIntyre 2017-09-27 17:17:50 +13:00
  • 2b3a972ed5 Various bug fixes Michael Rausch 2017-09-27 17:14:55 +13:00
  • 2a523a5664 Added a duck boat mesh. Calum 2017-09-27 17:03:02 +13:00
  • 270326ea77 Created prototype compass arrow mesh Zhi You Tan 2017-09-27 16:03:59 +13:00
  • 67f3124cfb Merge branch 'develop' into 1273_Skybox Michael Rausch 2017-09-27 15:32:54 +13:00
  • 7db387bdec Merged Host Customisation onto 1273_Skybox Michael Rausch 2017-09-27 15:31:54 +13:00
  • 2ceca2fd42 Merge branch 'loading_screens' into 'develop' Alistair McIntyre 2017-09-27 15:05:36 +13:00
  • 00ff771fc3 Merge remote-tracking branch 'origin/story1275_host_customization' into 1273_Skybox Michael Rausch 2017-09-27 14:56:09 +13:00
  • d963785679 Added files from merge Michael Rausch 2017-09-27 14:47:32 +13:00
  • 78f64557c3 Merged dev onto 1273_Skybox Michael Rausch 2017-09-27 14:46:12 +13:00
  • 982fac38a0 Merge remote-tracking branch 'origin/develop' into 1273_Skybox Michael Rausch 2017-09-27 14:23:38 +13:00
  • edbfb2f84f Modified timings for load screen. Kusal Ekanayake 2017-09-27 14:16:27 +13:00
  • c01111038f Merge branch 'develop' into loading_screens Kusal Ekanayake 2017-09-27 14:05:46 +13:00
  • fd53fd52a4 Forgot to git add the new icon.. again.. sorree William Muir 2017-09-27 12:44:50 +13:00
  • 6f62efcc93 Updated the icons to be more uniform and transparent William Muir 2017-09-27 12:44:22 +13:00
  • daf3867433 Server discovery bug fixes & error handling improvements Michael Rausch 2017-09-27 12:32:17 +13:00
  • e5af7bf666 Minor fixes. Only one person can have wind walker now. Tokens spawn at 30s rather than 15 1293_PowerUps William Muir 2017-09-27 12:06:16 +13:00
  • 85ca91db96 Minor fixes. Only one person can have wind walker now. Tokens spawn at 30s rather than 15 William Muir 2017-09-27 11:55:40 +13:00
  • 2eb7e603f1 Merge remote-tracking branch 'origin/develop' into 1293_PowerUps William Muir 2017-09-27 03:01:41 +13:00
  • 658a342118 Added the bad random to git sorree forgot to git add William Muir 2017-09-27 03:01:23 +13:00
  • c0bd498f1b Added debugs for missing xml story1275_host_customization Calum 2017-09-27 02:50:36 +13:00
  • ea52977aeb Merge branch '1293_PowerUps' into 'develop' Calum Irwin 2017-09-27 02:47:57 +13:00
  • 10fa51a105 Added some testing for the Random spawner William Muir 2017-09-27 02:27:30 +13:00
  • b18d9e8573 Added empty cucumber Calum 2017-09-27 02:04:58 +13:00
  • e9881bb24a Added per map max player count. Handles case when map cannot fit players behind start mark. Added initial implementation for spacing out yachts. Calum 2017-09-27 02:04:24 +13:00
  • c54a1e141d Merge remote-tracking branch 'origin/develop' into 1293_PowerUps William Muir 2017-09-27 01:49:18 +13:00
  • 6d51ea3574 Created a random place token generator. William Muir 2017-09-27 01:44:01 +13:00
  • d56468e4aa - Fixed snackbar not showing on race view - Added close label on server creation dialog Zhi You Tan 2017-09-27 00:38:42 +13:00
  • ab5ad58237 Merge branch 'develop' into story1275_host_customization Calum 2017-09-26 23:37:59 +13:00
  • df7264cc1f Added per map max player count. Handles case when map cannot fit players behind start mark. Added initial implementation for spacing out yachts. Calum 2017-09-26 23:34:19 +13:00
  • 5248921576 Multiple fixes: - fix last button no longer default focused when loading keybinding dialog - fix click and mouse exit still focused on button - closing keybinding does not focus on chat anymore Zhi You Tan 2017-09-26 22:52:58 +13:00
  • 330ccd272d The random token now has a 50% chance of causing your boat to have a speed penalty William Muir 2017-09-26 21:13:35 +13:00
  • 4b7dfe38c4 Fixed Boats powering up and down correctly. Icons respond correctly William Muir 2017-09-26 19:43:32 +13:00
  • ab07c7f298 Merge remote-tracking branch 'origin/develop' into 1293_PowerUps William Muir 2017-09-26 19:01:53 +13:00
  • b5076bc976 Fixed wind walker and bumper William Muir 2017-09-26 18:57:15 +13:00
  • 2dcdd1c248 Merge branch '1273_Changing_Cameras' into 'develop' Michael Rausch 2017-09-26 18:36:59 +13:00
  • 9b00f76907 removed print statements and added documentation. Alistair McIntyre 2017-09-26 18:36:13 +13:00
  • f11c457d28 removed print statements Alistair McIntyre 2017-09-26 18:31:47 +13:00
  • 9e4fa30787 Merge branch 'issue68_boat_not_turning_on_starbord_vmg' into 'develop' Michael Rausch 2017-09-26 18:11:24 +13:00
  • 99ce4fa11d Merged develop in and reimplemented keybindings for moving the camera. Alistair McIntyre 2017-09-26 18:01:39 +13:00
  • 69d1fa9488 Merge branch 'develop' into 1273_Changing_Cameras Alistair McIntyre 2017-09-26 17:36:40 +13:00
  • 66e6a8a2a4 - Small Changes Alistair McIntyre 2017-09-26 17:35:36 +13:00
  • 671efcaf08 Adding spinners to the loading screen. Kusal Ekanayake 2017-09-26 17:25:57 +13:00
  • 8ba44d7476 Minor commit for testing William Muir 2017-09-26 17:19:45 +13:00
  • dd43097677 the boat can now turn after snapping to starboard vmg #story[1273] issue68_boat_not_turning_on_starbord_vmg Peter Galloway 2017-09-26 17:07:55 +13:00
  • 98abe64f00 Added splash and loading screen Kusal Ekanayake 2017-09-26 17:07:02 +13:00
  • 1a53579317 - Isometric Camera - Zoom Bounds added. - Camera Panning Bounds added. Need to be tested with extra maps. Alistair McIntyre 2017-09-26 16:57:07 +13:00
  • 132a729758 Temporarily added more options in key binding dialog. But still need to implement binding after camera story has been merged into develop Haoming Yin 2017-09-26 15:49:16 +13:00
  • 870d7a6e82 added a check in the start logic to make sure a boat can't cross the start line prematurely (they will have to go back and go through it again) #fix #refactor Peter Galloway 2017-09-26 15:25:24 +13:00
  • 2e7487fdfc - Chase Camera: - Has panning bounds, zoom bounds, and general tidy up. - Now correctly observes the boat object rather than getting information from both the boat object AND the client yacht model. alistairjmcintyre 2017-09-26 15:06:21 +13:00
  • 1bd4db73cd Issue 66: client side error pop ups use default javaFx style Haoming Yin 2017-09-26 14:44:37 +13:00
  • 7a4cdbe0c9 Fixed WindWalker William Muir 2017-09-26 11:12:29 +13:00
  • 735699dc85 Changed default number of legs. Calum 2017-09-26 01:53:33 +13:00
  • 81e791bd1a Fixed issues with showing race view controller. Added missing icons. Added a smooth version of land. Calum 2017-09-26 01:49:43 +13:00
  • 06e5f4ae00 Merge remote-tracking branch 'origin/1273_Skybox' into 1273_Skybox Calum 2017-09-26 01:35:07 +13:00
  • cd2b4cb93c fixed anchor pane issues Calum 2017-09-26 01:34:59 +13:00
  • dde1c82dbb merge with host customization and dev. Calum 2017-09-26 01:21:55 +13:00
  • d9c832168b Merge branch 'story1275_host_customization' into 1273_Skybox Calum 2017-09-26 01:19:47 +13:00
  • 9cfb3b9e5d Added functionality to automatically select a server Michael Rausch 2017-09-26 01:14:02 +13:00
  • e990c68d40 #document Calum 2017-09-26 01:12:43 +13:00
  • 83871a0336 Fixed boat trials rendering abnormally Calum 2017-09-26 01:07:02 +13:00
  • 6cba024d64 Made changes to the shape of boat trials. Calum 2017-09-26 00:59:04 +13:00
  • 51747e2d13 Refactored the 2D and 3D game view class setups. Made scaling more logical. Calum 2017-09-26 00:55:28 +13:00
  • b3981b19e0 Merge branch 'develop' into story1275_host_customization Calum 2017-09-25 23:25:33 +13:00
  • 3d7a64068f Fixed scaling issues. Calum 2017-09-25 23:19:03 +13:00
  • c12f7408ad experimenting with map scaling Calum 2017-09-25 22:57:45 +13:00
  • 7027de80c4 Fixed issues with correct protocol implementation. Calum 2017-09-25 22:09:26 +13:00
  • 35b50d1436 Refactored 2d game view distance calculations to better size and sale the map, Calum 2017-09-25 21:06:18 +13:00
  • 562d641703 Fixed alignment on room code label, and room code input 1281_Server_Discovery_Internet Michael Rausch 2017-09-25 20:19:21 +13:00
  • d0844e861d Changed water color to blue Michael Rausch 2017-09-25 19:25:03 +13:00
  • 5d32d76d9d Added local skybox texture, and changed water color Michael Rausch 2017-09-25 19:19:46 +13:00
  • 9ca39d1a7c Merge branch '1273_Changing_Cameras' into 1273_Skybox Michael Rausch 2017-09-25 18:40:15 +13:00
  • 30dad8509e Added skybox & cleaned up server list UI Michael Rausch 2017-09-25 18:25:24 +13:00
  • 0211f2df38 Merged dev back on William Muir 2017-09-25 17:38:09 +13:00
  • dba5a5680f Merge remote-tracking branch 'origin/develop' into 1293_PowerUps William Muir 2017-09-25 17:20:25 +13:00
  • 5c50e77efa Merge branch 'Story1278_keybindings' into 'develop' William Muir 2017-09-25 17:11:12 +13:00
  • 0e93be7b36 Fixed send button traversable issue. Story1278_keybindings Zhi You Tan 2017-09-25 17:06:36 +13:00
  • 191b818e38 Added close button for keyBindingDialog. Zhi You Tan 2017-09-25 16:31:28 +13:00
  • 00b09997b0 - Added Camera panning to chase camera mode. Alistair McIntyre 2017-09-25 16:28:37 +13:00
  • d250c635d8 - Adjusted server tick rate to test smoothing Alistair McIntyre 2017-09-25 15:32:13 +13:00
  • 376c4d25a8 Merge branch 'develop' into 1273_Changing_Cameras Alistair McIntyre 2017-09-25 14:40:19 +13:00
  • e66abb4340 - An attempt at chase cam smoothing. needs work. Alistair McIntyre 2017-09-25 14:39:09 +13:00
  • a19e191684 - Chase cam kind of working, need to find a fix for the abrupt direction change. Alistair McIntyre 2017-09-25 14:03:47 +13:00
  • 29b97a194d Merged dev back on William Muir 2017-09-25 11:26:44 +13:00
  • 8a0ad8d6a9 Merge remote-tracking branch 'origin/develop' into 1293_PowerUps William Muir 2017-09-25 11:19:10 +13:00
  • 19db6668da Fixed merge conflicts in server yacht Haoming Yin 2017-09-25 11:09:14 +13:00