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 +14732 -2704
269 changed files with 14732 additions and 2704 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 80989310e5 - Show all commits

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

@@ -160,7 +160,7 @@ private void handleGame(Notification notification) {
} else if (notification instanceof HomeMoveNotification home) { } else if (notification instanceof HomeMoveNotification home) {
boardHandler.movePieceHomeAnim(home.getPieceId(), home.getHomeIndex()); boardHandler.movePieceHomeAnim(home.getPieceId(), home.getHomeIndex());
guiHandler.hideText(); guiHandler.hideText();
app.getGameLogic().selectAnimationEnd(); waitForAnimation = true;
} else if (notification instanceof InterruptNotification notification1) { } else if (notification instanceof InterruptNotification notification1) {
gameView.enterInterrupt(notification1.getColor()); gameView.enterInterrupt(notification1.getColor());
} else if (notification instanceof MovePieceNotification n) { } else if (notification instanceof MovePieceNotification n) {

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

@@ -442,6 +442,7 @@ private void moveHomePiece(UUID uuid, int index){
pieceControl.setRotation(getRotationMove(firstHomeNode.getLocation(), lastHomeNode.getLocation())); pieceControl.setRotation(getRotationMove(firstHomeNode.getLocation(), lastHomeNode.getLocation()));
app.getModelSynchronize().animationEnd(); app.getModelSynchronize().animationEnd();
app.getModelSynchronize().animationEnd();
} }
/** /**