Calum d0565503e8 Merge branch 'develop' into issue47_disconnect_crash_rebranch ...

# Conflicts:
#	src/main/java/seng302/gameServer/ServerToClientThread.java
#	src/main/java/seng302/visualiser/ClientToServerThread.java
#	src/main/java/seng302/visualiser/GameClient.java

2017-08-17 14:15:27 +12:00

..

gameServer/server

Fixed some weird bug with the messages package, trying to add some small QoL changes with potential interaction bugs with the customization/lobby menu.

2017-08-17 13:13:07 +12:00

model

Fixed commented out test

2017-08-16 17:23:52 +12:00

models

Fixed a build error.

2017-08-17 01:23:34 +12:00

utilities

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

2017-08-17 14:10:38 +12:00

visualiser

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

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

ColorsTest.java

Added some general UI improvements such as autofilling the color field of the form, and looked at how best to deal with response packets, as it should be part of the spec.

2017-08-17 01:20:16 +12:00