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
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
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
2869d139a3
Three way handshake implemented client and server side and functioning
...
Server generates a new Id for connections (Size of connections + 1)
Client now stores an id allocated to it by the server
The id is currently being saved in the clientToServer thread client side
tags: #story[987] #implement
2017-07-22 17:44:37 +12:00
3ec930491f
Minor refactor, threads now start themselves
...
tags: #story[989] #refactor
2017-07-22 16:45:24 +12:00
a0005064ac
Fixed the Yacht clas so it now works.
...
Lists and Maps are instantiated as they should be in GameState which were creating NullPointers
Introduced ServerLog to server to client threads for bug reporting
Introduced some print statements to test the game state updating upon receiving key presses
tags: #story[989] #refactor #fix
2017-07-22 16:32:05 +12:00
913e5fee7b
Hooked up key press actions to the GameState, applying the relevant maths to update headings etc.
...
tags: #story[989] #pair[ptg19, wmu16]
2017-07-21 16:50:09 +12:00
3992073303
Set race started state in client state when packet is passed in client packet parser.
...
#story[1055]
2017-07-21 16:36:56 +12:00
797a99f632
Merge remote-tracking branch 'origin/develop' into Story62_Swtich_To_RaceView_When_Race_Start
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
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.
#story[1055] #pair[hyi25, zyt10]
2017-07-21 16:14:45 +12:00
e8c2cf809b
Fixed Null Ptr Exception in GameState
2017-07-21 15:42:20 +12:00
ec761893c7
Merge branch 'Story62_Reading_Keystrokes' into 'develop'
...
Story62 reading keystrokes
Big merge
See merge request !44
2017-07-21 15:39:39 +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
12c2f31af9
Merge remote-tracking branch 'origin/Story62_Creating_Game_Loop' into Story62_Creating_Game_Loop
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
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]
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.
...
#story[986]
2017-07-20 14:30:13 +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
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
176d65e0b2
Merge branch 'Story62_Reading_Keystrokes' into Story62_Creating_Game_Loop
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
tags: #story[1055] #refactor #fix
2017-07-20 11:46:06 +12:00
e257602b78
Merge remote-tracking branch 'origin/Story62_Reading_Keystrokes' into Story62_Reading_Keystrokes
...
# Conflicts:
# src/main/java/seng302/controllers/LobbyController.java
# src/main/java/seng302/gameServer/MainServerThread.java
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
tags: #story[1055]
2017-07-20 11:22:30 +12:00
63d24c001f
Added position update in yacht #story[1047]
2017-07-19 19:41:07 +12:00
67668fe1fc
Merge branch 'Story62_Reading_Keystrokes' into Story62_Creating_Game_Loop
2017-07-19 18:13:58 +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
b301ce5d27
fixed build (i think?)
...
tags: #story[1055] pair[wmu16, zyt10]
2017-07-18 12:26:47 +12:00
f02bd3b3f8
Merge remote-tracking branch 'origin/Story62_Reading_Keystrokes' into Story62_Reading_Keystrokes
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
tags: #story[1055] pair[wmu16, zyt10]
2017-07-18 12:22:58 +12:00
102b5f3ca1
Added a program icon that I snipped from the logo using photoshop.
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".
#story[1047] #pair[hyi25, wmu16] #pair[cir27, zyt10]
2017-07-17 17:00:04 +12:00
4b8ac32ca9
Merge branch '1047_Hosting_Game' into Story62_Reading_Keystrokes
2017-07-17 10:55:17 +12:00
00b29a1890
Merge remote-tracking branch 'origin/develop' into Story62_Reading_Keystrokes
2017-07-17 10:55:08 +12:00
c7e5f93bc4
Merged GeoUtility and GeometryUtils classes
...
#story[1047]
2017-07-16 21:58:40 +12:00
e4d87c91a2
Merge branch 'develop' into 1047_Hosting_Game
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
...
#story[988]
2017-07-14 18:27:54 +12:00
e03e8825b2
Merge remote-tracking branch 'origin/1047_Hosting_Game' into Story62_Reading_Keystrokes
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.
...
#story[988] #pair[hyi25, zyt10]
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
tags: #story[1047] pair[wmu16, mra106]
2017-07-14 17:09:33 +12:00
2809d0d832
Merge branch '1047_Hosting_Game' into Story62_Reading_Keystrokes
...
# Conflicts:
# src/main/resources/views/RaceView.fxml
2017-07-14 16:28:42 +12:00
5b908ec355
Merge remote-tracking branch 'origin/1047_Hosting_Game' into 1047_Hosting_Game
...
# Conflicts:
# src/main/java/seng302/gameServer/GameServerThread.java
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
...
tags: #story[1047]
2017-07-13 22:55:03 +12:00
c19f66a6a4
Added garbage collection for disconnected players
...
- Heartbeat messages are sent out from their own thread to each player
- If a heartbeat message can't be sent to a player, they are removed from the list of players
- Added equals method for players
Tags: #story[1047]
2017-07-13 22:07:03 +12:00
1e6fd1af09
Fixed bug where players were being added to the GameState twice
...
#story[1047]
2017-07-13 19:27:47 +12:00
55db2c9961
Fixed buffer overflow in message header
...
- Fixed buffer overflow by adding a reset method that clears the buffer and sets the position to zero before re-writing the header
Tags: #story[1047]
2017-07-13 19:15:45 +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
78557a4536
Key presses are transmitted to a host (but there is no host currently connected)
...
#pair[kre39,zyt10] #story[988]
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
...
tags: #story[1047] #pair[wmu16]
2017-07-13 14:40:11 +12:00
5ce34bed92
Key presses now assigned to enum and empty packet class is constructed.
...
#pair[kre39,zyt10] #story[988]
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
...
tags: #story[1047] #pair[wmu16, mra106]
2017-07-11 17:03:32 +12:00
Zhi You Tan
William Muir
Peter Galloway
Michael Rausch
Alistair McIntyre
Kusal Ekanayake
Haoming Yin