merge dev/client into dev/client_beck

Browse Source

...

This commit is contained in:

Cedric Beck

2024-11-22 20:38:00 +01:00

parent ebdedc6494 c470c205e4

commit 7368014b10

45 changed files with 1959 additions and 284 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/audio_icon.png Normal file

Binary file not shown.

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

BIN

Projekte/mdga/client/src/main/resources/audio_icon.png~ Normal file

Binary file not shown.

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

BIN

Projekte/mdga/client/src/main/resources/b1.png Normal file

Binary file not shown.

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

BIN

Projekte/mdga/client/src/main/resources/b2.png Normal file

Binary file not shown.

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

BIN

Projekte/mdga/client/src/main/resources/background/lautsprecher.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.9 MiB

BIN

Projekte/mdga/client/src/main/resources/background/monitors.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 MiB

BIN

Projekte/mdga/client/src/main/resources/background/zahnräder.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 MiB

BIN

Projekte/mdga/client/src/main/resources/lobby.png Normal file

Binary file not shown.

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

BIN

Projekte/mdga/client/src/main/resources/mdga_logo.png Normal file

Binary file not shown.

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

BIN

Projekte/mdga/client/src/main/resources/monitor.png Normal file

Binary file not shown.

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

BIN

Projekte/mdga/client/src/main/resources/monitor.png~ Normal file

Binary file not shown.

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

BIN

Projekte/mdga/client/src/main/resources/powercards.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.4 MiB

BIN

Projekte/mdga/client/src/main/resources/zahnrad.png Normal file

Binary file not shown.

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

BIN

Projekte/mdga/client/src/main/resources/zahnrad.png~ Normal file

Binary file not shown.

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