William Muir 8a0ad8d6a9 Merge remote-tracking branch 'origin/develop' into 1293_PowerUps ...

# Conflicts:
#	src/main/java/seng302/gameServer/GameState.java
#	src/main/java/seng302/model/ServerYacht.java

2017-09-25 11:19:10 +13:00

..

messages

Created Boat bumper logic. Refactored logic for powering up / dpwn

2017-09-23 13:23:16 +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 remote-tracking branch 'origin/develop' into 1293_PowerUps

2017-09-25 11:19:10 +13:00

HeartbeatThread.java

Added logger to HeartBeatThread.

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

MainServerThread.java

Small refactor. Fixed tokens to spawn on the minute mark.

2017-09-23 11:33:01 +12:00

MessageFactory.java

Created Boat bumper logic. Refactored logic for powering up / dpwn

2017-09-23 13:23:16 +12:00

ServerAdvertiser.java

re-implemented existing functionality in UI

2017-09-08 18:00:09 +12:00

ServerDescription.java

re-implemented existing functionality in UI

2017-09-08 18:00:09 +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

Changed the boatType attribute from all around the place from String lit to enum

2017-09-22 21:00:28 +12:00