Fan-Wu Yang cd99492467 Merge branch 'master' into story1306_wind_arrow ...

# Conflicts:
#	racevisionGame/src/main/java/visualiser/layout/Assets3D.java

2017-09-26 15:04:02 +13:00

..

main

Merge branch 'master' into story1306_wind_arrow

2017-09-26 15:04:02 +13:00

test

Created enums and bound them to zoom in, zoom out and sails toggle for key bindings so that something expected shows up for key binding descriptions when changing key bindings. #story[1197]

2017-09-14 16:23:56 +12:00