Johannes Schmelz
|
7246133363
|
refactor models
|
2024-11-18 17:10:36 +01:00 |
|
Johannes Schmelz
|
e38a7e8cdd
|
Merge branch 'gui' into 'main'
Gui
See merge request progproj/gruppen-ht24/Gruppe-02!10
|
2024-11-18 15:46:18 +00:00 |
|
Johannes Schmelz
|
dbd9dd0001
|
refactor models
|
2024-11-18 16:43:54 +01:00 |
|
Dennis_Malkmus
|
ccb1743a01
|
Einfügen Übergangsmodell (6 gefärbte Spielsteine)
|
2024-11-18 14:57:02 +01:00 |
|
Dennis_Malkmus
|
4ac897693c
|
Merge remote-tracking branch 'origin/gui' into gui
|
2024-11-18 14:56:48 +01:00 |
|
Dennis_Malkmus
|
dfb962e9fe
|
Einfügen Übergangsmodell (6 gefärbte Spielsteine)
|
2024-11-18 14:53:51 +01:00 |
|
Luca Puderbach
|
f97cbd778d
|
Hintergrund + Felder ID hinzugefügt
|
2024-11-18 09:09:05 +01:00 |
|
Luca Puderbach
|
e889a61d43
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-11-18 08:14:10 +01:00 |
|
Luca Puderbach
|
a33d422547
|
Protoyp Würfel eingefügt
|
2024-11-18 08:14:05 +01:00 |
|
Yvonne Schmidt
|
c4b4001b96
|
Merge remote-tracking branch 'origin/gui' into gui
|
2024-11-18 08:07:11 +01:00 |
|
Luca Puderbach
|
20949b641e
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-11-18 08:05:35 +01:00 |
|
Luca Puderbach
|
56e2174b6d
|
Figur ist jetzt flawless übers Spielfeld am flyen
|
2024-11-18 08:02:53 +01:00 |
|
Yvonne Schmidt
|
acfeebca14
|
Startmenü fertig
|
2024-11-18 07:52:47 +01:00 |
|
Yvonne Schmidt
|
cc47acbd3f
|
Merge remote-tracking branch 'origin/gui' into gui
|
2024-11-18 07:27:21 +01:00 |
|
Yvonne Schmidt
|
869e16406d
|
eigenes GUI Styling eingeführt
|
2024-11-18 07:26:31 +01:00 |
|
Luca Puderbach
|
1c99da4fc5
|
Hinzugefügt Kamera und 1. Spielfigut
|
2024-11-18 07:25:15 +01:00 |
|
Yvonne Schmidt
|
b74ca4e702
|
eigenes GUI Styling eingeführt
|
2024-11-18 07:04:44 +01:00 |
|
Luca Puderbach
|
5fde7451c8
|
Verbesserung TestWorld
|
2024-11-18 06:54:38 +01:00 |
|
Luca Puderbach
|
6fd9209336
|
Angleichen MonopolyApp
|
2024-11-18 05:58:18 +01:00 |
|
Luca Puderbach
|
0213dc3560
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-11-18 05:55:15 +01:00 |
|
Luca Puderbach
|
e73c434c1b
|
Angleichen Monopolyapp
|
2024-11-18 05:55:10 +01:00 |
|
Johannes Schmelz
|
b135f3fa50
|
idk
|
2024-11-18 05:51:31 +01:00 |
|
Johannes Schmelz
|
0e580a3180
|
Figure Syncronizer now added
|
2024-11-18 05:38:04 +01:00 |
|
Yvonne Schmidt
|
8e3cb43244
|
eigenes GUI Styling eingeführt
|
2024-11-18 05:32:33 +01:00 |
|
Johannes Schmelz
|
6dcfb92dba
|
resolve merge conflict
|
2024-11-18 05:07:41 +01:00 |
|
Johannes Schmelz
|
a7ea5773da
|
resolve merge conflict
|
2024-11-18 05:05:37 +01:00 |
|
Johannes Schmelz
|
5b66131d30
|
Merge branch 'logic' into 'gui'
Refactor
See merge request progproj/gruppen-ht24/Gruppe-02!9
|
2024-11-18 04:01:41 +00:00 |
|
Johannes Schmelz
|
cac06dda7d
|
Refactor
|
2024-11-18 04:01:41 +00:00 |
|
Johannes Schmelz
|
12c1c97a99
|
Merge branch 'logic' into 'gui'
# Conflicts:
# Projekte/monopoly/model/src/main/java/pp/monopoly/game/client/ClientGameLogic.java
# Projekte/monopoly/model/src/main/java/pp/monopoly/notification/Sound.java
|
2024-11-18 03:50:41 +00:00 |
|
Luca Puderbach
|
af4b4243ea
|
Resolve merge conflicts
|
2024-11-18 04:42:30 +01:00 |
|
Johannes Schmelz
|
5189c74058
|
Merge branch 'gui' into 'main'
Gui
See merge request progproj/gruppen-ht24/Gruppe-02!7
|
2024-11-18 03:14:39 +00: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 |
|
Johannes Schmelz
|
b37a5095f0
|
client recieve message logic
|
2024-11-18 03:20:39 +01:00 |
|
Johannes Schmelz
|
951b4c198c
|
Server bug fix. Add player did not correspond with the params
|
2024-11-18 00:24:15 +01:00 |
|
Yvonne Schmidt
|
8698eed273
|
Tooolbar implementiert
|
2024-11-17 22:33:58 +01:00 |
|
Yvonne Schmidt
|
1af8614b35
|
Tooolbar in Testworld implementiert
|
2024-11-17 22:33:12 +01:00 |
|
Johannes Schmelz
|
11faeeaf45
|
Merge branch 'Testhandbuch' into 'main'
Erste Tests
See merge request progproj/gruppen-ht24/Gruppe-02!5
|
2024-11-17 18:28:55 +00:00 |
|
Johannes Schmelz
|
9d0fcc3370
|
Erste Tests
|
2024-11-17 18:28:55 +00:00 |
|
Johannes Schmelz
|
2f6d6037de
|
Merge branch 'logic' into 'main'
Serverseitige Logik
See merge request progproj/gruppen-ht24/Gruppe-02!6
|
2024-11-17 18:25:32 +00:00 |
|
Johannes Schmelz
|
1d69bcc814
|
refactor and bug fixes
|
2024-11-17 17:43:05 +01:00 |
|
Johannes Schmelz
|
62c363068b
|
fixed bug with client server messages
|
2024-11-16 18:57:52 +01:00 |
|
Johannes Schmelz
|
d2e0b8187b
|
implemented PlayerStates
|
2024-11-16 18:42:05 +01:00 |
|
Johannes Schmelz
|
628b98af9b
|
recive logic for messages
|
2024-11-16 18:03:19 +01:00 |
|
Johannes Schmelz
|
627e3dbd7f
|
added fine to FineField
|
2024-11-16 17:53:07 +01:00 |
|
Yvonne Schmidt
|
61b88f6bf8
|
Merge remote-tracking branch 'origin/gui' into gui
|
2024-11-15 18:39:47 +01:00 |
|
Yvonne Schmidt
|
8ab37e73c1
|
Anpassung des Button designs
|
2024-11-15 18:39:21 +01:00 |
|
Luca Puderbach
|
afdf43ebf1
|
Übergang zu TestMap verbessert
|
2024-11-15 08:36:16 +01:00 |
|
Luca Puderbach
|
2e0d1c059d
|
TestWord eingefügt
|
2024-11-15 07:00:55 +01:00 |
|
Yvonne Schmidt
|
2b772199b0
|
Merge remote-tracking branch 'origin/gui' into gui
# Conflicts:
# Projekte/monopoly/client/src/main/java/pp/monopoly/client/StartMenu.java
|
2024-11-15 06:49:13 +01:00 |
|
Yvonne Schmidt
|
c37b850798
|
Buttons im Startmenü angepasst
|
2024-11-15 06:48:25 +01:00 |
|