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

  • 176d65e0b2 Merge branch 'Story62_Reading_Keystrokes' into Story62_Creating_Game_Loop Peter Galloway 2017-07-20 12:01:53 +12:00
  • 0c08f5a03c Refactoring to remove all superflous classes related to the server GameServerThread --> MainServerThread All server classes consolidated into the gameServer package and all others removed William Muir 2017-07-20 11:46:06 +12:00
  • e257602b78 Merge remote-tracking branch 'origin/Story62_Reading_Keystrokes' into Story62_Reading_Keystrokes William Muir 2017-07-20 11:35:27 +12:00
  • 8f00f3a80c Refactoring for server package, Changed GameServerThread to MainServerThread. All Server classes now in single gameServer package William Muir 2017-07-20 11:22:30 +12:00
  • 63d24c001f Added position update in yacht #story[1047] Peter Galloway 2017-07-19 19:39:31 +12:00
  • 67668fe1fc Merge branch 'Story62_Reading_Keystrokes' into Story62_Creating_Game_Loop Peter 2017-07-19 18:13:58 +12:00
  • dbbb41e12f Multiple clients are now shown in lobby of host. Kusal Ekanayake 2017-07-19 16:05:21 +12:00
  • 45053ba507 Added XML Generation Michael Rausch 2017-07-19 14:47:16 +12:00
  • d9f5f7a137 Refactoring view for game development Calum 2017-07-18 14:00:24 +12:00
  • b301ce5d27 fixed build (i think?) William Muir 2017-07-18 12:26:47 +12:00
  • f02bd3b3f8 Merge remote-tracking branch 'origin/Story62_Reading_Keystrokes' into Story62_Reading_Keystrokes William Muir 2017-07-18 12:23:09 +12:00
  • e83eaa38e1 Upon hosting, and then creating a new instance and connecting to that IP, button transmissions work and print out on server!! :D Took the send method out of the Message class as it didnt make sense to have it there. This meant taking it out of all subclasses too William Muir 2017-07-18 12:22:58 +12:00
  • 102b5f3ca1 Added a program icon that I snipped from the logo using photoshop. Kusal Ekanayake 2017-07-18 10:46:41 +12:00
  • 63958a6717 WIP: Implemented a temporary workaround to send an instance test to client server upon connection. Still needs reengineering to change socket channels for sending to ouput stream in the message class. Only client to server "working". Haoming Yin 2017-07-17 17:00:04 +12:00
  • 4b8ac32ca9 Merge branch '1047_Hosting_Game' into Story62_Reading_Keystrokes Haoming Yin 2017-07-17 10:55:17 +12:00
  • 00b29a1890 Merge remote-tracking branch 'origin/develop' into Story62_Reading_Keystrokes Haoming Yin 2017-07-17 10:55:08 +12:00
  • c7e5f93bc4 Merged GeoUtility and GeometryUtils classes Haoming Yin 2017-07-16 21:58:40 +12:00
  • e4d87c91a2 Merge branch 'develop' into 1047_Hosting_Game Haoming Yin 2017-07-16 21:54:08 +12:00
  • f84091e54e Removed (fxml) table view and its table column from lobby controller because the table view is removed from LobbyView.fxml Zhi You Tan 2017-07-14 18:27:54 +12:00
  • e03e8825b2 Merge remote-tracking branch 'origin/1047_Hosting_Game' into Story62_Reading_Keystrokes Zhi You Tan 2017-07-14 18:23:28 +12:00
  • 355f8543f5 Implemented a more reliable way for keystroke input and added boat action packet type so stream parser is able to read and decode the message appropriately. Zhi You Tan 2017-07-14 18:23:07 +12:00
  • 77e7db79cc WIP: Worked on new server thread class that would create and store multiple THREADS of connections. Researched Authorative server structures. Fixed the current structure of the server to work with the old StreamReciever style and hook up to the Stream Parser William Muir 2017-07-14 17:09:33 +12:00
  • 2809d0d832 Merge branch '1047_Hosting_Game' into Story62_Reading_Keystrokes Zhi You Tan 2017-07-14 16:28:42 +12:00
  • 5b908ec355 Merge remote-tracking branch 'origin/1047_Hosting_Game' into 1047_Hosting_Game William Muir 2017-07-13 22:55:49 +12:00
  • c480fca72a WIP: Worked on new server thread class that would create and store multiple THREADS of connections. Researched Authorative server structures William Muir 2017-07-13 22:55:03 +12:00
  • c19f66a6a4 Added garbage collection for disconnected players Michael Rausch 2017-07-13 22:07:03 +12:00
  • 1e6fd1af09 Fixed bug where players were being added to the GameState twice Michael Rausch 2017-07-13 19:27:47 +12:00
  • 55db2c9961 Fixed buffer overflow in message header Michael Rausch 2017-07-13 19:15:45 +12:00
  • 6ec8b0c3c5 Terminated the game server socket when click exit lobby button Haoming Yin 2017-07-13 17:51:25 +12:00
  • 78557a4536 Key presses are transmitted to a host (but there is no host currently connected) Kusal Ekanayake 2017-07-13 15:39:48 +12:00
  • 8090cd7985 WIP: Adapted the old server thread class to the GameServerThread class to allow multiple clients to connect William Muir 2017-07-13 14:40:11 +12:00
  • 5ce34bed92 Key presses now assigned to enum and empty packet class is constructed. Kusal Ekanayake 2017-07-13 14:35:41 +12:00
  • 035841f221 WIP: Adapted the old server thread class to the GameServerThread class to allow multiple clients to connect William Muir 2017-07-11 17:03:32 +12:00
  • ef61a687d6 Researched and implemented a way for the game to listen for key presses. When one of the valid key controls are pressed, feedback is given in the console. Has yet to be connected to a method which will create and send a message to the server. Kusal Ekanayake 2017-07-11 16:32:15 +12:00
  • fcb1e5e593 Removed unnecessary Position and GeoPoint classes to clear the code base. Haoming Yin 2017-07-10 23:51:01 +12:00
  • 752863a0d3 WIP: Created some basic controllers for the UI and started implementing backend for server stuff William Muir 2017-07-10 16:03:13 +12:00
  • 1a3e330eb4 Created some basic UI for new start screen (host and connect) and a lobby William Muir 2017-07-10 13:43:25 +12:00
  • 5f9da6b40a Fixed the bug where the polar file could not be read after being packaged William Muir 2017-07-10 12:36:32 +12:00
  • aee62c29fe Merge remote-tracking branch 'origin/develop' into develop Michael Rausch 2017-05-26 09:07:22 +12:00
  • fe76ef9cdc Merge remote-tracking branch 'origin/develop' sprint_4.4 Michael Rausch 2017-05-25 16:58:01 +12:00
  • acbaa838ec Change default port to 4940 Michael Rausch 2017-05-25 16:56:41 +12:00
  • f4134d83b5 Merge branch 'issue#8_create_finish_screen' into 'develop' Haoming Yin 2017-05-25 16:52:59 +12:00
  • 24cc10e1cd Merge remote-tracking branch 'origin/develop' into issue#8_create_finish_screen Zhi You Tan 2017-05-25 16:51:32 +12:00
  • 20b79b40f2 Fix the button position #story[923] Zhi You Tan 2017-05-25 16:45:35 +12:00
  • 72e2776b7e Fix the finish screen size #story[923] Zhi You Tan 2017-05-25 16:41:59 +12:00
  • 49e4c92da6 Merge branch 'develop' sprint_4.3 Kusal Ekanayake 2017-05-25 16:40:24 +12:00
  • ba761e4951 Merge branch 'remove_observers' into 'develop' Kusal Ekanayake 2017-05-25 16:36:43 +12:00
  • c1aa1d8eae merged with dev Calum 2017-05-25 16:32:25 +12:00
  • 4231c3ccd8 Merge remote-tracking branch 'origin/develop' into remove_observers Calum 2017-05-25 16:30:15 +12:00
  • 65223ceaaf shifted annotation layers. Merged with dev. Calum 2017-05-25 16:29:27 +12:00
  • ca22615c08 Add scroll bar to the side panel to cater for smaller screen. sprint_4.2 Kusal Ekanayake 2017-05-25 16:18:47 +12:00
  • 559a9f38c0 Merge remote-tracking branch 'origin/develop' into issue#8_create_finish_screen Zhi You Tan 2017-05-25 16:12:44 +12:00
  • 762829e5ff Merge branch 'develop' sprint_4.1 Kusal Ekanayake 2017-05-25 15:56:10 +12:00
  • 835f79b113 Swapped to the local stream as default Kusal Ekanayake 2017-05-25 15:56:02 +12:00
  • 3bd8added4 Merge remote-tracking branch 'origin/develop' into develop Michael Rausch 2017-05-25 14:56:11 +12:00
  • e0854bc68c Merge remote-tracking branch 'origin/master' sprint_4.0 Kusal Ekanayake 2017-05-25 14:55:35 +12:00
  • cec7014856 Set axis ons parkline style Kusal Ekanayake 2017-05-25 14:54:34 +12:00
  • ba527a1979 Merge remote-tracking branch 'origin/develop' into develop Michael Rausch 2017-05-25 14:54:28 +12:00
  • b73e4c89db Merge remote-tracking branch 'origin/develop' into remove_observers Calum 2017-05-25 14:52:54 +12:00
  • f1a9da83fc Quick fixes before merge Kusal Ekanayake 2017-05-25 14:22:01 +12:00
  • 6e903bfbed Merge branch 'develop' into 38b_LayLines Kusal Ekanayake 2017-05-25 14:16:55 +12:00
  • 23d62f552e Merged develop onto this branch Michael Rausch 2017-05-25 14:06:33 +12:00
  • 53f6a6b8c5 Implimented a new way to determine positions Kusal Ekanayake 2017-05-25 14:06:33 +12:00
  • 945acb6071 Merge remote-tracking branch 'origin/develop' into develop Michael Rausch 2017-05-25 13:57:07 +12:00
  • af81bf5891 Merge remote-tracking branch 'origin/develop' into 38b_LayLines Michael Rausch 2017-05-25 13:56:08 +12:00
  • e72ac1def8 Laylines are now togglable. Still not completely fool proof Michael Rausch 2017-05-25 13:48:48 +12:00
  • f163dfdd11 Removed a print statement Zhi You Tan 2017-05-25 13:14:36 +12:00
  • a1eda8d91d Fix boatPos in StreamParser.java being empty and affecting all the assessors Zhi You Tan 2017-05-25 12:58:11 +12:00
  • 5ed02a1fe1 Merge remote-tracking branch 'origin/develop' into issue#8_create_finish_screen Zhi You Tan 2017-05-25 12:32:10 +12:00
  • 66d4a4b958 Fix finish screen showing wrong ("-" as) position Zhi You Tan 2017-05-25 12:28:13 +12:00
  • adbb9ffe3b Removed completed TODO request. Calum 2017-05-25 10:31:37 +12:00
  • 0cd2867ac0 Made annotations more readable when overlapping. Calum 2017-05-25 10:30:01 +12:00
  • 4d29354797 Merge branch 'develop' into remove_observers Calum 2017-05-25 10:25:54 +12:00
  • a6d9c66fc9 Removed unused import statements and class variables. Removed non error print statements. Calum 2017-05-25 10:20:39 +12:00
  • 99588c7ff8 Laylines now working upon selecting a boat. Still need to make their visibility togglable William Muir 2017-05-25 09:54:00 +12:00
  • 68c3e3e999 Merged develop onto this branchk William Muir 2017-05-25 09:21:47 +12:00
  • 67b5650288 Merge branch 'develop' into 38b_LayLines William Muir 2017-05-25 09:19:42 +12:00
  • 3085125f3e Merged with develop Calum 2017-05-25 01:21:40 +12:00
  • 5e26ad7c36 Merge remote-tracking branch 'origin/develop' into remove_observers Calum 2017-05-25 01:12:10 +12:00
  • 765ea06c3b Several tweaks and improvements to a annotations and other visual aspects of them program. Fixed bug causing minimization crashes. Calum 2017-05-25 01:02:33 +12:00
  • ffe70a8313 Trying to get laylines to display on proper respective sides of the gate William Muir 2017-05-25 00:22:15 +12:00
  • 331e0fc6ab Merge branch 'Story34_Sparklines' into 'develop' Haoming Yin 2017-05-24 22:24:50 +12:00
  • b3fd735f5c Merge branch 'develop' into Story34_Sparklines Kusal Ekanayake 2017-05-24 21:50:15 +12:00
  • 3cbbdb070f Basic implementation for mapping windspeed to draw a polar on a gate complete William Muir 2017-05-24 20:31:07 +12:00
  • d2e55bf964 Removed the FPS background, and lowered the update frequency so it doesn't flip too fast. Haoming Yin 2017-05-24 19:33:24 +12:00
  • 05cdadac79 Merge remote-tracking branch 'origin/Story34_Sparklines' into Story34_Sparklines Kusal Ekanayake 2017-05-24 18:57:09 +12:00
  • e6aed88188 Merge with develop. Kusal Ekanayake 2017-05-24 18:56:56 +12:00
  • d032314ddb Merge branch 'develop' into Story34_Sparklines Kusal Ekanayake 2017-05-24 18:56:04 +12:00
  • 6301fd2fb7 Merge branch 'issue#5_fix_pre-race_boats_on_leaderboard' into 'develop' Peter Galloway 2017-05-24 18:52:37 +12:00
  • 34c3899ec4 Removed unused css for charts Kusal Ekanayake 2017-05-24 18:51:52 +12:00
  • 46f5fc5172 Merge with develop. Kusal Ekanayake 2017-05-24 18:47:27 +12:00
  • 81c021b59a Merge branch 'develop' into Story34_Sparklines Kusal Ekanayake 2017-05-24 18:45:01 +12:00
  • 8ab57e4e61 Cleaned up code for review. Kusal Ekanayake 2017-05-24 18:43:50 +12:00
  • 14a7305a2d Made FPS marker not draw on canvas. Calum 2017-05-24 17:17:06 +12:00
  • 13ff179840 Merge remote-tracking branch 'origin/develop' into issue#5_fix_pre-race_boats_on_leaderboard Zhi You Tan 2017-05-24 16:18:33 +12:00
  • e7060d4b6f Finish screen will show when race finishes, added functionality to return to start screen when in finish screen, updated finishScreenView.fxml to have controller and also four corner anchors to fit to parent Zhi You Tan 2017-05-24 16:17:56 +12:00
  • 641039720e Merge remote-tracking branch 'origin/develop' into issue#8_create_finish_screen Zhi You Tan 2017-05-24 16:12:37 +12:00
  • 6f132f1e38 Merge remote-tracking branch 'origin/develop' into develop Michael Rausch 2017-05-24 15:22:30 +12:00
  • 76c0d34760 Merge branch '37-display_map_on_canvas' into 'develop' Michael Rausch 2017-05-24 15:05:39 +12:00
  • 71637d7286 Removed dead code from canvas controller and canvas map Michael Rausch 2017-05-24 15:04:12 +12:00