Merge branch 'develop' into Story1124_Sparkline

This commit is contained in:
Zhi You Tan
2017-08-17 13:14:08 +12:00
3 changed files with 50 additions and 49 deletions
@@ -130,7 +130,6 @@ public class GameClient {
});
this.lobbyController = lobbyController;
server.setGameClient(this);
}
private void loadStartScreen() {