Calum 6f534a430d Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge ...

# Conflicts:
#	src/main/java/seng302/visualiser/controllers/RaceViewController.java
#	src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java

2017-09-12 17:04:37 +12:00

..

assets_2D

Changed the lobby map view to the 2D race rather than the 3D one.

2017-09-12 16:08:29 +12:00

assets_3D

Moved transformation of boat icon view from controller class to model factory class.

2017-09-12 17:03:50 +12:00

ChatHistory.java

Fixed tests.

2017-09-12 16:52:26 +12:00