William Muir a5eea10c87 Merge branch 'develop' into story1273_minimap ...

# Conflicts:
#	src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java
#	src/main/resources/meshes/boatSTLs/parrot_features.stl

2017-09-28 14:41:08 +13:00

..

annotations

Began fixing bugs with caused by asynchronous listener calls.

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

cells

Changed the boatType attribute from all around the place from String lit to enum

2017-09-22 21:00:28 +12:00

dialogs

Added confirm button in keybinding dialog.

2017-09-28 13:58:25 +13:00

FinishScreenViewController.java

Fixed issues with correct protocol implementation.

2017-09-25 22:09:26 +13:00

LobbyController.java

Tokens now display on the right and are clickable for further information

2017-09-28 12:20:16 +13:00

RaceViewController.java

Merged dev changes back on to mini map

2017-09-28 12:58:19 +13:00

ServerListController.java

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

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

SplashScreenController.java

Added confirm button in keybinding dialog.

2017-09-28 13:58:25 +13:00

StartScreenController.java

Fixed failing tests & other bug fixes

2017-09-27 20:37:29 +13:00

ViewManager.java

Merged dev changes back on to mini map

2017-09-28 12:58:19 +13:00