hba56 86de4e7c0c Merge remote-tracking branch 'origin/master'

2017-09-14 16:27:54 +12:00

..

app

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

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

Commands

Merge branch 'master' into story_64_sails

2017-08-17 12:59:25 +12:00

Controllers

fix null pointer when playing tutorial

2017-09-14 16:27:36 +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

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

layout

Removed/commented out unecessary print messages #story[1188]

2017-09-13 21:21:19 +12:00

model

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

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

network

Changed the ip of the matchbrowser to that of the CI.

2017-09-13 23:50:55 +12:00

utils

SeaSurface files have been added to display the surface in the lobby. Surface is now drawn in the lobby

2017-09-12 21:55:23 +12:00