 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
|
6242ab0b2e
|
Implemented observer and strategy pattern in BoatAnnotations, now renamed AnnotationsBox.
Also implemented various other small fixes and further refactored code.
#refactor
|
2017-07-25 20:45:27 +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
|
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 |
|