William Muir 5046ca6ffa Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge

2017-09-12 16:08:39 +12:00

..

gameServer

Added chat functionality & timer back into the game + bug fixes

2017-09-12 01:31:38 +12:00

model

Merge branch 'story1266_3d_model_factory' into NewUI_merge

2017-09-11 23:45:31 +12:00

utilities

Injected a simple toggle into the decorator for the window for the sound.

2017-09-12 13:53:24 +12:00

visualiser

Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge

2017-09-12 16:08:39 +12:00

App.java

Fixed issue that when go back to start screen, start view doesn't fit

2017-09-10 12:43:17 +12:00