Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/LobbyMenu.java

@@ -154,6 +154,7 @@ public class LobbyMenu extends Dialog {
         figures.add("Katze");
         figures.add("OOP");
         figures.add("Handyholster");
+        figures.add("Panzer");
 
         
         figureDropdown = new Selector<>(figures, "glass");

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/BuildingPropertyCard.java

@@ -94,14 +94,14 @@ public class BuildingPropertyCard extends Dialog {
         buildingPropertyContainer.setLocalTranslation(
             (app.getCamera().getWidth() - buildingPropertyContainer.getPreferredSize().x) / 2,
             (app.getCamera().getHeight() + buildingPropertyContainer.getPreferredSize().y) / 2,
-            16
+            8
         );
 
         // Zentriere das Popup
         backgroundContainer.setLocalTranslation(
                 (app.getCamera().getWidth() - buildingPropertyContainer.getPreferredSize().x - padding) / 2,
                 (app.getCamera().getHeight() + buildingPropertyContainer.getPreferredSize().y+ padding) / 2,
-                15
+                7
         );
 
         app.getGuiNode().attachChild(buildingPropertyContainer);

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,
-                9
+                8
         );
 
         backgroundContainer.setLocalTranslation(
                 (app.getCamera().getWidth() - buyHouseContainer.getPreferredSize().x - padding) / 2,
                 (app.getCamera().getHeight() + buyHouseContainer.getPreferredSize().y + padding) / 2,
-                8
+                7
         );
 
         app.getGuiNode().attachChild(buyHouseContainer);

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/EventCardPopup.java

@@ -83,14 +83,14 @@ public class EventCardPopup extends Dialog {
         eventCardContainer.setLocalTranslation(
             (app.getCamera().getWidth() - eventCardContainer.getPreferredSize().x) / 2,
             (app.getCamera().getHeight() + eventCardContainer.getPreferredSize().y) / 2,
-            10
+            8
         );
 
         // Zentriere das Popup
         backgroundContainer.setLocalTranslation(
                 (app.getCamera().getWidth() - eventCardContainer.getPreferredSize().x - padding) / 2,
                 (app.getCamera().getHeight() + eventCardContainer.getPreferredSize().y+ padding) / 2,
-                9
+                7
         );
 
         app.getGuiNode().attachChild(eventCardContainer);

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/Gulag.java

@@ -81,14 +81,14 @@ public class Gulag extends Dialog {
         gulagContainer.setLocalTranslation(
             (app.getCamera().getWidth() - gulagContainer.getPreferredSize().x) / 2,
             (app.getCamera().getHeight() + gulagContainer.getPreferredSize().y) / 2,
-            12
+            8
         );
 
         // Zentriere das Popup
         backgroundContainer.setLocalTranslation(
                 (app.getCamera().getWidth() - gulagContainer.getPreferredSize().x - padding) / 2,
                 (app.getCamera().getHeight() + gulagContainer.getPreferredSize().y+ padding) / 2,
-                11
+                7
         );
 
         app.getGuiNode().attachChild(gulagContainer);

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/GulagInfo.java

@@ -95,14 +95,14 @@ public class GulagInfo extends Dialog {
         gulagInfoContainer.setLocalTranslation(
             (app.getCamera().getWidth() - gulagInfoContainer.getPreferredSize().x) / 2,
             (app.getCamera().getHeight() + gulagInfoContainer.getPreferredSize().y) / 2,
-            14
+            8
         );
 
         // Zentriere das Menü
         backgroundContainer.setLocalTranslation(
                 (app.getCamera().getWidth() - gulagInfoContainer.getPreferredSize().x - padding) / 2,
                 (app.getCamera().getHeight() + gulagInfoContainer.getPreferredSize().y+ padding) / 2,
-                13
+                7
         );
 
         if(app.getGameLogic().getPlayerHandler().getPlayerById(app.getId()).getNumJailCard() == 0) {

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/RepayMortage.java

@@ -128,14 +128,14 @@ public class RepayMortage extends Dialog {
         repayMortageContainer.setLocalTranslation(
             (app.getCamera().getWidth() - repayMortageContainer.getPreferredSize().x) / 2,
             (app.getCamera().getHeight() + repayMortageContainer.getPreferredSize().y) / 2,
-            9
+            8
         );
 
         // Zentriere das Popup
         backgroundContainer.setLocalTranslation(
                 (app.getCamera().getWidth() - repayMortageContainer.getPreferredSize().x - padding) / 2,
                 (app.getCamera().getHeight() + repayMortageContainer.getPreferredSize().y+ padding) / 2,
-                8
+                7
         );
 
         app.getGuiNode().attachChild(repayMortageContainer);

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/SellHouse.java

@@ -128,14 +128,14 @@ public class SellHouse extends Dialog {
         sellhouseContainer.setLocalTranslation(
             (app.getCamera().getWidth() - sellhouseContainer.getPreferredSize().x) / 2,
             (app.getCamera().getHeight() + sellhouseContainer.getPreferredSize().y) / 2,
-            9
+            8
         );
 
         // Zentriere das Popup
         backgroundContainer.setLocalTranslation(
                 (app.getCamera().getWidth() - sellhouseContainer.getPreferredSize().x - padding) / 2,
                 (app.getCamera().getHeight() + sellhouseContainer.getPreferredSize().y+ padding) / 2,
-                8
+                7
         );
 
         app.getGuiNode().attachChild(sellhouseContainer);

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/TakeMortage.java

@@ -129,14 +129,14 @@ public class TakeMortage extends Dialog {
         takeMortageContainer.setLocalTranslation(
             (app.getCamera().getWidth() - takeMortageContainer.getPreferredSize().x) / 2,
             (app.getCamera().getHeight() + takeMortageContainer.getPreferredSize().y) / 2,
-            9
+            8
         );
 
         // Zentriere das Popup
         backgroundContainer.setLocalTranslation(
                 (app.getCamera().getWidth() - takeMortageContainer.getPreferredSize().x - padding) / 2,
                 (app.getCamera().getHeight() + takeMortageContainer.getPreferredSize().y+ padding) / 2,
-                8
+                7
         );
 
         app.getGuiNode().attachChild(takeMortageContainer);