 Michael Rausch
|
5843fc9212
|
The merge went well!!
Tags: #story[1109]
|
2017-08-16 14:51:44 +12:00 |
|
|
Michael Rausch
|
8fb5ea2223
|
Merge branch 'develop' into StartScreen
# Conflicts:
# 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/utilities/StreamParser.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/controllers/LobbyController.java
|
2017-08-16 14:31:14 +12:00 |
|
 Alistair McIntyre
|
9cb5956f3c
|
Updated lobby controller to pass the player ID through, and the lobby view to have a customize button.
tags: #story[1142]
|
2017-08-15 16:48:23 +12:00 |
|
 Peter Galloway
|
ff92262a78
|
fixed race clock countdown/count up #story[1109]
|
2017-08-14 16:32:50 +12:00 |
|
|
Michael Rausch
|
d2fd9ebaea
|
Started work on start screen
- Server now sends out race start status messages during lobby & pre-start stages
- Added timer in lobby
Tags: #story[1109]
|
2017-08-11 19:03:57 +12:00 |
|
 Calum
|
8a40119a98
|
Action packets now sent at regular 20ms intervals
#issue[38] #implement
|
2017-08-06 22:17:08 +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
|
6cae338c1e
|
Began fixing bugs with caused by asynchronous listener calls.
#bug
|
2017-07-30 20:12:19 +12:00 |
|
|
Calum
|
8ac44d13df
|
Began fixing conflicts with LobbyController
#bug
|
2017-07-26 12:05:03 +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
|
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 |
|
|
Calum
|
881f7f8e30
|
Changed package heirachy. Merged Controller and StartScreenController.
#refactor
|
2017-07-21 09:22:55 +12:00 |
|