Merged Develop into branch.

tags : #story[1142]
This commit is contained in:
Alistair McIntyre
2017-08-17 13:40:00 +12:00
parent 39cfaf6780
commit 5fc7442359
2 changed files with 3 additions and 3 deletions
@@ -95,7 +95,7 @@ public class GameClient {
/**
* Connect to a game as the host at the given address and starts the visualiser.
* @param ipAddress IP to connect to.
* @param ipAdclientYachtsdress IP to connect to.
* @param portNumber Port to connect to.
*/
public void runAsHost(String ipAddress, Integer portNumber) {
@@ -130,7 +130,7 @@ public class GameClient {
});
this.lobbyController = lobbyController;
server.setGameClient(this);
//server.setGameClient(this);
}
private void loadStartScreen() {