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

..

BoatAction.java

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

BoatActionMessage.java

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

BoatLocationMessage.java

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

BoatStatus.java

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

BoatSubMessage.java

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

ChatterMessage.java

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

ClientType.java

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

CustomizeRequestMessage.java

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

CustomizeRequestType.java

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

CustomizeResponseMessage.java

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

CustomizeResponseType.java

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

DeviceType.java

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

Header.java

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

Heartbeat.java

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

MarkRoundingMessage.java

Game state now updates based on boat position. Arrows drawn as boat travels course. Currently do not point in correct direction, also the sparkline does not work.

2017-08-16 03:51:48 +12:00

MarkType.java

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

Message.java

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

MessageType.java

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

RaceStartNotificationType.java

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

RaceStartStatusMessage.java

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

RaceStatus.java

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

RaceStatusMessage.java

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

RaceType.java

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

RegistrationRequestMessage.java

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

RegistrationResponseMessage.java

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

RegistrationResponseStatus.java

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

RoundingBoatStatus.java

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

RoundingSide.java

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

XMLMessage.java

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

XMLMessageSubType.java

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

YachtEventCodeMessage.java

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