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

Merge branch 'main' into 'gui'

Browse Source 
# Conflicts:
#   Projekte/battleship/client/src/main/java/pp/battleship/client/Menu.java
#   Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy
#   Projekte/monopoly/model/src/main/java/pp/monopoly/game/server/Player.java
This commit is contained in:
Johannes Schmelz
2024-11-25 05:33:21 +00:00
parent 16b4dbae18 f67ce6be44
commit 0c2b266f5e
7 changed files with 1133 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ import com.jme3.input.controls.KeyTrigger;
import com.jme3.input.controls.MouseButtonTrigger;
import com.jme3.system.AppSettings;
import com.simsilica.lemur.GuiGlobals;
import com.simsilica.lemur.Label;
import com.simsilica.lemur.style.BaseStyles;
import pp.monopoly.game.client.MonopolyClient;
import pp.monopoly.client.gui.SettingsMenu;