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

  • 44275aec04 Merge branch 'develop' into Story1278_keybindings Haoming Yin 2017-09-25 11:06:28 +13:00
  • ca320f7fb8 Merge remote-tracking branch 'origin/1273_Changing_Cameras' into 1281_Server_Discovery_Internet Michael Rausch 2017-09-25 00:18:35 +13:00
  • 64245833cd Merge branch 'Story1274_custom_boat_stats' into 'develop' Zhi You Tan 2017-09-24 18:53:15 +13:00
  • aa0149b9a7 Merge branch 'develop' into Story1274_custom_boat_stats Kusal Ekanayake 2017-09-24 18:08:54 +13:00
  • f6b41f0513 Fixes Issue #59 Kusal Ekanayake 2017-09-24 18:06:26 +13:00
  • 9b00ba654a Added a race importer. Added imported races to visualizer. Made it so that the host sets the race. Refactored server to no longer be dependant on a specific race. Tested functionality of map manually. Some bugs found and listed below. Calum 2017-09-23 22:45:53 +12:00
  • 8dfdb228e9 Fixed a bug that game client tries to send turning mode packet when there is no socketThread Haoming Yin 2017-09-23 21:04:57 +12:00
  • 1042817e4e Snackbar's color can be changed according to the message type Haoming Yin 2017-09-23 20:59:29 +12:00
  • 066557584f Implemented turning mode toggle Haoming Yin 2017-09-23 19:37:13 +12:00
  • 4011295b8b Slightly optimised code style and add more functionality Haoming Yin 2017-09-23 17:52:48 +12:00
  • 78259f8e33 Boat now changes color when it is bumped for a time William Muir 2017-09-23 16:54:03 +12:00
  • c47e5b1450 Boat now changes color when it is bumped for a time William Muir 2017-09-23 16:31:18 +12:00
  • 0a885dd8fd Clean up changes Kusal Ekanayake 2017-09-23 15:37:16 +12:00
  • e9b50038a9 Balance changes. Always wanted to use that as a commit message. Kusal Ekanayake 2017-09-23 15:09:22 +12:00
  • 364264377a Fixed merge errors and reimplemented handling multiplier #story[1274] Kusal Ekanayake 2017-09-23 15:04:11 +12:00
  • 9112183ac3 Merge branch 'develop' into Story1274_custom_boat_stats Kusal Ekanayake 2017-09-23 14:48:50 +12:00
  • 8c7f9a878d Created Boat bumper logic. Refactored logic for powering up / dpwn William Muir 2017-09-23 13:23:16 +12:00
  • ecb3d4ecbf Removed sendServerMessage to be replaced with notifyMessageListeners. Minor structure move arounds William Muir 2017-09-23 11:49:56 +12:00
  • e61b6d50a1 Small refactor. Fixed tokens to spawn on the minute mark. William Muir 2017-09-23 11:33:01 +12:00
  • 957821f1f2 [WIP] Created a snackbar for notification. Currently used for keybinding success/fail. Need to show red if fails. Zhi You Tan 2017-09-23 01:39:26 +12:00
  • 061e49bab9 Implemented wind walker algorithm. Refactored some GameState updating logic to allow for better token logic integration William Muir 2017-09-22 23:44:03 +12:00
  • 094eb4c1cf Merge remote-tracking branch 'origin/develop' into Story1278_keybindings Zhi You Tan 2017-09-22 21:22:06 +12:00
  • a3c555d5fe Merge remote-tracking branch 'origin/develop' into 1293_PowerUps William Muir 2017-09-22 21:18:58 +12:00
  • 607acff7c6 Merge branch 'Custom_boat_selection' into 'develop' William Muir 2017-09-22 21:14:12 +12:00
  • 22fdf1e4ac Changed the boatType attribute from all around the place from String lit to enum Custom_boat_selection William Muir 2017-09-22 21:00:28 +12:00
  • da8c91f5c1 Review fixes for merge request. William Muir 2017-09-22 20:44:06 +12:00
  • 52dc7a956d Turned handling into a multiplier. #story[1274] Kusal Ekanayake 2017-09-22 17:42:32 +12:00
  • 9f64b2380d Implemented acceleration and full loading bars. #story[1274] Kusal Ekanayake 2017-09-22 17:28:42 +12:00
  • b05580f018 Worked on making a visual component to the stats. Need to implement acceleration. #story[1274] Kusal Ekanayake 2017-09-22 16:45:10 +12:00
  • c20c6fb264 [WIP] Added new toggle for steer turning mode and submit and reset button (restore the setting to default) Haoming Yin 2017-09-22 13:53:36 +12:00
  • faeece27ff Started working on individual boat stats. Already modified turning rate. Need to add a vsual component. #story[1274] Kusal Ekanayake 2017-09-22 13:52:35 +12:00
  • 5e3ae40d03 Made discovery more reliable & added docs/tests Michael Rausch 2017-09-22 00:01:13 +12:00
  • 95ad7a4840 Finished implementing room codes. Michael Rausch 2017-09-21 22:48:33 +12:00
  • 6ca75b2cac Changed default race Calum 2017-09-21 15:08:39 +12:00
  • 6ff309a40c - Perspective Camera Works - Top Down Camera Works - Started on chase cam but the math is a bit tricky. Alistair McIntyre 2017-09-21 14:40:35 +12:00
  • 40a7f9bc5b New server creation view created. Added templates for custom races. Updated xml generator to remove all hard coded values. Updated XMLParser to parse custom race files. No unit tests exists currently. Calum 2017-09-21 12:59:37 +12:00
  • c4a6113f6c Minor bug fixes (like all enemy sails being toggled in when they should be out) Kusal Ekanayake 2017-09-20 21:07:49 +12:00
  • 307e79ecfc Completed working boat selection screen. Kusal Ekanayake 2017-09-20 20:46:23 +12:00
  • e17e9749d8 Implemented server to manage a list of available servers on the internet. Michael Rausch 2017-09-20 20:26:14 +12:00
  • 7d8a6afa5f Merge branch 'new_meshes' into Custom_boat_selection Kusal Ekanayake 2017-09-20 19:40:43 +12:00
  • ea0be5e952 Added pirate ship meshes to application. Updated boat model to allow for jib sails and a fixed sail. #story[1274] new_meshes Peter Galloway 2017-09-20 17:56:07 +12:00
  • 3be8cd264d Adding icon files to git #story[1245] William Muir 2017-09-20 17:52:02 +12:00
  • 7197bc2bee created meshes for pirate ship #story[1274] Peter Galloway 2017-09-20 17:33:32 +12:00
  • 66d9a06f9e Adding icon files to git #story[1245] William Muir 2017-09-20 17:19:14 +12:00
  • fba522d0c3 Fixed BoatMeshType enum names. Calum 2017-09-20 16:44:38 +12:00
  • 0e829874c2 Fixed BoatMeshType enum names. Calum 2017-09-20 16:43:04 +12:00
  • c5d56065b6 Fixed cat ate a meringue sail rotation. Calum 2017-09-20 16:42:26 +12:00
  • 410d765745 Started working on the boat selection screen. Kusal Ekanayake 2017-09-20 16:36:27 +12:00
  • fe76e85c71 Merge branch 'develop' into new_meshes Calum 2017-09-20 15:59:01 +12:00
  • 9d61a43bd7 Added catamaran mesh to possible boat meshes. Made catamaran the default boat. Calum 2017-09-20 15:58:22 +12:00
  • c39582de5c Updated PartyParrot logo Kusal Ekanayake 2017-09-20 15:41:20 +12:00
  • 034e4c252a Icons now display, blink when they are about to run off, and turn off after their time out William Muir 2017-09-20 13:09:09 +12:00
  • 6cde016401 Fixed random token assigning and realisation William Muir 2017-09-20 12:02:12 +12:00
  • d4d7ddf8e2 Keybinding now works in the actual race. A map of keybind is shared between GameClient and KeyBindDialogController. Zhi You Tan 2017-09-20 11:02:13 +12:00
  • a1933c2869 - Created keybindingcontroller which can detect keypress and can save the keybind throughout the app - Changed keybindingglyph to keyboard icon - Fix button hover CSS to change text fill Zhi You Tan 2017-09-20 02:42:02 +12:00
  • 8084a61333 Fix keybinding dialog creating on top of another keybinding dialog. Zhi You Tan 2017-09-19 23:41:06 +12:00
  • 52d3cea592 Added preliminary icons for pickups William Muir 2017-09-19 23:04:17 +12:00
  • 03f5f91043 Done some CSS on keybindingdialog Zhi You Tan 2017-09-19 19:49:36 +12:00
  • 9ed52a1225 created catamaran mesh #story[1274] Peter Galloway 2017-09-19 19:43:03 +12:00
  • 027324cc4f - Fixed JFXDialog initialised in lobby, raceview, serverlist controller by default. Now, dialog only appears when called. - [WIP] Created keybindingdialog fxml. CSS not yet done. - Removed top most anchorpane on raceview so parent is stackpane like other views. Zhi You Tan 2017-09-19 18:40:01 +12:00
  • 78596ea111 Initial commit for Power Up story William Muir 2017-09-19 17:47:05 +12:00
  • da263355f4 Changed raceview background. Calum 2017-09-19 14:55:26 +12:00
  • ebecd25ed2 Merge remote-tracking branch 'origin/develop' into develop Calum 2017-09-19 14:54:15 +12:00
  • 0f5137c2b6 Fixed the orientation of .stl files. Calum 2017-09-19 14:52:02 +12:00
  • 73799954e4 Fixed tests that failed when running on lower end computers. Needed to add a couple of thread.sleeps Kusal Ekanayake 2017-09-15 12:47:40 +12:00
  • edfeb2b287 Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge sprint_7.1 NewUI_merge Haoming Yin 2017-09-14 15:40:26 +12:00
  • 0355784000 Broadcast messages when boats pass legs or a token is picked up or expired. Haoming Yin 2017-09-14 15:40:12 +12:00
  • 02df69b7b4 - Merged Dev into branch sprint_7.0 Alistair McIntyre 2017-09-14 15:27:10 +12:00
  • 242132b800 Merge remote-tracking branch 'origin/develop' into NewUI_merge Alistair McIntyre 2017-09-14 15:26:57 +12:00
  • 3a671d4ed0 - Added Values to Finish Dialog. Alistair McIntyre 2017-09-14 15:24:58 +12:00
  • 482d987839 - Fixed Null Pointer - Build Should pass Alistair McIntyre 2017-09-14 15:10:48 +12:00
  • cc124b2d19 Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge Haoming Yin 2017-09-14 14:50:49 +12:00
  • b3320ad805 Fixed server message sender Haoming Yin 2017-09-14 14:49:25 +12:00
  • 33779ad5c1 Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge Alistair McIntyre 2017-09-14 14:42:57 +12:00
  • 3a41c27d8d - Race Finish Dialog showing up, unsure if its actually showing the correct ordering or not. Alistair McIntyre 2017-09-14 14:42:25 +12:00
  • e24203904b Removed print statements. Calum 2017-09-14 14:37:22 +12:00
  • eb188495ce Fixed position issues on exit arrows. Calum 2017-09-14 14:32:45 +12:00
  • 62a7e2b8fa Fixed position issues on entry arrows. Calum 2017-09-14 14:21:04 +12:00
  • acd0e790fe Added method to send server debug messages to players Michael Rausch 2017-09-14 14:14:21 +12:00
  • 46013474c0 Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge Zhi You Tan 2017-09-14 13:37:01 +12:00
  • bf427f24d3 - Created a Race Finish Dialog. Alistair McIntyre 2017-09-14 13:34:48 +12:00
  • 7d0a47446d - Fixed bug in customize dialog. Alistair McIntyre 2017-09-14 13:02:31 +12:00
  • 889098bb50 - Commented out broken test (non-deterministic thing) - Merged 3d factory branch in Alistair McIntyre 2017-09-14 12:46:17 +12:00
  • 6223a8fc0b Merge remote-tracking branch 'origin/story1266_3d_model_factory' into NewUI_merge Alistair McIntyre 2017-09-14 12:40:20 +12:00
  • 391bd33548 Fixed position issues on first 2 mark arrows. Calum 2017-09-14 12:38:36 +12:00
  • 7e0c2abbfd - Fixed a shutdown bug that left the game process running long after the window shut - Changed SVG Icon for volume toggle to something a bit nicer Alistair McIntyre 2017-09-14 12:31:49 +12:00
  • 42a5e86bf8 Merge remote-tracking branch 'origin/NewUI_merge' into story1266_3d_model_factory Calum 2017-09-14 12:06:19 +12:00
  • 20d73d8f2f Removed dead code from fxObjects and GameView 3D Calum 2017-09-14 12:05:20 +12:00
  • 0a62c538ca Added 3D mark arrows and cleaned up other classes. Calum 2017-09-14 11:28:50 +12:00
  • 9958e48c57 [WIP] porting old fps counter to new gameview3D NewUI_merge_ryan Zhi You Tan 2017-09-14 02:27:46 +12:00
  • 24a04aa530 Fix the wind direction arrow rotation. Zhi You Tan 2017-09-14 01:05:52 +12:00
  • 7ee6a09626 Fixed that wind speed did not updated frequently and UI polishing. Haoming Yin 2017-09-13 21:11:40 +12:00
  • 47798b19fe Added player position, boat speed, boat heading to race view. Zhi You Tan 2017-09-13 11:22:05 +12:00
  • d9247eb031 Added player position, boat speed, boat heading to race view. Zhi You Tan 2017-09-13 11:21:33 +12:00
  • 7b0d31438e Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge_ryan Zhi You Tan 2017-09-13 09:44:17 +12:00
  • 1e74321aab - Lobby Disconnection works. Alistair McIntyre 2017-09-12 18:26:25 +12:00
  • f0fc75feec [WIP] Adding player position, boat speed, boat heading Zhi You Tan 2017-09-12 18:25:46 +12:00
  • c8dc448a52 Added tests for sounds and modified the transparency for the chat history window. Kusal Ekanayake 2017-09-12 18:11:32 +12:00
  • e518d13fd5 Fixed bug where number of players was off by 1 Michael Rausch 2017-09-12 17:47:02 +12:00
  • 167545cbef - Deleted old controllers that didn't do anything anymore. Alistair McIntyre 2017-09-12 17:45:39 +12:00