2d6850950c
Merge branch 'develop' into Documenting_client_and_server
...
# Conflicts:
# src/main/java/seng302/client/ClientToServerThread.java
2017-07-26 19:57:43 +12:00
ef6821a0cd
Updated and added more documentations
...
#story[1047]
2017-07-26 19:55:35 +12:00
12d081a1af
Added highlighting for the player and moved all their assets to the foreground
...
#story[987]
2017-07-26 15:49:00 +12:00
d99055901f
Removed Music
2017-07-26 11:38:29 +12:00
c77a48f589
Merge remote-tracking branch 'origin/develop' into develop
2017-07-25 23:06:06 +12:00
0135426dfe
Changed lobby player profile to a lower risk pictures
...
#story[1055]
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
tags: #story[986]
2017-07-25 22:27:26 +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,
...
#story[1055] #pair[hyi25, zyt10]
2017-07-25 21:50:23 +12:00
3785cd705f
Fixed wind speed and direction being sent correctly.
...
#pair[kre39,mra106] #story[1036]
2017-07-25 15:08:10 +12:00
2f12f3e34f
Fixed bug to let multiple people play at the same time.
2017-07-25 14:27:52 +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
526c12127f
Merging game lobby with game state broadcast. Merge conflicts resolved.
...
Port numbers updated to 4942.
2017-07-24 15:26:51 +12:00
1daac842f2
Merging game lobby with game state broadcast
2017-07-24 15:01:07 +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
027c7a1480
Updated start screen controller to connect to itself after setting up server.
...
#story[1047]
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.
...
#story[1055]
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
WIP: refresh list view to show the latest update in players
#story[1055]
2017-07-23 20:42:21 +12:00
ed2a22b573
Tried to merge game loop with the broadcast. Minor error in canvas. need to fix.
...
#story[1047]
2017-07-23 17:37:45 +12:00
f542dbb61e
Changed the competitors list view to eight individual list view.
...
Added eight individual image view to support future player icon implementation.
#story[1055]
2017-07-23 03:00:29 +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
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
1e80d76acd
Retrieve local host ip address and show it on lobby view.
...
#story[1055] #pair[hyi25, zyt10]
2017-07-20 12:52: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
tags: #story[1055] #refactor #fix
2017-07-20 11:46:06 +12:00
dbbb41e12f
Multiple clients are now shown in lobby of host.
...
When multiple clients connect to the host, the lobby table now fills up with the names of the threads (will need to be changed later). Re-enabled multiple people connecting and the lobby table. Formatting changes in the lobby screen also made.
#story[1047]
2017-07-19 16:05:21 +12:00
f84091e54e
Removed (fxml) table view and its table column from lobby controller because the table view is removed from LobbyView.fxml
...
#story[988]
2017-07-14 18:27:54 +12:00
6ec8b0c3c5
Terminated the game server socket when click exit lobby button
...
- the whole server thread should be terminated instead. To be fixed in the future.
#story[1047] #issue[28]
2017-07-13 17:51:25 +12:00
8090cd7985
WIP: Adapted the old server thread class to the GameServerThread class to allow multiple clients to connect
...
tags: #story[1047] #pair[wmu16]
2017-07-13 14:40:11 +12:00
035841f221
WIP: Adapted the old server thread class to the GameServerThread class to allow multiple clients to connect
...
tags: #story[1047] #pair[wmu16, mra106]
2017-07-11 17:03:32 +12:00
752863a0d3
WIP: Created some basic controllers for the UI and started implementing backend for server stuff
...
Created GameState Class. Static, contains all info about current state of game: list of players and their respective details (coords etc) also Host info
Clients will observe this GameState class
Upon pressing host, new GameState is created and new GameConnectionListener created which listens for connections
Player class created which will be used to take each connection and store it as a player with other info about them regarding the game in the GameState class
tags: #story[1047] #pair[wmu16, zyt10]
2017-07-10 16:03:13 +12:00
1a3e330eb4
Created some basic UI for new start screen (host and connect) and a lobby
...
tags: #story[1047] #pair[wmu16, zyt10]
2017-07-10 13:43:25 +12:00
Haoming Yin
Calum
William Muir
Kusal Ekanayake
Zhi You Tan
Zhi You Tan