From eeaf29a6467db765e899cfb966417c8b86e654c7 Mon Sep 17 00:00:00 2001 From: Yvonne Schmidt Date: Mon, 9 Dec 2024 02:45:46 +0100 Subject: [PATCH 1/2] resolved popup overlap --- .../src/main/java/pp/monopoly/client/gui/popups/BuyHouse.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/BuyHouse.java b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/BuyHouse.java index c720d26..c3632ce 100644 --- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/BuyHouse.java +++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/BuyHouse.java @@ -125,13 +125,13 @@ public class BuyHouse extends Dialog { buyHouseContainer.setLocalTranslation( (app.getCamera().getWidth() - buyHouseContainer.getPreferredSize().x) / 2, (app.getCamera().getHeight() + buyHouseContainer.getPreferredSize().y) / 2, - 8 + 9 ); backgroundContainer.setLocalTranslation( (app.getCamera().getWidth() - buyHouseContainer.getPreferredSize().x - padding) / 2, (app.getCamera().getHeight() + buyHouseContainer.getPreferredSize().y + padding) / 2, - 7 + 8 ); app.getGuiNode().attachChild(buyHouseContainer); From 4eac2e3312824d634c99f126d29560e6f07e9023 Mon Sep 17 00:00:00 2001 From: Yvonne Schmidt Date: Mon, 9 Dec 2024 02:58:56 +0100 Subject: [PATCH 2/2] adjusted sound effects --- .../client/src/main/java/pp/monopoly/client/GameSound.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/GameSound.java b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/GameSound.java index 942dfc2..55175df 100644 --- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/GameSound.java +++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/GameSound.java @@ -120,6 +120,7 @@ public class GameSound extends AbstractAppState implements GameEventListener { winnerSound = loadSound(app, "Sound/Effects/winner.ogg"); looserSound = loadSound(app, "Sound/Effects/loser.ogg"); buttonSound = loadSound(app, "Sound/Effects/button.ogg"); + setVolume(volumeInPreferences()); } /**