Cedric Beck
|
f7a34d0d59
|
tried merge with dev/client
|
2024-11-30 12:34:39 +01:00 |
|
Cedric Beck
|
13690cf73d
|
added skybox; reworked guiHandler
|
2024-11-29 21:28:50 +01:00 |
|
Felix Koppe
|
24cc81d9d4
|
Merge remote-tracking branch 'origin/dev/client_beck' into dev/client_koppe2
# Conflicts:
# Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java
# Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java
# Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java
|
2024-11-29 10:13:15 +01:00 |
|
Felix Koppe
|
7b689d6bf6
|
Work on ceremony
|
2024-11-28 21:39:08 +01:00 |
|
Cedric Beck
|
3dcdbdf489
|
added display of 'colorÃ' to playerName
|
2024-11-28 17:29:59 +01:00 |
|
Felix Koppe
|
3235a46788
|
Rewrite gui
|
2024-11-28 15:00:53 +01:00 |
|
Cedric Beck
|
10428deedd
|
added resource restructuring
|
2024-11-24 19:54:29 +01:00 |
|