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 +6
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 39d5b43cb8 - Show all commits

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

@@ -29,6 +29,7 @@ public class GameView extends MdgaView {
private FilterPostProcessor fpp; private FilterPostProcessor fpp;
public boolean needConfirm = false; public boolean needConfirm = false;
public boolean needNoPower = false;
private Node guiHandlerNode = new Node(); private Node guiHandlerNode = new Node();
@@ -131,10 +132,13 @@ public void noConfirm() {
public void showNoPower() { public void showNoPower() {
confirmButton.hide(); confirmButton.hide();
noPowerButton.show(); noPowerButton.show();
needNoPower = true;
} }
public void hideNoPower() { public void hideNoPower() {
noPowerButton.hide(); noPowerButton.hide();
needNoPower = false;
} }
public void enterInterrupt(Color color) { public void enterInterrupt(Color color) {

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

@@ -198,6 +198,8 @@ public void pressForward() {
if (this instanceof GameView gameView) { if (this instanceof GameView gameView) {
if(gameView.needConfirm) { if(gameView.needConfirm) {
app.getModelSynchronize().confirm(); app.getModelSynchronize().confirm();
} else if(gameView.needNoPower) {
app.getModelSynchronize().confirm();
} else { } else {
app.getAcousticHandler().playSound(MdgaSound.WRONG_INPUT); app.getAcousticHandler().playSound(MdgaSound.WRONG_INPUT);
} }