Calum b3981b19e0 Merge branch 'develop' into story1275_host_customization ...

# Conflicts:
#	src/main/java/seng302/gameServer/GameState.java
#	src/main/java/seng302/gameServer/ServerToClientThread.java
#	src/main/java/seng302/model/ServerYacht.java
#	src/main/java/seng302/visualiser/ClientToServerThread.java
#	src/main/java/seng302/visualiser/controllers/LobbyController.java
#	src/test/java/seng302/models/YachtTest.java

2017-09-25 23:25:33 +13:00

..

BoatCustomizeController.java

Clean up changes

2017-09-23 15:37:16 +12:00

FinishDialogController.java

- Merged Dev into branch

2017-09-14 15:27:10 +12:00

KeyBindingDialogController.java

Fixed send button traversable issue.

2017-09-25 17:06:36 +13:00

ServerCreationController.java

Added a race importer. Added imported races to visualizer. Made it so that the host sets the race. Refactored server to no longer be dependant on a specific race. Tested functionality of map manually. Some bugs found and listed below.

2017-09-23 22:45:53 +12:00