peet/Gruppe-02-clone
1
0
Fork 0
mirror of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git synced 2025-01-18 18:23:44 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into 'gui'

Browse Source 
# Conflicts:
#   Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/EventCardPopup.java
This commit is contained in:
Johannes Schmelz 2024-12-12 16:50:21 +00:00
commit 10e30d9bd9
2 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/LobbyMenu.java
View File

@ -318,6 +318,7 @@ public class LobbyMenu extends Dialog {
figure = selector.getSelectedItem(); figure = selector.getSelectedItem();
break; break;
} }
System.out.println("FIGUR:::::"+figure);
} }
/** /**

BIN
Projekte/monopoly/client/src/main/resources/Pictures/dice/5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 132 KiB

After

Width:  |  Height:  |  Size: 105 KiB