c8a96dcce9
Fixed XML Loading error, used VMG to calculate boat velocity
...
- XML read from stream instead of file
- Started implementing VMG to calculate boat velocity dynamically
Tags: #pair[wmu16, mra106] #story[986]
2017-07-25 20:14:50 +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.
#story[1055] #pair[hyi25, zyt10]
2017-07-25 17:17:36 +12:00
1a867be387
Added keystroke frequency limit
...
Updated client and server log format
#story[988] #pair[hyi25, zyt10]
2017-07-25 15:13:48 +12:00
52bfa3ad34
Merge remote-tracking branch 'origin/Story1055_Send_Race_Status_When_Host_Ready' into develop
...
# Conflicts:
# src/main/java/seng302/controllers/LobbyController.java
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.
#story[1055]
2017-07-25 00:01:59 +12:00
cdb9337aed
Deleted GameServerThread after being re merged in
...
#chore
2017-07-24 23:20:47 +12:00
8b0af5bb62
Updated observer so it sends out updated boats.xml when client disconnects
...
#story[1047] #pair[wmu16, zyt10]
2017-07-24 21:35:31 +12:00
83232a935e
Merge remote-tracking branch 'origin/Story984_Send_XML_After_Clients_Connect' into develop
...
# Conflicts:
# src/main/java/seng302/gameServer/ServerToClientThread.java
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
2017-07-24 21:14:17 +12:00
45bf65a3d3
Made clients receive new xml after new clients connect.
...
#pair[kre39,zyt10] #story[984]
2017-07-24 16:15:19 +12:00
526c12127f
Merging game lobby with game state broadcast. Merge conflicts resolved.
...
Port numbers updated to 4942.
2017-07-24 15:26:51 +12:00
3e4a6f0f2e
Merge remote-tracking branch 'origin/Story1055_Lobby_View_Update' into Merging_GameState_With_Lobby
...
# Conflicts:
# src/main/java/seng302/client/ClientPacketParser.java
# src/main/java/seng302/client/ClientToServerThread.java
# src/main/java/seng302/controllers/LobbyController.java
# src/main/java/seng302/controllers/StartScreenController.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
2017-07-24 14:58:14 +12:00
e11ceed28c
Merge remote-tracking branch 'origin/Story62_Creating_Game_Loop' into Story1055_Lobby_View_Update
...
# Conflicts:
# src/main/java/seng302/controllers/StartScreenController.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
2017-07-23 19:59:30 +12:00
41851ee925
Merge branch 'Story62_Creating_Game_Loop' into Merging_GameLoop_with_Broadcast
...
# Conflicts:
# src/main/java/seng302/controllers/StartScreenController.java
# src/main/java/seng302/gameServer/ServerListenThread.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/models/Yacht.java
2017-07-23 17:34:24 +12:00
3ec930491f
Minor refactor, threads now start themselves
...
tags: #story[989] #refactor
2017-07-22 16:45:24 +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.
#story[1055] #pair[hyi25, zyt10]
2017-07-21 16:14:45 +12:00
5df7efda03
Started implementing the gameState broadcasts.
...
Initial xml files are almost broad casted, just need to create them (or import the for the regatta). Started the setup for sending boat location packets, should work once we get at least the boat xml working when being sent.
#story[1047]
2017-07-21 13:16:43 +12:00
d37cbd263e
Merge remote-tracking branch 'origin/Story62_Creating_Game_Loop' into Story62_Reading_Keystrokes
...
# Conflicts:
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
2017-07-21 11:13:40 +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]
2017-07-20 19:35:59 +12:00
b1575e57df
Host also can be it's own client.
...
The host can connect to itself to become a client, packets are also sending from the host to client, update method should be ready to fully implemented. Added chatter packets to packet types to be used mostly for testing but can be further implemented for proper use in the future.
#story[1055]
2017-07-20 13:53:53 +12:00
e317de7562
Added mock yachts to the game state for each client #story[1047]
2017-07-20 13:11:37 +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
tags: #story[1055] #refactor #fix
2017-07-20 11:46:06 +12:00
8f00f3a80c
Refactoring for server package, Changed GameServerThread to MainServerThread.
...
All Server classes now in single gameServer package
tags: #story[1055]
2017-07-20 11:22:30 +12:00
Michael Rausch
Zhi You Tan
William Muir
Kusal Ekanayake
Zhi You Tan
Peter Galloway