Felix Koppe 0c42a2df88 Merge branch 'dev/client_beck' into development ...

# 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

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

..

Fonts

added board dice; edited DiceControl; added high-res font; working on ActionTextHandler

2024-11-28 20:07:15 +01:00

Images

Merge branch 'dev/client_beck' into development

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

Maps

added shellAnimation without shell asset

2024-12-07 13:30:30 +01:00

MatDefs/SelectObjectOutliner

Fix shadercode

2024-12-06 13:19:17 +01:00

Models

Merge branch 'dev/client_beck' into development

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

Music

Add ambience

2024-12-06 18:10:09 +01:00

Sounds

Merge branch 'dev/client_beck' into development

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