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

..

BoatCustomizeDialog.fxml

Worked on making a visual component to the stats. Need to implement acceleration.

2017-09-22 16:45:10 +12:00

DirectConnect.fxml

Added skybox & cleaned up server list UI

2017-09-25 18:25:24 +13:00

KeyBindingDialog.fxml

Added confirm button in keybinding dialog.

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

PopupDialog.fxml

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

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

RaceFinishDialog.fxml

- Added Values to Finish Dialog.

2017-09-14 15:24:58 +12:00

ServerCreationDialog.fxml

Issue #83: Server creation dialog need to be polished

2017-09-28 11:13:02 +13:00

TokenInfoDialog.fxml

Merged dev changes back on to mini map

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