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

  • ecbb3f6658 Merge remote-tracking branch 'origin/develop' into develop Michael Rausch 2017-07-27 11:06:00 +12:00
  • 34704bd93d Merge remote-tracking branch 'origin/develop' into develop Haoming Yin 2017-07-26 23:32:32 +12:00
  • 201c88a253 Fixed a bug that program crashes when it receive regatta xml during the race, as it doesn't know how to handle the xml. Haoming Yin 2017-07-26 23:32:16 +12:00
  • 6c4da58d9d Merge remote-tracking branch 'origin/develop' into develop Peter Galloway 2017-07-26 22:42:48 +12:00
  • b56fa5cba3 refactored to make boat trails work again #fix #refactor Peter Galloway 2017-07-26 22:42:37 +12:00
  • 9cedbeb6f6 Fixed latency issues caused by clientside movement packets queueing up but currently the trails aren't working anymore #fix #refactor Peter Galloway 2017-07-26 22:02:46 +12:00
  • 4c6d107102 Merge remote-tracking branch 'origin/develop' into develop Michael Rausch 2017-07-26 20:28:21 +12:00
  • 7917a2584b Fixed alignment for wind direction Michael Rausch 2017-07-26 20:28:13 +12:00
  • f99f8a0d7c Merge remote-tracking branch 'origin/develop' into develop Alistair McIntyre 2017-07-26 20:13:09 +12:00
  • 7db716f51c Boat should move towards optimal angle upwind and downwind when pressing spacebar (VMG) Alistair McIntyre 2017-07-26 20:12:57 +12:00
  • 592e5a088f Merge remote-tracking branch 'origin/develop' into develop Haoming Yin 2017-07-26 19:58:45 +12:00
  • 2d6850950c Merge branch 'develop' into Documenting_client_and_server Haoming Yin 2017-07-26 19:57:43 +12:00
  • ef6821a0cd Updated and added more documentations Haoming Yin 2017-07-26 19:55:35 +12:00
  • 6e9535d78f Fixed race timer & Added boats to team position list Michael Rausch 2017-07-26 19:35:59 +12:00
  • 72a45f5984 Fixed a bug where if boatMaxSpeed was 0 and sails were up, boat would not decelerate. Alistair McIntyre 2017-07-26 17:11:34 +12:00
  • de600fa062 Merge remote-tracking branch 'origin/develop' into develop Alistair McIntyre 2017-07-26 17:10:29 +12:00
  • 87e3b4f246 Merge branch 'story61_player_highlighting' into 'develop' Haoming Yin 2017-07-26 16:31:53 +12:00
  • 7b47d72ef0 Merge branch 'develop' of /home/cosc/student/ajm412/Documents/SENG302/team-13 with conflicts. Alistair McIntyre 2017-07-26 16:22:01 +12:00
  • 7392bdb80d Added documentation Calum 2017-07-26 16:03:11 +12:00
  • af9f1417f1 Documented client packet parser, client state, client state querying runnable, client to server thread and replaced e.printStackTrace() with client log messages. Zhi You Tan 2017-07-26 16:01:41 +12:00
  • 8fc00fd750 Enabled boat path for only the player. Calum 2017-07-26 16:01:01 +12:00
  • 4e5b67abfa Merge branch 'develop' into story61_player_highlighting Calum 2017-07-26 15:52:29 +12:00
  • 84e8ac89fc Added random name generator until players can chose how to identify themselves. Calum 2017-07-26 15:52:02 +12:00
  • 12d081a1af Added highlighting for the player and moved all their assets to the foreground Calum 2017-07-26 15:49:00 +12:00
  • 5e6b402bf5 Minor structural changes. GameState now has a thread which updates itself so its update rate can be independent of sending packets to the client in the MainServerThread William Muir 2017-07-26 14:48:32 +12:00
  • 2bfa6cb038 Adjusted the velocity calculations to allow for Acceleration/Deceleration of the boats, rather than just coming to a complete halt when the sails are pulled in. Alistair McIntyre 2017-07-26 14:01:51 +12:00
  • 8ac44d13df Began fixing conflicts with LobbyController Calum 2017-07-26 12:05:03 +12:00
  • d99055901f Removed Music William Muir 2017-07-26 11:38:29 +12:00
  • 9c9f6e4e80 Merge branch 'develop' into story61_player_perspective Calum 2017-07-26 02:56:46 +12:00
  • 08e369f1ae Merged with develop. Fixed many bugs in Visualiser. Calum 2017-07-26 02:49:31 +12:00
  • b0e99ab444 Merge remote-tracking branch 'origin/develop' into develop Michael Rausch 2017-07-25 23:10:41 +12:00
  • c77a48f589 Merge remote-tracking branch 'origin/develop' into develop Haoming Yin 2017-07-25 23:06:06 +12:00
  • 0135426dfe Changed lobby player profile to a lower risk pictures Haoming Yin 2017-07-25 23:05:52 +12:00
  • 37c745c139 Polar velocities should now work as intended. Snapping to VMG still needs to be implemented. Still an issue of not being able to pass the total upwind or downwind point William Muir 2017-07-25 22:27:26 +12:00
  • 7880039801 Merge remote-tracking branch 'origin/develop' into develop William Muir 2017-07-25 22:19:19 +12:00
  • a56dac1e87 Polar velocities should now work as intended. Snapping to VMG still needs to be implemented. Still an issue of not being able to pass the total upwind or downwind point William Muir 2017-07-25 22:19:03 +12:00
  • 4ae422b47b When a player connects to the server, lobby will now show their user id and profile instead of showing all the profile gif at the beginning, Haoming Yin 2017-07-25 21:50:23 +12:00
  • acd54dec7a Merge branch 'develop' into story61_player_perspective Calum 2017-07-25 21:05:15 +12:00
  • 6242ab0b2e Implemented observer and strategy pattern in BoatAnnotations, now renamed AnnotationsBox. Calum 2017-07-25 20:45:27 +12:00
  • c8a96dcce9 Fixed XML Loading error, used VMG to calculate boat velocity Michael Rausch 2017-07-25 20:14:50 +12:00
  • 4f2dca7ecf Added proper the starting locations for marks and boats. Kusal Ekanayake 2017-07-25 18:48:33 +12:00
  • e569574c01 Merge remote-tracking branch 'origin/develop' into develop Zhi You Tan 2017-07-25 17:17:45 +12:00
  • f544734b4d Fixed sending wrong race xml when a player disconnected because xml is getting data from gamestate yacht but the yachts are not updated is player disconnect. Heartbeat packet was sent out at wrong rate which cause the player disconnect detection to be slow. Heartbeat packet is send out every 200ms now. Zhi You Tan 2017-07-25 17:17:36 +12:00
  • 80b439470b Merge remote-tracking branch 'origin/develop' into develop Kusal Ekanayake 2017-07-25 15:22:56 +12:00
  • 539197cef5 Added a visual indicator of wind speed during race (text box) Kusal Ekanayake 2017-07-25 15:22:46 +12:00
  • 1a867be387 Added keystroke frequency limit Updated client and server log format Zhi You Tan 2017-07-25 15:13:48 +12:00
  • 3785cd705f Fixed wind speed and direction being sent correctly. Kusal Ekanayake 2017-07-25 15:08:10 +12:00
  • 5d7a438080 Changed default ip back to non local host. Kusal Ekanayake 2017-07-25 14:28:21 +12:00
  • 2f12f3e34f Fixed bug to let multiple people play at the same time. Kusal Ekanayake 2017-07-25 14:27:52 +12:00
  • 52bfa3ad34 Merge remote-tracking branch 'origin/Story1055_Send_Race_Status_When_Host_Ready' into develop Zhi You Tan 2017-07-25 00:03:58 +12:00
  • d1d659b698 Lobby view will switch to race view when received race status packet with race start type. Ready button can only be pressed by host. Once pressed, it will send out race status packet with race start to all clients. Zhi You Tan 2017-07-25 00:01:59 +12:00
  • cdb9337aed Deleted GameServerThread after being re merged in William Muir 2017-07-24 23:20:47 +12:00
  • 8b0af5bb62 Updated observer so it sends out updated boats.xml when client disconnects Zhi You Tan 2017-07-24 21:35:31 +12:00
  • 83232a935e Merge remote-tracking branch 'origin/Story984_Send_XML_After_Clients_Connect' into develop Zhi You Tan 2017-07-24 21:30:12 +12:00
  • a30a1aa7c7 Tweaking to server loop making it send packets at 5Hz Commented out some smoothing code in BoatGroup that was dependend on FPS screwing with movement William Muir 2017-07-24 21:14:17 +12:00
  • 07cebb6c5b Updated velocity in yacht constructor so the boat can be seen properly working for test purposes William Muir 2017-07-24 16:47:17 +12:00
  • 45bf65a3d3 Made clients receive new xml after new clients connect. Kusal Ekanayake 2017-07-24 16:15:19 +12:00
  • 60f5a99b0c Merge branch 'Merging_GameLoop_with_Broadcast' into develop Kusal Ekanayake 2017-07-24 15:32:52 +12:00
  • 526c12127f Merging game lobby with game state broadcast. Merge conflicts resolved. Kusal Ekanayake 2017-07-24 15:26:51 +12:00
  • 1daac842f2 Merging game lobby with game state broadcast Kusal Ekanayake 2017-07-24 15:01:07 +12:00
  • 3e4a6f0f2e Merge remote-tracking branch 'origin/Story1055_Lobby_View_Update' into Merging_GameState_With_Lobby Kusal Ekanayake 2017-07-24 14:58:14 +12:00
  • c1e937049e Merge remote-tracking branch 'origin/Story62_Swtich_To_RaceView_When_Race_Start' into Merging_GameLoop_with_Broadcast Kusal Ekanayake 2017-07-24 14:37:56 +12:00
  • 8f8d5c7384 Removed a test sending xml Zhi You Tan 2017-07-24 14:24:54 +12:00
  • aad93d8913 Parsing classes now static utilities. Data now moved to model via controller class. Race logic shifted out of grpahics classes. Several improvements to code readability. Calum 2017-07-24 12:14:08 +12:00
  • 027c7a1480 Updated start screen controller to connect to itself after setting up server. Zhi You Tan 2017-07-24 12:09:23 +12:00
  • df2efa3329 Lobby controller list view is able to react to changes in client state boats and update the list view appropriately. Zhi You Tan 2017-07-24 11:15:10 +12:00
  • 9d754c8819 Implemented list views initialisation which will set the first pane to be your source id (after three way handshake) and the remaining pane to be the source id of other players based on boats.xml received. Updated client parser and client state to save a list of player's boat Zhi You Tan 2017-07-23 20:42:21 +12:00
  • e11ceed28c Merge remote-tracking branch 'origin/Story62_Creating_Game_Loop' into Story1055_Lobby_View_Update Zhi You Tan 2017-07-23 19:59:30 +12:00
  • 8b8b6e4afa Fixed map glitch when race starts, and race XML bug Michael Rausch 2017-07-23 18:20:13 +12:00
  • ed2a22b573 Tried to merge game loop with the broadcast. Minor error in canvas. need to fix. Kusal Ekanayake 2017-07-23 17:37:45 +12:00
  • 41851ee925 Merge branch 'Story62_Creating_Game_Loop' into Merging_GameLoop_with_Broadcast Kusal Ekanayake 2017-07-23 17:34:24 +12:00
  • ffc61942a9 Fixed broken pipe error. Kusal Ekanayake 2017-07-23 17:10:18 +12:00
  • 2e4382bff6 Trying to fix the boat information that is being sent over. Kusal Ekanayake 2017-07-23 16:22:59 +12:00
  • f542dbb61e Changed the competitors list view to eight individual list view. Added eight individual image view to support future player icon implementation. Zhi You Tan 2017-07-23 03:00:29 +12:00
  • 2869d139a3 Three way handshake implemented client and server side and functioning William Muir 2017-07-22 17:44:37 +12:00
  • 3ec930491f Minor refactor, threads now start themselves William Muir 2017-07-22 16:45:24 +12:00
  • a0005064ac Fixed the Yacht clas so it now works. William Muir 2017-07-22 16:32:05 +12:00
  • 33fae9d69a Added race boats to XML Generator Michael Rausch 2017-07-21 16:56:46 +12:00
  • 913e5fee7b Hooked up key press actions to the GameState, applying the relevant maths to update headings etc. Peter Galloway 2017-07-21 16:50:09 +12:00
  • 3992073303 Set race started state in client state when packet is passed in client packet parser. Zhi You Tan 2017-07-21 16:36:56 +12:00
  • 797a99f632 Merge remote-tracking branch 'origin/develop' into Story62_Swtich_To_RaceView_When_Race_Start Zhi You Tan 2017-07-21 16:35:04 +12:00
  • e891ed8a64 LobbyView now can change to RaceView upon race start packet received. Added port number text field in start screen controller. Created a client state. Zhi You Tan 2017-07-21 16:14:45 +12:00
  • e8c2cf809b Fixed Null Ptr Exception in GameState Michael Rausch 2017-07-21 15:42:20 +12:00
  • ec761893c7 Merge branch 'Story62_Reading_Keystrokes' into 'develop' Michael Rausch 2017-07-21 15:39:39 +12:00
  • 5df7efda03 Started implementing the gameState broadcasts. Kusal Ekanayake 2017-07-21 13:16:43 +12:00
  • 2fff73c075 Merge remote-tracking branch 'origin/984_Xml_Generation' into Broadcasting_GameState Kusal Ekanayake 2017-07-21 12:31:35 +12:00
  • d37cbd263e Merge remote-tracking branch 'origin/Story62_Creating_Game_Loop' into Story62_Reading_Keystrokes Zhi You Tan 2017-07-21 11:13:40 +12:00
  • 3ec1242a9a Merge branch 'Story62_Reading_Keystrokes' into story61_player_perspective Calum 2017-07-21 11:13:04 +12:00
  • 881f7f8e30 Changed package heirachy. Merged Controller and StartScreenController. Calum 2017-07-21 09:22:55 +12:00
  • 12c2f31af9 Merge remote-tracking branch 'origin/Story62_Creating_Game_Loop' into Story62_Creating_Game_Loop Peter Galloway 2017-07-20 19:38:07 +12:00
  • 49c0c029c3 adjusted the way the server is receiving key presses to enable them be passed through to the game state #pair[ptg19, wmu16] #story[989] Peter Galloway 2017-07-20 19:35:59 +12:00
  • da7a34fc55 Started adding functionality to calculate yacht velocity from the wind speed and direction using polar tables. Also began writing tests to cover this functionality, as it can't currently be tested within the game itself. Alistair McIntyre 2017-07-20 14:30:13 +12:00
  • 322ff740e2 Added race start time to race XML Michael Rausch 2017-07-20 14:28:59 +12:00
  • b1575e57df Host also can be it's own client. Kusal Ekanayake 2017-07-20 13:53:53 +12:00
  • 82b219cdba Boat and race XML now generated dynamically Michael Rausch 2017-07-20 13:30:55 +12:00
  • e317de7562 Added mock yachts to the game state for each client #story[1047] Peter Galloway 2017-07-20 13:11:37 +12:00
  • 9ecaa7c3b3 Merge branch 'Story62_Reading_Keystrokes' into story61_player_perspective Calum 2017-07-20 13:05:26 +12:00
  • 037b0db01b Refactoring client for more atomic classes, will mimic the socket, game state, logic thread layout used by the server. Calum 2017-07-20 13:04:29 +12:00
  • 1e80d76acd Retrieve local host ip address and show it on lobby view. Zhi You Tan 2017-07-20 12:52:53 +12:00
  • 360c55fdb9 Merge branch 'Story62_Reading_Keystrokes' into story61_player_perspective Calum 2017-07-20 12:20:12 +12:00