Felix Koppe
|
06b37584cb
|
Merge dev/client_beck into development
|
2024-12-07 15:05:03 +01:00 |
|
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 |
|
Felix Koppe
|
d75d704878
|
Add smoke effekt to missileAnimation
|
2024-12-07 14:55:08 +01:00 |
|
Cedric Beck
|
6d3c733f91
|
added effect for shell flying
|
2024-12-07 14:45:39 +01:00 |
|
Felix Koppe
|
f96da2c46c
|
Add notification delay
|
2024-12-07 14:37:19 +01:00 |
|
Cedric Beck
|
1a079dad44
|
added shell asset for ShellAnimation
|
2024-12-07 14:22:36 +01:00 |
|
Cedric Beck
|
32f49a6181
|
added shellAnimation without shell asset
|
2024-12-07 13:30:30 +01:00 |
|
Felix Koppe
|
525809899e
|
Minor improvements
|
2024-12-07 11:03:30 +01:00 |
|
Felix Koppe
|
fd9708752c
|
Merge dev/model into development
|
2024-12-06 18:49:15 +01:00 |
|
Felix Koppe
|
236d3db930
|
Add ambience
|
2024-12-06 18:10:09 +01:00 |
|
Cedric Beck
|
29c6b13300
|
added MatrixAnimation
|
2024-12-06 17:09:06 +01:00 |
|
Felix Koppe
|
6059e93276
|
Fix interruptDialog
|
2024-12-06 16:52:08 +01:00 |
|
Felix Koppe
|
f2eeb6dab4
|
Fix logic error regarding cardSelection
|
2024-12-06 16:27:01 +01:00 |
|
Cedric Beck
|
2ac2de645b
|
working on matrix-animation
|
2024-12-06 14:56:04 +01:00 |
|
Felix Koppe
|
d39f85fbe9
|
Add some javaDoc to client
|
2024-12-06 14:26:13 +01:00 |
|
Felix Koppe
|
960a57caba
|
Fix broken lose sound
|
2024-12-06 13:28:38 +01:00 |
|
Felix Koppe
|
36631df2e9
|
Fix broken jet-sound
|
2024-12-06 13:26:28 +01:00 |
|
Felix Koppe
|
df27c23cd5
|
Fix shadercode
|
2024-12-06 13:19:17 +01:00 |
|
Felix Koppe
|
acd64d1507
|
Fix shadercode
|
2024-12-06 13:14:54 +01:00 |
|
Felix Koppe
|
76f86c8a66
|
Improve audioSettings
|
2024-12-06 11:35:05 +01:00 |
|