peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

merge the new developmentbranch into the test branch #39

Closed
j23f0712 wants to merge 431 commits from development2 into dev/test
pull from: development2
merge into: peet:dev/test
Conversation 1 Commits 431 Files Changed 269 +5 -5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c4e7fb1d41 - Show all commits

10
Projekte/mdga/client/src/main/java/pp/mdga/client/ModelSynchronizer.java
View File

@@ -88,17 +88,17 @@ public void confirm() {
GameView gameView = (GameView) app.getView(); GameView gameView = (GameView) app.getView();
if(a != null && b != null) { if(a != null && b != null) {
selectPiece(a); app.getGameLogic().selectPiece(a);
selectPiece(b); app.getGameLogic().selectPiece(b);
gameView.getBoardHandler().clearSelectable(); gameView.getBoardHandler().clearSelectable();
} else if (a != null) { } else if (a != null) {
selectPiece(a); app.getGameLogic().selectPiece(a);
gameView.getBoardHandler().clearSelectable(); gameView.getBoardHandler().clearSelectable();
} else { } else {
if(null == card) { if(null == card) {
selectCard(null); app.getGameLogic().selectCard(null);
} else { } else {
selectCard(card); app.getGameLogic().selectCard(card);
gameView.getGuiHandler().clearSelectableCards(); gameView.getGuiHandler().clearSelectableCards();
} }
} }