Johannes Schmelz
|
10e30d9bd9
|
Merge branch 'main' into 'gui'
# Conflicts:
# Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/EventCardPopup.java
|
2024-12-12 16:50:21 +00:00 |
|
Yvonne Schmidt
|
274ed2b25d
|
added new background
|
2024-12-10 07:17:18 +01:00 |
|
Johannes Schmelz
|
fa96324c15
|
mode models
|
2024-12-10 03:55:33 +01:00 |
|
Luca Puderbach
|
7b82b20736
|
HoHoHo
|
2024-12-09 20:22:17 +01:00 |
|
Johannes Schmelz
|
249110f83c
|
Merge remote-tracking branch 'origin/gui'
|
2024-12-09 14:13:44 +01:00 |
|
Yvonne Schmidt
|
111f2b1283
|
rescaled dice
|
2024-12-09 05:52:52 +01:00 |
|
Luca Puderbach
|
815899fa8d
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-12-09 01:47:35 +01:00 |
|
Luca Puderbach
|
793e93ef24
|
Map Update
|
2024-12-09 01:47:29 +01:00 |
|
Yvonne Schmidt
|
0f1be83064
|
added generic buttons
|
2024-12-08 21:35:50 +01:00 |
|
Yvonne Schmidt
|
844495ebbb
|
modified toolbar
|
2024-12-08 18:40:28 +01:00 |
|
Luca Puderbach
|
93ef00870b
|
update toolbar + background
|
2024-12-08 04:57:04 +01:00 |
|
Johannes Schmelz
|
69fccefed9
|
file path updated
|
2024-12-08 02:23:21 +01:00 |
|
Johannes Schmelz
|
14aecdd929
|
changed images
|
2024-12-08 02:21:54 +01:00 |
|
Johannes Schmelz
|
e102d22f14
|
refactor Worlds and client States
|
2024-12-08 01:18:35 +00:00 |
|
Luca Puderbach
|
14c68f55d9
|
ltl backgrounds
|
2024-12-08 01:16:26 +01:00 |
|
Yvonne Schmidt
|
38824895bb
|
set new toolbar background
|
2024-12-05 02:05:47 +01:00 |
|
Luca Puderbach
|
f2678ea33d
|
doppelwürfel
|
2024-11-27 17:34:41 +01:00 |
|
Johannes Schmelz
|
d10111d2ab
|
Gui v1.0
|
2024-11-25 05:33:36 +00:00 |
|
Yvonne Schmidt
|
acfeebca14
|
Startmenü fertig
|
2024-11-18 07:52:47 +01:00 |
|
Johannes Schmelz
|
fffd32e13c
|
Merge branch 'main' into 'gui'
# Conflicts:
# Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy
# Projekte/monopoly/client/src/main/java/pp/monopoly/client/GameSound.java
# Projekte/monopoly/client/src/main/java/pp/monopoly/client/MonopolyApp.java
# Projekte/monopoly/client/src/main/java/pp/monopoly/client/StartMenu.java
# Projekte/monopoly/model/src/main/java/pp/monopoly/game/client/ClientGameLogic.java
# Projekte/monopoly/model/src/main/java/pp/monopoly/game/server/ServerGameLogic.java
# Projekte/monopoly/model/src/main/resources/monopoly.properties
|
2024-11-18 03:14:07 +00:00 |
|
Yvonne Schmidt
|
1af8614b35
|
Tooolbar in Testworld implementiert
|
2024-11-17 22:33:12 +01:00 |
|
Yvonne Schmidt
|
8ab37e73c1
|
Anpassung des Button designs
|
2024-11-15 18:39:21 +01:00 |
|
Luca Puderbach
|
15b3902bd3
|
SettingsMenü Anpassungen
|
2024-11-15 02:31:12 +01:00 |
|
Luca Puderbach
|
12ef219064
|
Änderungs des StartBildschirms
|
2024-11-15 01:25:09 +01:00 |
|
Yvonne Schmidt
|
caa45097c3
|
klassen angepasst
|
2024-11-14 21:31:47 +01:00 |
|
Johannes Schmelz
|
7ee2273761
|
First compileable version of Client
|
2024-11-13 12:42:37 +00:00 |
|
Yvonne Schmidt
|
17533112a1
|
Startmenü implementiert und Spielmenü Stummel erstellt
|
2024-11-12 23:30:44 +01:00 |
|