Merge remote-tracking branch 'origin/dev/client_beck' into dev/client_koppe2

Browse Source

# 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

...

This commit is contained in:

Felix Koppe

2024-11-29 10:13:15 +01:00

parent c25c12d0d6 2099e02567

commit 24cc81d9d4

37 changed files with 36189 additions and 522 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

Projekte/mdga/client/src/main/resources/Images/name_pictures/CIR_IMAGE.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 894 KiB

BIN

Projekte/mdga/client/src/main/resources/Images/name_pictures/HEER_IMAGE.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 866 KiB

BIN

Projekte/mdga/client/src/main/resources/Images/name_pictures/LW_IMAGE.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 857 KiB

BIN

Projekte/mdga/client/src/main/resources/Images/name_pictures/MARINE_IMAGE.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 842 KiB