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-04 01:50:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into 'Testhandbuch'

Browse Source 
# Conflicts:
#   Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy
#   Projekte/monopoly/client/src/main/java/pp/monopoly/client/MonopolyApp.java
#   Projekte/monopoly/model/src/test/java/pp/monopoly/client/ClientLogicTest.java
#   Projekte/monopoly/model/src/test/java/pp/monopoly/game/client/ClientGameLogicTest.java
This commit is contained in:
Johannes Schmelz
2024-11-25 04:32:59 +00:00
parent f1d52c445b b85bbdd0ad
commit 6e5d9452b3
21 changed files with 704 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy
View File

@@ -20,8 +20,6 @@ def sliderBgColor = color(0.5, 0.75, 0.75, 1)
def gradientColor = color(0.5, 0.75, 0.85, 0.5)
def tabbuttonEnabledColor = color(0.4, 0.45, 0.5, 1)
def solidWhiteBackground = new QuadBackgroundComponent(color(1, 1, 1, 1)) // Solid white
def greyBackground = color(0.8, 0.8, 0.8, 1) // Grey background color
def redBorderColor = color(1, 0, 0, 1) // Red border color