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

  • a8599d788b README.md edited online with Bitbucket master Michael Rausch 2018-08-12 12:18:31 +00:00
  • 5101e55413 README.md edited online with Bitbucket Michael Rausch 2018-08-12 12:07:19 +00:00
  • 6ecd1c82f4 Updated readme with SENG302 description and authors Michael Rausch 2018-06-19 12:15:46 +00:00
  • ffd94b34bc Fixed error to do with icons/tokens William Muir 2017-10-11 15:11:21 +13:00
  • ba49660868 added runlater to snackback Kusal Ekanayake 2017-10-11 14:27:32 +13:00
  • 5dbc23866a Fixed start line boat position algorithm. Fixed map limits and max players. Fixed concurrency bug on token creation and pickup. Fixed mini map arrows not rendering correctly for finish lines on maps other than the original. Removed System.gc() call after memory issues causing pauses could not be replicated. Calum 2017-10-11 00:13:55 +13:00
  • 057af2799a Added toggle button css settings sprint_8.0 wind_arrow William Muir 2017-09-28 16:47:55 +13:00
  • 45669c333a Merge remote-tracking branch 'origin/develop' into wind_arrow Zhi You Tan 2017-09-28 16:43:38 +13:00
  • f7fd5494ef merged Dev in Fixed concurrency exception Zhi You Tan 2017-09-28 16:40:50 +13:00
  • a1d468c689 Added toggle button for the chat history develop William Muir 2017-09-28 16:39:59 +13:00
  • 6fafb02a8f Merge branch 'develop' into wind_arrow Zhi You Tan 2017-09-28 16:36:34 +13:00
  • 4f80640718 Polished raceview UI elements Haoming Yin 2017-09-28 16:33:16 +13:00
  • d436d2a6e4 Wind arrow now follows on every camera Follows correctly Zhi You Tan 2017-09-28 16:31:10 +13:00
  • 27379ae96d Fixed fatal bug to do with mark arrow on boat. Kusal Ekanayake 2017-09-28 16:27:57 +13:00
  • ce3e08abfc Changed minimise and maximise icons for minimap Kusal Ekanayake 2017-09-28 16:18:44 +13:00
  • 923c381797 Merge remote-tracking branch 'origin/develop' into develop Calum 2017-09-28 16:17:27 +13:00
  • ece45ff967 Fixed map, parrot and camera. Calum 2017-09-28 16:17:19 +13:00
  • 02dc1dbd3d Merge remote-tracking branch 'origin/develop' into develop William Muir 2017-09-28 16:04:29 +13:00
  • d9b9c2f808 Merge remote-tracking branch 'origin/develop' into develop Michael Rausch 2017-09-28 16:04:07 +13:00
  • 4e3de02a93 Merge remote-tracking branch 'origin/develop' into develop William Muir 2017-09-28 16:04:04 +13:00
  • 261f68f143 Added port number randomization Michael Rausch 2017-09-28 16:03:59 +13:00
  • ed9b7acc62 New Map! Waiheke William Muir 2017-09-28 16:03:56 +13:00
  • 74c1219e0d Merge remote-tracking branch 'origin/develop' into develop Michael Rausch 2017-09-28 16:02:04 +13:00
  • 83218ae0a0 Merge remote-tracking branch 'origin/develop' into develop Calum 2017-09-28 16:01:32 +13:00
  • 0231c43a2c Arrows work. mark arrow thinner. refactored marker class. Calum 2017-09-28 16:01:24 +13:00
  • a05a41d5ec Added port number randomization Michael Rausch 2017-09-28 15:57:59 +13:00
  • 06bc3644bc Removed dead code in MeesageFactory and redundant classes Haoming Yin 2017-09-28 15:54:09 +13:00
  • 7620f0023e Removed dead code in MainServerThread Haoming Yin 2017-09-28 15:43:35 +13:00
  • 77ee1ebbc0 Fixed faulty tests. Kusal Ekanayake 2017-09-28 15:35:58 +13:00
  • 6d0835b0cf Merge remote-tracking branch 'origin/develop' into develop William Muir 2017-09-28 15:29:00 +13:00
  • 54410efa12 Changed garbage collection to once every second, Changed wind walker icon to white William Muir 2017-09-28 15:24:45 +13:00
  • 74241ee819 Merge remote-tracking branch 'origin/develop' into develop William Muir 2017-09-28 15:23:50 +13:00
  • a9ce8901f5 Merge remote-tracking branch 'origin/develop' into develop Kusal Ekanayake 2017-09-28 15:17:06 +13:00
  • 8810554ce9 Fixed bug where server wasn't being unregistered from discovery server Michael Rausch 2017-09-28 15:16:37 +13:00
  • 7e3ed872ed Merge remote-tracking branch 'origin/develop' into develop Kusal Ekanayake 2017-09-28 15:08:53 +13:00
  • 21ce34dda2 Fixed finish screen and cleaned up dead code Kusal Ekanayake 2017-09-28 15:08:34 +13:00
  • 2bf318a122 Merge branch 'story1273_minimap' into develop William Muir 2017-09-28 15:08:32 +13:00
  • e56d284792 Merge remote-tracking branch 'origin/develop' into develop Michael Rausch 2017-09-28 15:00:24 +13:00
  • 80c26a9e4a Fixed bug where server could connect to an expired server Michael Rausch 2017-09-28 15:00:00 +13:00
  • e1ebbc71c1 Added drawing to fx thread story1273_minimap Calum 2017-09-28 14:57:52 +13:00
  • c4a3df32c8 Merge remote-tracking branch 'origin/develop' into develop Calum 2017-09-28 14:47:00 +13:00
  • 1e19dd5ab6 Fixed parrot again. Calum 2017-09-28 14:46:55 +13:00
  • c98297ea79 Merged dev changes back on to mini map William Muir 2017-09-28 14:44:16 +13:00
  • 1aedcaddf5 removed an added print statement Alistair McIntyre 2017-09-28 14:42:34 +13:00
  • d7fc339ad5 - Added Madagascar Map Alistair McIntyre 2017-09-28 14:41:35 +13:00
  • a5eea10c87 Merge branch 'develop' into story1273_minimap William Muir 2017-09-28 14:41:08 +13:00
  • 51078c82a0 Merge remote-tracking branch 'origin/develop' into wind_arrow Zhi You Tan 2017-09-28 14:38:31 +13:00
  • 22fbb529ef Wind arrow follows wind data Zhi You Tan 2017-09-28 14:37:46 +13:00
  • 02aabc3162 Removing dead code in race view controller and fixed mark rounding bug Kusal Ekanayake 2017-09-28 14:35:40 +13:00
  • d2a05de25a Merge remote-tracking branch 'origin/develop' into develop Alistair McIntyre 2017-09-28 14:34:39 +13:00
  • 597fbe935f Merge remote-tracking branch 'origin/develop' into develop Calum 2017-09-28 14:28:16 +13:00
  • 7cfad28d6b Fixed parrot Calum 2017-09-28 14:28:07 +13:00
  • 3345734efd Fixed memory leak by forcing garbage collection Michael Rausch 2017-09-28 14:22:33 +13:00
  • 9795083d4d Added confirm button in keybinding dialog. Haoming Yin 2017-09-28 13:58:25 +13:00
  • f02208ba3a Loopty loop map added Kusal Ekanayake 2017-09-28 13:33:09 +13:00
  • d3e8a21d2f Made the windView observer the gameView camera Zhi You Tan 2017-09-28 13:18:19 +13:00
  • b9a2d60115 Merged dev changes back on to mini map William Muir 2017-09-28 12:58:19 +13:00
  • 076c4c9a40 Merge branch 'develop' into story1273_minimap William Muir 2017-09-28 12:54:12 +13:00
  • 8d74c3b756 Merge remote-tracking branch 'origin/develop' into develop Calum 2017-09-28 12:44:33 +13:00
  • 3f666fa092 Made waka larger. Calum 2017-09-28 12:44:24 +13:00
  • 55d82298b6 Beautified the loading splash screen Haoming Yin 2017-09-28 12:42:46 +13:00
  • 09c02d5c54 Finish screen not appearing. Start screen opened simultanously. arrow_fix Calum 2017-09-28 12:35:47 +13:00
  • 909407fe63 Merge branch '1293_PowerUps_TokenInfo' into develop William Muir 2017-09-28 12:31:14 +13:00
  • cb4e47f71a Fixed icon backgrounds to be white 1293_PowerUps_TokenInfo William Muir 2017-09-28 12:31:00 +13:00
  • 499acb9733 Merge branch '1293_PowerUps_TokenInfo' into develop William Muir 2017-09-28 12:21:12 +13:00
  • 5688e10e6f Tokens now display on the right and are clickable for further information William Muir 2017-09-28 12:20:16 +13:00
  • c72c4929ff Merge remote-tracking branch 'origin/develop' into develop Alistair McIntyre 2017-09-28 12:15:44 +13:00
  • 56d18ad8ad - Initial commit to attempt to smooth turning. issue78_boat_turning_speed Alistair McIntyre 2017-09-28 12:13:10 +13:00
  • 265b20ad61 - Created Madagascar Map Initial Alistair McIntyre 2017-09-28 12:12:22 +13:00
  • 5cbd729214 Tokens now display on the right and are clickable for further information William Muir 2017-09-28 12:08:14 +13:00
  • ddf5a96e0f Merge branch '1276_Next_Mark_Indicator' into develop Calum 2017-09-28 12:03:30 +13:00
  • 81b2d285e9 Changed arrow colour. 1276_Next_Mark_Indicator Calum 2017-09-28 12:02:24 +13:00
  • 5d7f307260 Changed arrow colour. Calum 2017-09-28 12:02:09 +13:00
  • 852575c9e7 Merge remote-tracking branch 'origin/develop' into wind_arrow Zhi You Tan 2017-09-28 11:57:12 +13:00
  • 4ec23a1785 Fixed race fxml not showing other elements Kusal Ekanayake 2017-09-28 11:30:09 +13:00
  • 37e4fe4ce7 Issue #83: Server creation dialog need to be polished Haoming Yin 2017-09-28 11:13:02 +13:00
  • 567e351c7f Updated wind arrow 3D model Zhi You Tan 2017-09-28 11:02:47 +13:00
  • e87931a8fc Merge branch 'develop' into story1273_minimap Calum 2017-09-28 10:21:23 +13:00
  • d1edbc4b8a Put the arrows into the minimap. Fixed the issue with curved section of port marks. Calum 2017-09-28 10:19:32 +13:00
  • 275a2cbab7 Made continous turning the default. Added triangles to minimap. Made mark areas bigger Calum 2017-09-28 10:12:18 +13:00
  • 08c34a0b1e Finish arrow not spawning fix. Calum 2017-09-28 09:54:03 +13:00
  • 705669ad07 centered icons #fix Calum 2017-09-28 07:23:25 +13:00
  • 71f6b9accb Fixed duplicate waka files. Calum 2017-09-28 06:59:44 +13:00
  • caf04e1e99 Added a waka model. Calum 2017-09-28 06:54:20 +13:00
  • b9cb6fa5b4 Added token information to the lobby screen. Calum 2017-09-28 05:09:54 +13:00
  • 72fe8c4881 - Removed 2D wind and replaced with 3D wind arrow. Zhi You Tan 2017-09-28 04:13:44 +13:00
  • 0b8e2499a7 Fixed some internal stl faces on parrot Calum 2017-09-28 03:35:28 +13:00
  • 9075d2a909 Added a minimap to the race view. Calum 2017-09-28 03:17:33 +13:00
  • 00e2af9c14 - Fixed Merge Errors and some broken lighting AGAIN alistairjmcintyre 2017-09-28 02:20:34 +13:00
  • ba768deabc Initial commit for The Token info panel in the lobby controller William Muir 2017-09-28 02:17:39 +13:00
  • 73861b2ef3 Merge branch 'develop' into 1276_Next_Mark_Indicator alistairjmcintyre 2017-09-28 02:06:18 +13:00
  • 4018dd783e - Fixed Merge Errors and some broken lighting alistairjmcintyre 2017-09-28 02:05:47 +13:00
  • 8b7407bf89 Various bug fixes Michael Rausch 2017-09-28 01:58:49 +13:00
  • 00ddf117b2 Merge remote-tracking branch 'origin/develop' into develop Calum 2017-09-28 00:26:09 +13:00
  • a266779709 Added new Wind Waker mesh Calum 2017-09-28 00:24:34 +13:00
  • df24fe072a Added animation for wind turning. Haoming Yin 2017-09-28 00:13:45 +13:00
  • a1a34b9bd7 Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop Calum 2017-09-27 23:36:14 +13:00
  • 42d490d6fd Added new Wind Waker mesh Calum 2017-09-27 23:35:51 +13:00
  • cd4a2f8da3 Merge remote-tracking branch 'origin/develop' into develop Haoming Yin 2017-09-27 22:47:08 +13:00
  • 287cfd77d0 Fix: smoothing wind rotation Haoming Yin 2017-09-27 22:45:56 +13:00