Connor Taylor-Brown 5473fde731 Merge remote-tracking branch 'remotes/origin/master' into story1291-hp

2017-09-21 12:49:27 +12:00

..

app

Merge remote-tracking branch 'remotes/origin/master' into story77

2017-09-13 16:13:14 +12:00

Commands

Merge remote-tracking branch 'remotes/origin/master' into story1291-hp

2017-09-21 12:49:27 +12:00

Controllers

Merge remote-tracking branch 'remotes/origin/master' into story1291-hp

2017-09-21 12:49:27 +12:00

enums

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

gameController

Reset collision tag on visualiser boat after displaying collision

2017-09-14 22:36:18 +12:00

layout

Tomato now depletes as expected

2017-09-21 12:10:33 +12:00

model

Merge remote-tracking branch 'remotes/origin/master' into story1291-hp

2017-09-21 12:49:27 +12:00

network

Merge remote-tracking branch 'remotes/origin/master' into story1291-hp

2017-09-21 12:49:27 +12:00

utils

Changed GraphCoordinate to use double instead of int.

2017-09-15 01:34:32 +12:00