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

  • eed5f56690 Created factory class for making different views for 3d models of boats. Calum 2017-09-07 19:23:07 +12:00
  • b35126ff4e Added server list updates, and added lobby Michael Rausch 2017-09-07 19:20:36 +12:00
  • c39499cee7 Fixed 3d tests Calum 2017-09-07 18:17:42 +12:00
  • cff15ba07d Added missing button click. Kusal Ekanayake 2017-09-07 17:54:28 +12:00
  • 6be7c17c40 Fixed manual test bugs in sounds. Kusal Ekanayake 2017-09-07 17:39:59 +12:00
  • 64811354e3 added peters boat Calum 2017-09-07 17:09:52 +12:00
  • 3364f8b516 Made chat history transparent. Kusal Ekanayake 2017-09-07 17:02:42 +12:00
  • 8cc725616c Merge remote-tracking branch 'origin/Story1247_AutoDiscovery' into NewUI Michael Rausch 2017-09-07 16:36:30 +12:00
  • 0feccdc8b9 Replaced existing views with new views and controllers from the test repository. Michael Rausch 2017-09-07 16:32:34 +12:00
  • 1a755cec33 Fixed bug that caused mark arrows to be rendered on Marker id not LegNumber Calum 2017-09-07 16:25:55 +12:00
  • d565552fcc Added jar files to repo Calum 2017-09-07 15:34:38 +12:00
  • 26a8d76f8b Merged with remote changes Calum 2017-09-07 14:56:08 +12:00
  • d87dcaa4fe Merged with remote changes Calum 2017-09-07 14:54:23 +12:00
  • 0b61dffe71 Fixed some docstrings to make build work. Kusal Ekanayake 2017-09-07 14:50:08 +12:00
  • 4e69157c09 Merge remote-tracking branch 'origin/Story1248_Game_App_Scaling' into Story1248_Game_App_Scaling Zhi You Tan 2017-09-06 01:27:57 +12:00
  • d67566e217 [WIP] - changed contentAnchorPane to Grid Pane temporarily so added child will be able to resize natively - implemented zooming when resizing Bugs: - horizontal resizing works as intended, but vertical resizing will result in canvas moving far too left - need to solve the right and bottom empty space when resizing Zhi You Tan 2017-09-06 01:26:12 +12:00
  • 56f1dd2efb Reverted change, didn't work. Kusal Ekanayake 2017-09-05 18:20:56 +12:00
  • 302bc91461 Tried to fix build by removing invalid '>' char. Kusal Ekanayake 2017-09-05 18:17:20 +12:00
  • 488ab47c8d Finished off chat cucumber test. Kusal Ekanayake 2017-09-05 18:00:43 +12:00
  • 0650ba30e2 Fixed chat tests Kusal Ekanayake 2017-09-05 17:27:34 +12:00
  • 04518c35b0 Created new yacht shape and altered the number of lights. Calum 2017-09-05 17:17:42 +12:00
  • f33e4cc137 Added finish music and merged with text chat. Kusal Ekanayake 2017-09-05 15:24:56 +12:00
  • 7a4b3f0ad9 Merge branch 'text_chat' into Story1249_SoundsAndMusic Kusal Ekanayake 2017-09-05 14:42:20 +12:00
  • 1619c95098 Added mark rounding noise and hover button noise. Kusal Ekanayake 2017-09-05 14:33:37 +12:00
  • 396098e009 Added finish noise. Kusal Ekanayake 2017-09-05 13:44:14 +12:00
  • e4dbbd05c7 Merged with remote changes Calum 2017-09-04 23:42:10 +12:00
  • a1e3ec54c7 Merge remote-tracking branch 'origin/text_chat' into text_chat Calum 2017-09-04 23:11:02 +12:00
  • 47f3f6e27d Created a new chat history class that allows for rich formatting of individual messages. Current implementation allows for bold and coloured text only. Has been manually tested. Fixed 3/5 chat command tests. Calum 2017-09-04 23:10:54 +12:00
  • fce7aa4f9a Started making a cucumber test for allchat. Kusal Ekanayake 2017-09-04 19:43:05 +12:00
  • 81afad1bcc Wrote tests that are currently broken for sending server commands through text chat. Calum 2017-09-04 14:43:13 +12:00
  • 5026c568a7 Wrote tests that are currently broken for sending server commands through text chat. Calum 2017-09-03 20:38:31 +12:00
  • 88d1e91b6f Added processing of input from host via chat to manually trigger race finishing or to speed up boats. Calum 2017-09-03 19:18:30 +12:00
  • 67f39e9049 Tested several methods of creating 3D assets. Added a 3D file importer to library of project and replaced some assets with temporary 32 ones to test creating 32 objects. Calum 2017-09-03 16:54:53 +12:00
  • eb1d3f1a60 Fixed bug where discovery wasn't working under windows Michael Rausch 2017-09-02 02:16:40 +12:00
  • 54ca12f3b6 [WIP] - Updated raceview.fxml to scale race view when resize. - Implemented a listener on game view to know the current window size. Issues: - Border updates with resizing until a certain size and it draws out of canvas - Marks are not drawn within border - Trails do not scale at all Zhi You Tan 2017-09-01 17:10:00 +12:00
  • 3f910b8db7 Fixed JavaDoc errors by adding missing parameters Michael Rausch 2017-09-01 16:13:18 +12:00
  • b346d5a706 Implemented server re-registration when a server closes / updates Michael Rausch 2017-09-01 16:05:47 +12:00
  • 45fa73595f fixed being able to zoom while chatting by holding shift and then pressing z and x #story[1246] Peter Galloway 2017-08-31 17:26:02 +12:00
  • 01ca3f3453 tweaked formatting of chat history #story[1246] Peter Galloway 2017-08-31 17:06:13 +12:00
  • ba8e333d81 fixed issue with the chat history updating weirdly (made sure it run synchronously with platform.runlater) #story[1246] Peter Galloway 2017-08-31 16:49:12 +12:00
  • 24d4c1df15 made chat history always scroll to the bottom after a message is sent #story[1246] Peter Galloway 2017-08-31 16:35:51 +12:00
  • 0c5d661995 Fixed discovery bug, implemented server list, added server parameters Michael Rausch 2017-08-31 01:11:17 +12:00
  • 262f27fa8a Added basic auto discovery functionality Michael Rausch 2017-08-30 22:53:45 +12:00
  • 0fcdf41419 fixed broken fps counter #story[1246] Peter Galloway 2017-08-30 20:56:28 +12:00
  • 4ebf7d6104 chat packets sent to server and then sent back to all clients. #story[1246] Peter Galloway 2017-08-30 20:42:11 +12:00
  • 353dd48829 sending chatter packets to server #story[1246] Peter Galloway 2017-08-30 19:14:47 +12:00
  • 4bd7291a4a WIP: Yachts now power up upon collecting an item William Muir 2017-08-29 22:11:37 +12:00
  • 0d0b2e59d5 WIP: Tokens works well with collection. Dissapear upon picking up across all clients. William Muir 2017-08-29 21:40:25 +12:00
  • ace48a8404 Refactored MainServer Class in prep for better sending out of XML messages William Muir 2017-08-29 21:23:46 +12:00
  • 201405d070 WIP: Marks randomly appear in course now. Mark arrows broken. William Muir 2017-08-29 19:13:48 +12:00
  • dc19310849 Tokens now appear client side William Muir 2017-08-29 17:17:06 +12:00
  • 1c866ea8c2 GameClient now extracts Tokens client side William Muir 2017-08-29 16:50:31 +12:00
  • 23027705da Sample Tokens are now sent out in RaceXML correctly William Muir 2017-08-29 15:37:01 +12:00
  • c15f13bc2c Refactored some of the XMLGenerator code. Added tokens to the generated XML William Muir 2017-08-29 14:56:06 +12:00
  • 6ee2517f74 Added most sound functionality. Kusal Ekanayake 2017-08-28 16:37:09 +12:00
  • 75155fe481 implemented basic single client proof of concept for the chat history #story[1246] Peter Galloway 2017-08-25 17:57:45 +12:00
  • 2fcff65dd6 Fixed null pointer when cant find a server sprint_6.1 William Muir 2017-08-17 15:44:05 +12:00
  • 4c730ea890 Fixed null pointer when cant find a server William Muir 2017-08-17 15:40:55 +12:00
  • a501b21d66 Merge branch 'develop' into 'master' sprint_6.0 Alistair McIntyre 2017-08-17 14:59:01 +12:00
  • 5fb8a0c2c1 Merge branch 'issue47_disconnect_crash_rebranch' into 'develop' Alistair McIntyre 2017-08-17 14:55:45 +12:00
  • d867a4b7a2 Fixed bug, should fix disconnection issues. tags : #issue[47] Alistair McIntyre 2017-08-17 14:53:54 +12:00
  • 3c91db59f3 Changed wind change variation Michael Rausch 2017-08-17 14:49:39 +12:00
  • 72a390b484 Fixed build bug. tags : #issue[47] Alistair McIntyre 2017-08-17 14:47:20 +12:00
  • 978def4cf7 Merge remote-tracking branch 'origin/develop' into issue47_disconnect_crash_rebranch Alistair McIntyre 2017-08-17 14:36:16 +12:00
  • 2331942bf9 Merge branch 'Story1124_Sparkline' into 'develop' Alistair McIntyre 2017-08-17 14:25:32 +12:00
  • d41bdfebbc Merged Boat customization onto develop. Calum 2017-08-17 14:21:06 +12:00
  • d0565503e8 Merge branch 'develop' into issue47_disconnect_crash_rebranch Calum 2017-08-17 14:15:27 +12:00
  • f0c48e76e1 Merge branch 'Story80_BoatCustomization' into 'develop' Haoming Yin 2017-08-17 14:11:04 +12:00
  • 3639e0d3ce Fixed disconnection issues. Fix is only temporary until a consistent interface for disconnections exists. Calum 2017-08-17 14:10:38 +12:00
  • 0276911b88 Fixed disconnection issues. Fix is only temporary until a consistent interface for disconnections exists. Calum 2017-08-17 14:02:18 +12:00
  • af3a400841 Fixed build bug. tags : #story[1142] Alistair McIntyre 2017-08-17 13:44:34 +12:00
  • 5a2a78a7d5 Bug fixes for final commit Zhi You Tan 2017-08-17 13:43:31 +12:00
  • 5fc7442359 Merged Develop into branch. tags : #story[1142] Alistair McIntyre 2017-08-17 13:40:00 +12:00
  • 39cfaf6780 Merge remote-tracking branch 'origin/develop' into Story80_BoatCustomization Alistair McIntyre 2017-08-17 13:31:27 +12:00
  • 7a11b5eb77 Merge branch 'develop' into Story1124_Sparkline Zhi You Tan 2017-08-17 13:14:08 +12:00
  • faf4600f51 Fixed some weird bug with the messages package, trying to add some small QoL changes with potential interaction bugs with the customization/lobby menu. tags : #story[1142] Alistair McIntyre 2017-08-17 13:13:07 +12:00
  • 3e383465a9 Attempted to fix sparklines, temporarily disabled them for end of sprint. Zhi You Tan 2017-08-17 13:12:09 +12:00
  • ac279583df Small documentation changes. Alistair McIntyre 2017-08-17 12:31:15 +12:00
  • ef2659a7b9 Merge branch 'develop' into issue47_disconnect_crash_rebranch Calum 2017-08-17 12:16:14 +12:00
  • 769d1956b3 Moved client side disconnection handling to this branch and reimplemented it with develop functionality. Calum 2017-08-17 12:11:36 +12:00
  • 8ca455ed24 Fixed: - Fixed regularPacketsTest unit test, which checks how regularly packets are sent from C2S thread. - Removed misused GameClient in main server thread. Haoming Yin 2017-08-17 12:03:43 +12:00
  • 7bda2bc580 Fixed: - Fixed regularPacketsTest unit test, which checks how regularly packets are sent from C2S thread. - Removed misused GameClient in main server thread. Haoming Yin 2017-08-17 11:46:14 +12:00
  • d7a290478d Merge remote-tracking branch 'origin/develop' into develop Haoming Yin 2017-08-17 11:02:54 +12:00
  • d73e4f8ec5 Fixed a build error. alistairjmcintyre 2017-08-17 01:23:34 +12:00
  • 6e02d3e533 Added some general UI improvements such as autofilling the color field of the form, and looked at how best to deal with response packets, as it should be part of the spec. alistairjmcintyre 2017-08-17 01:20:16 +12:00
  • 7b4a70817b Merged onto develop. Calum 2017-08-17 01:03:14 +12:00
  • 87acce71ea Merge branch 'develop' into story1118_map_arrows Calum 2017-08-17 00:52:41 +12:00
  • 95b1c8a01f Arrows now work as intended. Case added for interior angles. Calum 2017-08-17 00:43:07 +12:00
  • dfd421c3b7 Merge branch '1124b_Fixing_Update_Order' into 'develop' Zhi You Tan 2017-08-17 00:11:13 +12:00
  • 4596f1e0f8 Finish screen all done, updates during race William Muir 2017-08-16 23:42:07 +12:00
  • a59d06fbbf Finish screen William Muir 2017-08-16 23:36:45 +12:00
  • 65286f273b Working ordering for in game AND race finish screen. William Muir 2017-08-16 23:22:58 +12:00
  • 9727e86249 Merge remote-tracking branch 'origin/story1118_map_arrows' into 1124_Fixing_Order_And_Finish_Screen William Muir 2017-08-16 22:40:32 +12:00
  • db614fe845 Initial commit for Fixing order William Muir 2017-08-16 21:16:27 +12:00
  • 85899e3fbe Merged with develop functionality. Calum 2017-08-16 21:11:34 +12:00
  • 87d6799c10 Re-added wind speed & direction variations Michael Rausch 2017-08-16 20:48:37 +12:00
  • 67f0c213c2 Everything works. Needs a bit of polish, and possibly look at boat shapes next. Alistair McIntyre 2017-08-16 20:38:11 +12:00
  • c103595bba Merge branch 'develop' into story1118_map_arrows Calum 2017-08-16 20:34:27 +12:00
  • 86a7c2565c Arrows now rendered in correct orientation but rounding arc sometimes inverted. Calum 2017-08-16 20:29:56 +12:00
  • 21e6819f16 Arrows now rendered in correct orientation but rounding arc sometimes inverted. Calum 2017-08-16 20:17:25 +12:00