Merge branch 'dev/client_beck' into development

Browse Source

# Conflicts:
#	Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java
#	Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java
#	Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/AcousticHandler.java
#	Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/MdgaSound.java
#	Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/SoundAsset.java
#	Projekte/mdga/client/src/main/java/pp/mdga/client/animation/JetAnimation.java
#	Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java
#	Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/GameStates.java

...

This commit is contained in:

Felix Koppe

2024-12-07 15:00:27 +01:00

parent d75d704878 6d3c733f91

commit 0c42a2df88

36 changed files with 880030 additions and 66 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/particle/flame.png Normal file

Binary file not shown.

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

BIN

Projekte/mdga/client/src/main/resources/Images/particle/line.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 140 B

BIN

Projekte/mdga/client/src/main/resources/Images/particle/radar_beam.png Normal file

Binary file not shown.

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

BIN

Projekte/mdga/client/src/main/resources/Images/particle/vapor_cloud.png Normal file

Binary file not shown.

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