sem/Csharp-eindproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge Setup branch into develop #1

Merged
SemvdH merged 71 commits from setupBranch into master 2020-10-21 18:59:02 +00:00
Conversation 2 Commits 71 Files Changed 42 +11 -8
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b1237e53a2 - Show all commits

19
Client/ViewModels/ViewModel.cs
View File

@@ -35,16 +35,19 @@ namespace Client
Debug.WriteLine("Host button clicked");
});
JoinSelectedLobby = new RelayCommand(() =>
JoinSelectedLobby = new RelayCommand(startGameInLobby, true);
}
private void startGameInLobby()
{
if (SelectedLobby != null)
{
if (SelectedLobby != null)
{
_model.CanStartGame = false;
GameWindow window = new GameWindow();
window.Show();
}
ClientData.Instance.Lobby = SelectedLobby;
}, true);
_model.CanStartGame = false;
GameWindow window = new GameWindow();
window.Show();
}
}
private void ClickCheck()