Calum ab5ad58237 Merge branch 'develop' into story1275_host_customization ...

# Conflicts:
#	src/main/java/seng302/visualiser/GameView3D.java

2017-09-26 23:37:59 +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

Merge branch 'develop' into story1275_host_customization

2017-09-26 23:37:59 +13:00

FinishScreenViewController.java

Fixed issues with correct protocol implementation.

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

LobbyController.java

Refactored the 2D and 3D game view class setups. Made scaling more logical.

2017-09-26 00:55:28 +13:00

RaceViewController.java

Refactored the 2D and 3D game view class setups. Made scaling more logical.

2017-09-26 00:55:28 +13:00

ServerListController.java

Merge branch 'develop' into story1275_host_customization

2017-09-25 23:25:33 +13:00

StartScreenController.java

- Added documentation to controllers

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

ViewManager.java

Multiple fixes:

2017-09-26 22:52:58 +13:00