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 +4 -3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0237bcc4be - Show all commits

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

@@ -130,10 +130,10 @@ public void selectCard(CardControl cardControl) {
} }
cardControl.select(); cardControl.select();
cardSelect = getKeyByValue(bonusCardControlMap, cardControl); cardSelect = getKeyByValue(bonusCardControlMap, cardControl);
}
app.getModelSynchronize().selectCard(cardSelect); app.getModelSynchronize().selectCard(cardSelect);
} }
}
public Camera getCardLayerCamera() { public Camera getCardLayerCamera() {
return cardLayerCamera; return cardLayerCamera;

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

@@ -70,6 +70,7 @@ public void onLeave() {
confirmButton.hide(); confirmButton.hide();
noPowerButton.hide();
app.getViewPort().removeProcessor(fpp); app.getViewPort().removeProcessor(fpp);
} }
@@ -124,7 +125,7 @@ public void noConfirm() {
public void needNoPower() { public void needNoPower() {
confirmButton.hide(); confirmButton.hide();
noPowerButton.hide(); noPowerButton.show();
} }
public void noNoPower() { public void noNoPower() {