Alistair McIntyre 33779ad5c1 Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge ...

# Conflicts:
#	src/main/resources/views/RaceView.fxml

2017-09-14 14:42:57 +12:00

..

annotations

Began fixing bugs with caused by asynchronous listener calls.

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

cells

- Added documentation to controllers

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

dialogs

- Race Finish Dialog showing up, unsure if its actually showing the correct ordering or not.

2017-09-14 14:42:25 +12:00

FinishScreenViewController.java

Removed dead code from fxObjects and GameView 3D

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

LobbyController.java

Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge

2017-09-14 14:42:57 +12:00

RaceViewController.java

- Race Finish Dialog showing up, unsure if its actually showing the correct ordering or not.

2017-09-14 14:42:25 +12:00

ServerListController.java

- Added documentation to controllers

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

StartScreenController.java

- Added documentation to controllers

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

ViewManager.java

- Race Finish Dialog showing up, unsure if its actually showing the correct ordering or not.

2017-09-14 14:42:25 +12:00