fjc40 eb2ed45ed2 Merge branch 'master' into spectate_mode_basic ...

# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java

2017-09-15 00:46:07 +12:00

..

app

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

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

Commands

Removed sout statements.

2017-09-14 16:52:45 +12:00

Controllers

Merge branch 'master' into spectate_mode_basic

2017-09-15 00:46:07 +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

Removed a println and fixed some javadoc warnings.

2017-09-14 23:46:54 +12:00

model

Merge branch 'master' into spectate_mode_basic

2017-09-15 00:46:07 +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