Alistair McIntyre 39cfaf6780 Merge remote-tracking branch 'origin/develop' into Story80_BoatCustomization ...

# Conflicts:
#	src/main/java/seng302/gameServer/GameState.java
#	src/main/java/seng302/gameServer/ServerPacketParser.java
#	src/main/java/seng302/gameServer/ServerToClientThread.java
#	src/main/java/seng302/gameServer/messages/ChatterMessage.java
#	src/main/java/seng302/gameServer/messages/MarkRoundingMessage.java
#	src/main/java/seng302/model/ServerYacht.java
#	src/main/java/seng302/visualiser/ClientToServerThread.java
#	src/main/java/seng302/visualiser/GameClient.java
#	src/main/java/seng302/visualiser/GameView.java

2017-08-17 13:31:27 +12:00

..

customizeView.fxml

Everything works. Needs a bit of polish, and possibly look at boat shapes next.

2017-08-16 20:38:11 +12:00

FinishScreenView.fxml

Began fixing bugs with caused by asynchronous listener calls.

2017-07-30 20:12:19 +12:00

HostLobbyView.fxml

Began fixing bugs with caused by asynchronous listener calls.

2017-07-30 20:12:19 +12:00

importantAnnotationSelectView.fxml

Began fixing bugs with caused by asynchronous listener calls.

2017-07-30 20:12:19 +12:00

LobbyView.fxml

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

RaceView.fxml

Solved the fps counter zoom together with canvas problem. Workaround used was changing fps counter on game view to race view.

2017-08-13 18:52:42 +12:00

StartScreenView.fxml

WIP: Connected game client to main server thread to pass compound mark variable.

2017-08-03 18:39:15 +12:00

TestMapView.fxml

Action packets now sent at regular 20ms intervals

2017-08-07 10:58:07 +12:00