Michael Rausch 00ff771fc3 Merge remote-tracking branch 'origin/story1275_host_customization' into 1273_Skybox ...

# 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/visualiser/ClientToServerThread.java
#	src/main/java/seng302/visualiser/GameView.java
#	src/main/java/seng302/visualiser/GameView3D.java
#	src/main/java/seng302/visualiser/controllers/dialogs/ServerCreationController.java

2017-09-27 14:56:09 +13:00

..

messages

Merge remote-tracking branch 'origin/develop' into 1273_Skybox

2017-09-27 14:23:38 +13: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

Merged dev onto 1273_Skybox

2017-09-27 14:46:12 +13:00

HeartbeatThread.java

Added logger to HeartBeatThread.

2017-09-09 13:07:04 +12:00

MainServerThread.java

Merge remote-tracking branch 'origin/story1275_host_customization' into 1273_Skybox

2017-09-27 14:56:09 +13:00

MessageFactory.java

Merge remote-tracking branch 'origin/story1275_host_customization' into 1273_Skybox

2017-09-27 14:56:09 +13:00

ServerAdvertiser.java

Server discovery bug fixes & error handling improvements

2017-09-27 12:32:17 +13:00

ServerDescription.java

Implemented server to manage a list of available servers on the internet.

2017-09-20 20:26:14 +12:00

ServerListenThread.java

Fixed disconnection issues. Fix is only temporary until a consistent interface for disconnections exists.

2017-08-17 14:02:18 +12:00

ServerPacketParser.java

Merge request fixes

2017-09-08 15:52:01 +12:00

ServerToClientThread.java

Merge remote-tracking branch 'origin/story1275_host_customization' into 1273_Skybox

2017-09-27 14:56:09 +13:00