William Muir dba5a5680f Merge remote-tracking branch 'origin/develop' into 1293_PowerUps ...

# Conflicts:
#	src/main/java/seng302/model/ServerYacht.java
#	src/main/resources/views/RaceView.fxml

2017-09-25 17:20:25 +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

Fixed send button traversable issue.

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

FinishScreenViewController.java

Removed dead code from fxObjects and GameView 3D

2017-09-14 12:05:20 +12:00

LobbyController.java

Merge branch 'develop' into Story1278_keybindings

2017-09-25 11:06:28 +13:00

RaceViewController.java

Merge remote-tracking branch 'origin/develop' into 1293_PowerUps

2017-09-25 17:20:25 +13:00

ServerListController.java

- Fixed JFXDialog initialised in lobby, raceview, serverlist controller by default. Now, dialog only appears when called.

2017-09-19 18:40:01 +12:00

StartScreenController.java

- Added documentation to controllers

2017-09-12 16:54:40 +12:00

ViewManager.java

Fixed send button traversable issue.

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