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

..

src/main

Merge branch 'dev/client_beck' into development

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

build.gradle

tried fixing outline problem

2024-11-22 13:56:43 +01:00

hs_err_pid24033.log

Add videoSettings

2024-12-02 01:40:45 +01:00

Screenshot 2024-11-12 184708.png

added screenshot and resources

2024-11-13 14:55:05 +01:00