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

Development #35

Merged
j23f0779 merged 22 commits from development into dev/model 2024-12-06 10:09:29 +01:00
Conversation 4 Commits 22 Files Changed 24 +2 -2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e337b1f888 - Show all commits

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

@@ -104,7 +104,7 @@ public void confirm() {
} }
gameView.noConfirm(); gameView.noConfirm();
gameView.needNoPower(); gameView.noNoPower();
} }
public void selectTsk(Color color) { public void selectTsk(Color color) {

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

@@ -38,7 +38,7 @@ public GameView(MdgaApp app) {
confirmButton = new ButtonRight(app, guiNode, () -> app.getModelSynchronize().confirm(), "Bestätigen", 1); confirmButton = new ButtonRight(app, guiNode, () -> app.getModelSynchronize().confirm(), "Bestätigen", 1);
noPowerButton = new ButtonRight(app, guiNode, () -> app.getModelSynchronize().confirm(), "Keine Powercard", 1); noPowerButton = new ButtonRight(app, guiNode, () -> app.getModelSynchronize().confirm(), "Verzichten", 1);
interruptDialog = new InterruptDialog(app, guiNode); interruptDialog = new InterruptDialog(app, guiNode);