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
8b8b6e4afa
Fixed map glitch when race starts, and race XML bug
...
- Race XML wasn't being sent to clients, this was causing a null ptr exception
- Boat location was being set to an invalid lat/lng
Tags: #story[1047]
2017-07-23 18:20:13 +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
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
ffc61942a9
Fixed broken pipe error.
...
Was caused by boat ids being over 1000 and when turned into xml having a comma placed between the hundreds and the thousands? So to fix, I just mad the max id number 999 so there should not be any issues regarding that if another broken pipe error occurs. Also switched to use the correct yacht constructor.
#story[1047]
2017-07-23 17:10:18 +12:00
2e4382bff6
Trying to fix the boat information that is being sent over.
...
Current issue is that a broken pipe error keeps occurring potentially due to how the messages are being sent so quickly that the previous message may have not finished sending. Also only caused the xm packets to be sent on trigger when a new client connects.
#story[1047]
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.
#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
33fae9d69a
Added race boats to XML Generator
...
Tags: #story[1047]
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.
...
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
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
2fff73c075
Merge remote-tracking branch 'origin/984_Xml_Generation' into Broadcasting_GameState
...
# Conflicts:
# src/main/java/seng302/controllers/FinishScreenViewController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/gameServer/GameServerThread.java
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/models/Yacht.java
2017-07-21 12:31:35 +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
3ec1242a9a
Merge branch 'Story62_Reading_Keystrokes' into story61_player_perspective
...
# Conflicts:
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
2017-07-21 11:13:04 +12:00
881f7f8e30
Changed package heirachy. Merged Controller and StartScreenController.
...
#refactor
2017-07-21 09:22:55 +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
322ff740e2
Added race start time to race XML
...
- Added race start time to race XML
- Added documentation
- Removed test code in MainServerThread
Tags: #story[984]
2017-07-20 14:28: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
82b219cdba
Boat and race XML now generated dynamically
...
- Removed course from XML Generator as it was not needed
- Boat and race XML added
- Method names in Yacht class updated to follow JavaBean standard so they can be read by the template engine
Tags: #story[984]
2017-07-20 13:30:55 +12:00
e317de7562
Added mock yachts to the game state for each client #story[1047]
2017-07-20 13:11:37 +12:00
9ecaa7c3b3
Merge branch 'Story62_Reading_Keystrokes' into story61_player_perspective
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.
...
#refactor
2017-07-20 13:04:29 +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
360c55fdb9
Merge branch 'Story62_Reading_Keystrokes' into story61_player_perspective
...
# Conflicts:
# src/main/java/seng302/controllers/GameViewController.java
# src/main/java/seng302/fxObjects/BoatGroup.java
2017-07-20 12:20:12 +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
45053ba507
Added XML Generation
...
- Implemented a wrapper for Apache Freemake
- Implemented the regatta XML generator
Tags: #story[984]
2017-07-19 14:47:16 +12:00
d9f5f7a137
Refactoring view for game development
...
#story[987]
2017-07-18 14:00:24 +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
Zhi You Tan
Michael Rausch
Kusal Ekanayake
William Muir
Peter Galloway
Calum
Alistair McIntyre
Haoming Yin