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

merge development into test #26

Merged
j23f0712 merged 95 commits from development into dev/test 2024-12-01 21:02:48 +01:00
Conversation 2 Commits 95 Files Changed 270 +6 -2
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 36d31e99e9 - Show all commits

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

@@ -80,6 +80,9 @@ public void confirm() {
} else { } else {
throw new RuntimeException("nothing to confirm"); throw new RuntimeException("nothing to confirm");
} }
GameView gameView = (GameView) app.getView();
gameView.noConfirm();
} }
public void selectTsk(Color color) { public void selectTsk(Color color) {
@@ -142,6 +145,7 @@ public void enter(MdgaState state) {
GameView gameView = (GameView) app.getView(); GameView gameView = (GameView) app.getView();
//app.getNotificationSynchronizer().addTestNotification(new DrawCardNotification(Color.AIRFORCE, BonusCard.SHIELD)); //app.getNotificationSynchronizer().addTestNotification(new DrawCardNotification(Color.AIRFORCE, BonusCard.SHIELD));
selectPiece(UUID.randomUUID());
} }
if (state == MdgaState.LOBBY) { if (state == MdgaState.LOBBY) {

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

@@ -46,9 +46,9 @@ public GameView(MdgaApp app) {
super(app); super(app);
cheatButton = new ButtonRight(app, settingsNode, () -> app.getModelSyncronizer().enter(MdgaState.CEREMONY), "CHEAT", 1); cheatButton = new ButtonRight(app, settingsNode, () -> app.getModelSyncronizer().enter(MdgaState.CEREMONY), "CHEAT", 1);
leaveButton = new ButtonLeft(app, settingsNode, () -> app.getModelSyncronizer().leave(), "Spiel verlassen", 1); leaveButton = new ButtonLeft(app, settingsNode, () -> app.getModelSyncronizer().leave(), "Spiel verlassen", 1);
confirmButton = new ButtonRight(app, settingsNode, () -> app.getModelSyncronizer().confirm(), "Bestätigen", 1);
confirmButton = new ButtonRight(app, guiNode, () -> app.getModelSyncronizer().confirm(), "Bestätigen", 1);
fpp = new FilterPostProcessor(app.getAssetManager()); fpp = new FilterPostProcessor(app.getAssetManager());
this.camera = new CameraHandler(app, fpp); this.camera = new CameraHandler(app, fpp);