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 -1
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4ca7c38170 - Show all commits

1
Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java
View File

@@ -175,7 +175,6 @@ private void handleGame(Notification notification) {
if(n.getCard() == BonusCard.TURBO) { if(n.getCard() == BonusCard.TURBO) {
guiHandler.turbo(); guiHandler.turbo();
app.getModelSynchronize().animationEnd(); app.getModelSynchronize().animationEnd();
return;
} }
if(n.getColor() == ownColor) guiHandler.playCardOwn(n.getCard()); if(n.getColor() == ownColor) guiHandler.playCardOwn(n.getCard());