merge Setup branch into develop #1

Merged
SemvdH merged 71 commits from setupBranch into master 2020-10-21 18:59:02 +00:00
2 changed files with 9 additions and 1 deletions
Showing only changes of commit a837611317 - Show all commits

View File

@@ -11,6 +11,7 @@ namespace Client
private int _numbers;
private bool _status;
private bool _canStartGame;
//Test code
public int Numbers
@@ -37,11 +38,18 @@ namespace Client
}
}
public bool CanStartGame
{
get { return _canStartGame; }
set { _canStartGame = value; }
}
public Model()
{
_status = false;
_numbers = 0;
_canStartGame = true;
}
}

View File

@@ -39,6 +39,7 @@ namespace Client
{
if (SelectedLobby != null)
{
_model.CanStartGame = false;
GameWindow window = new GameWindow();
window.Show();
}
@@ -55,7 +56,6 @@ namespace Client
}
private Model _model;
public Model Model
{