fjc40 9763150e85 Merge remote-tracking branch 'origin/master' into game_start_button_1352

2017-09-25 22:39:29 +13:00

..

main

Merge remote-tracking branch 'origin/master' into game_start_button_1352

2017-09-25 22:39:29 +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