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

..

ClientConnectionDelegate.java

Changed package heirachy. Merged Controller and StartScreenController.

2017-07-21 09:22:55 +12:00

GameStages.java

Terminated the game server socket when click exit lobby button

2017-07-13 17:51:25 +12:00

GameState.java

Merge branch 'develop' into story61_player_perspective

2017-07-25 21:05:15 +12:00

HeartbeatThread.java

Merge branch 'develop' into story61_player_perspective

2017-07-25 21:05:15 +12:00

MainServerThread.java

Fixed XML Loading error, used VMG to calculate boat velocity

2017-07-25 20:14:50 +12:00

ServerListenThread.java

Merge branch 'develop' into story61_player_perspective

2017-07-25 21:05:15 +12:00

ServerPacketParser.java

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

ServerToClientThread.java

Fixed sending wrong race xml when a player disconnected because xml is getting data from gamestate yacht but the yachts are not updated is player disconnect.

2017-07-25 17:17:36 +12:00