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

..

cells

Added 3D element to lobby screen to show the player their boat before the race.

2017-09-12 03:57:29 +12:00

dialogs

Merge remote-tracking branch 'origin/develop' into 1273_Skybox

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

Baloo-Regular.ttf

Fixed some UI bugs, and redesigned some UI elements.

2017-09-09 15:00:32 +12:00

digital-7-mono.ttf

Fixed that wind speed did not updated frequently and UI polishing.

2017-09-13 21:11:40 +12:00

LobbyView.css

Polished race view text area and send button UI style to make them pretty

2017-09-12 10:59:08 +12:00

Master.css

Temporarily added more options in key binding dialog. But still need to implement binding after camera story has been merged into develop

2017-09-26 15:49:16 +13:00

RaceView.css

Fixed send button traversable issue.

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

ServerListView.css

Added functionality to automatically select a server

2017-09-26 01:14:02 +13:00

StartScreenView.css

Added close button for keyBindingDialog.

2017-09-25 16:31:28 +13:00