Zhi You Tan 852575c9e7 Merge remote-tracking branch 'origin/develop' into wind_arrow ...

# Conflicts:
#	src/main/java/seng302/visualiser/controllers/RaceViewController.java
#	src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelType.java
#	src/main/resources/views/RaceView.fxml

2017-09-28 11:57:12 +13:00

..

css

Merge remote-tracking branch 'origin/develop' into wind_arrow

2017-09-28 11:57:12 +13:00

icons

Forgot to git add the new icon.. again.. sorree

2017-09-27 12:44:50 +13:00

images

Added animation for wind turning.

2017-09-28 00:13:45 +13:00

maps

Added per map max player count. Handles case when map cannot fit players behind start mark. Added initial implementation for spacing out yachts.

2017-09-27 02:04:24 +13:00

meshes

Merge remote-tracking branch 'origin/develop' into wind_arrow

2017-09-28 11:57:12 +13:00

server_config

Added per map max player count. Handles case when map cannot fit players behind start mark. Added initial implementation for spacing out yachts.

2017-09-26 23:34:19 +13:00

sounds

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

2017-09-11 15:54:30 +12:00

views

Merge remote-tracking branch 'origin/develop' into wind_arrow

2017-09-28 11:57:12 +13:00

PP.png

Updated PartyParrot logo

2017-09-20 15:41:20 +12:00