 Zhi You Tan
|
c77adf385e
|
Terminating client thread before server thread to prevent alert box popping up
|
2017-08-14 11:21:33 +12:00 |
|
|
Zhi You Tan
|
9b7f4a93d8
|
Merge remote-tracking branch 'origin/issue38_irregular_key_event_packets' into issue38_irregular_key_event_packets
|
2017-08-14 11:02:19 +12:00 |
|
|
Zhi You Tan
|
e780b47160
|
Fix javafx error on ci
|
2017-08-14 11:02:07 +12:00 |
|
 Calum
|
f2f750298c
|
Added print statements for determining where javaFX is accessed from in the test.
|
2017-08-13 21:05:28 +12:00 |
|
|
Calum
|
d79b0421c2
|
Fixed merged conflicts with merge onto develop.
#bug
|
2017-08-13 19:00:06 +12:00 |
|
|
Calum
|
8cb5b8caec
|
Merge branch 'develop' into issue38_irregular_key_event_packets
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/ServerPacketParser.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameClient.java
|
2017-08-13 18:44:34 +12:00 |
|
|
Calum
|
2093e79b6a
|
Rather than a high frequency loop sending all packets a low frequency loop is made then destroyed on button press for sending turn packets. This means a fast response time on button press but fewer packets sent.
#implement #issue[38]
|
2017-08-13 18:38:24 +12:00 |
|
 Michael Rausch
|
09c4f98056
|
Implemented new client - server handshake protocol
- Implemented new packet types
- Changed server & client logic to use new protocol
Tags: #story[1124] (Issue 39)
|
2017-08-10 19:01:30 +12:00 |
|
|
Calum
|
8a40119a98
|
Action packets now sent at regular 20ms intervals
#issue[38] #implement
|
2017-08-06 22:17:08 +12:00 |
|
 William Muir
|
c655cb3fab
|
Fixed build. (Actually this time)
All doc string annotations were required to be fixed for all methods
tags: #issue[34]
|
2017-08-03 11:45:14 +12:00 |
|
|
Calum
|
87ef37a689
|
Fixed connecting to hosts. Fixed issue34 and 35 to the point where they can be developed off of.
#refactor #bug #issue[34, 35]
|
2017-08-02 00:26:57 +12:00 |
|
|
Calum
|
908c0749cf
|
Boats now move on screen as intended.
TODO - Make the client connect to the server.
|
2017-08-01 02:37:55 +12:00 |
|
|
Calum
|
47c5e6f155
|
Reverting some new graphics classes back to how they were on master.
|
2017-07-31 23:35:28 +12:00 |
|
|
Calum
|
b82d0d0137
|
Boats and map are now updated using the observer pattern.
#implement
|
2017-07-31 05:23:41 +12:00 |
|
|
Calum
|
6cae338c1e
|
Began fixing bugs with caused by asynchronous listener calls.
#bug
|
2017-07-30 20:12:19 +12:00 |
|
|
Calum
|
7894e31926
|
Merge branch 'develop' into story61_player_perspective
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/client/ClientPacketParser.java
# src/main/java/seng302/client/ClientState.java
# src/main/java/seng302/client/ClientStateQueryingRunnable.java
# src/main/java/seng302/controllers/Controller.java
# src/main/java/seng302/controllers/LobbyController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/controllers/StartScreenController.java
# src/main/java/seng302/fxObjects/BoatAnnotations.java
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/model/Yacht.java
# src/main/java/seng302/model/stream/StreamReceiver.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/fxObjects/BoatObject.java
# src/test/java/seng302/model/stream/StreamReceiverTest.java
|
2017-07-30 18:07:28 +12:00 |
|
|
Calum
|
9c9f6e4e80
|
Merge branch 'develop' into story61_player_perspective
# Conflicts:
# src/main/java/seng302/fxObjects/BoatAnnotations.java
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/model/Yacht.java
# src/main/java/seng302/visualiser/controllers/LobbyController.java
|
2017-07-26 02:56:46 +12:00 |
|
|
Calum
|
08e369f1ae
|
Merged with develop. Fixed many bugs in Visualiser.
#bugs
|
2017-07-26 02:49:31 +12:00 |
|
|
Calum
|
acd54dec7a
|
Merge branch 'develop' into story61_player_perspective
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/client/ClientPacketParser.java
# src/main/java/seng302/controllers/Controller.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/fxObjects/BoatAnnotations.java
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/model/Boat.java
# src/main/java/seng302/models/stream/XMLParser.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/controllers/FinishScreenViewController.java
# src/main/java/seng302/visualiser/controllers/StartScreenController.java
# src/main/java/seng302/visualiser/fxObjects/BoatObject.java
# src/main/resources/views/LobbyView.fxml
# src/main/resources/views/MainView.fxml
|
2017-07-25 21:05:15 +12:00 |
|
|
Calum
|
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.
#story[986] #refactor
|
2017-07-24 12:14:08 +12:00 |
|
|
Calum
|
881f7f8e30
|
Changed package heirachy. Merged Controller and StartScreenController.
#refactor
|
2017-07-21 09:22:55 +12:00 |
|