Michael Rausch 982fac38a0 Merge remote-tracking branch 'origin/develop' into 1273_Skybox ...

# Conflicts:
#	src/main/java/seng302/gameServer/GameState.java
#	src/main/java/seng302/gameServer/MainServerThread.java
#	src/main/java/seng302/gameServer/MessageFactory.java
#	src/main/java/seng302/gameServer/ServerToClientThread.java
#	src/main/java/seng302/model/ClientYacht.java
#	src/main/java/seng302/model/mark/MarkOrder.java
#	src/main/java/seng302/visualiser/GameClient.java
#	src/main/java/seng302/visualiser/GameView3D.java
#	src/main/java/seng302/visualiser/controllers/ServerListController.java
#	src/main/java/seng302/visualiser/controllers/dialogs/ServerCreationController.java
#	src/main/resources/icons/bumperIcon.png
#	src/main/resources/icons/handlingIcon.png
#	src/main/resources/icons/velocity.png
#	src/main/resources/icons/windWalkerIcon.png
#	src/main/resources/views/RaceView.fxml
#	src/main/resources/views/dialogs/ServerCreationDialog.fxml

2017-09-27 14:23:38 +13:00

..

BoatAction.java

Implemented turning mode toggle

2017-09-23 19:37:13 +12:00

BoatActionMessage.java

Fixed issues with correct protocol implementation.

2017-09-25 22:09:26 +13: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

Removed sendServerMessage to be replaced with notifyMessageListeners. Minor structure move arounds

2017-09-23 11:49:56 +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

Fixed JavaDoc errors by adding missing parameters

2017-09-01 16:13:18 +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

Implemented server to manage a list of available servers on the internet.

2017-09-20 20:26:14 +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 issues with correct protocol implementation.

2017-09-25 22:09:26 +13: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

RoomCodeRequest.java

Implemented server to manage a list of available servers on the internet.

2017-09-20 20:26:14 +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

ServerRegistrationMessage.java

Added functionality to automatically select a server

2017-09-26 01:14:02 +13: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

Added sounds to coin pick up

2017-09-11 14:45:04 +12:00

YachtEventType.java

The random token now has a 50% chance of causing your boat to have a speed penalty

2017-09-26 21:13:35 +13:00