Kusal Ekanayake 0a7a9018f3 Merge branch 'develop' into Story64_SailsAnimations ...

# Conflicts:
#	src/main/java/seng302/model/Yacht.java

2017-08-13 15:27:25 +12:00

..

server

Merge branch 'Story71_TackAndGybeSmoothly' into 'develop'

2017-08-13 14:22:28 +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

Implemented new client - server handshake protocol

2017-08-10 19:01:30 +12:00

HeartbeatThread.java

Fixed connecting to hosts. Fixed issue34 and 35 to the point where they can be developed off of.

2017-08-02 00:26:57 +12:00

MainServerThread.java

Started work on cucumber tests. Trying to sort through threads, getting inconsistent results.

2017-08-07 17:54:34 +12:00

ServerListenThread.java

Merge branch 'develop' into story61_player_perspective

2017-07-30 18:07:28 +12:00

ServerPacketParser.java

Implemented new client - server handshake protocol

2017-08-10 19:01:30 +12:00

ServerToClientThread.java

Removed redundant input & output streams

2017-08-10 20:15:08 +12:00