Hanno Fleischer
|
16e7488fae
|
Merge branch 'dev/server_h' into 'development'
added more communication fixes, states now use correct messages
See merge request progproj/gruppen-ht24/Gruppe-01!38
|
2024-12-08 09:13:47 +00:00 |
|
Hanno Fleischer
|
c9c99709ba
|
added more communication fixes, states now use correct messages
|
2024-12-08 09:52:23 +01:00 |
|
Felix Koppe
|
e069017375
|
Merge remote-tracking branch 'origin/dev/server_h' into development
|
2024-12-08 09:44:23 +01:00 |
|
Hanno Fleischer
|
8b27ccce22
|
adjusted stattransition methods to work correctly
|
2024-12-08 03:08:47 +01:00 |
|
Hanno Fleischer
|
8c22d935a9
|
implemented rest of the server logic in choosepiece substates, and began to fix bugs after testing
|
2024-12-08 01:59:29 +01:00 |
|
Cedric Beck
|
c8d7d91de0
|
added import in NotiSync
|
2024-12-07 21:57:41 +01:00 |
|
Cedric Beck
|
389d1b6056
|
merge development into dev/client_beck
|
2024-12-07 17:04:43 +01:00 |
|
Cedric Beck
|
4430b37581
|
fixed wrong dice rotation because of fps drop
|
2024-12-07 17:00:42 +01:00 |
|
Cedric Beck
|
e5abcbdc8c
|
added jet_noGear.j3o
|
2024-12-07 16:51:38 +01:00 |
|
Cedric Beck
|
e14b8cb510
|
added converted assets
|
2024-12-07 16:50:43 +01:00 |
|
Felix Koppe
|
bf84bfa0f9
|
Update animations and remove test setup
|
2024-12-07 16:40:45 +01:00 |
|
Hanno Fleischer
|
0c49d7ed1c
|
Merge branch 'dev/server_h' of https://athene1.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into dev/server_h
|
2024-12-07 15:37:02 +01:00 |
|
Hanno Fleischer
|
2ba6a22422
|
Merge branch 'development' into 'dev/server_h'
Development
See merge request progproj/gruppen-ht24/Gruppe-01!37
|
2024-12-07 14:36:25 +00:00 |
|
Hanno Fleischer
|
c37bac4614
|
replaced DicaAgain message with DicveNow
|
2024-12-07 15:34:34 +01:00 |
|
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 |
|
Hanno Fleischer
|
5a9f7a8118
|
added AnimationEndMessages to 'RollDiceState', 'MovePieceState' and 'PlayPowerCardState'
|
2024-12-06 18:45:14 +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 |
|
Hanno Fleischer
|
2e1fe3c050
|
fixed a missing method call ind TurnState and removed debug sout statements ind 'RollDiceMessage'
|
2024-12-06 15:19:04 +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 |
|
Hanno Fleischer
|
308b592b65
|
Merge branch 'development' into 'dev/model'
Development merge
See merge request progproj/gruppen-ht24/Gruppe-01!36
|
2024-12-06 09:55:19 +00:00 |
|
Felix Koppe
|
c4e7fb1d41
|
Fix logic in modelSyncronizer
|
2024-12-06 10:54:02 +01:00 |
|
Felix Koppe
|
aacc0440b3
|
Update .gitignore
|
2024-12-06 10:33:13 +01:00 |
|
Hanno Fleischer
|
43c0e3bcc7
|
Merge branch 'development' into 'dev/model'
Development
See merge request progproj/gruppen-ht24/Gruppe-01!35
|
2024-12-06 09:09:29 +00:00 |
|
Felix Koppe
|
95635f5fb7
|
Fix ownColor in gameView
|
2024-12-06 09:59:28 +01:00 |
|
Felix Koppe
|
e337b1f888
|
Fix card select issue
|
2024-12-06 09:57:28 +01:00 |
|
Felix Koppe
|
0237bcc4be
|
Fix card select issue
|
2024-12-06 09:51:17 +01:00 |
|
Felix Koppe
|
26836d16cc
|
Fix card select issue
|
2024-12-06 09:48:24 +01:00 |
|
Felix Koppe
|
a6c8cc33f4
|
Make cardSelect trigger needCconfirm
|
2024-12-06 09:31:02 +01:00 |
|
Felix Koppe
|
7f5f4b8c68
|
Fix broken sound
|
2024-12-06 09:24:49 +01:00 |
|
Felix Koppe
|
7f3483aa6b
|
Add broken sound
|
2024-12-06 09:22:10 +01:00 |
|
Felix Koppe
|
8422b7be1e
|
Merge branch 'development' into dev/client_koppe2
|
2024-12-06 09:11:09 +01:00 |
|
Felix Koppe
|
f0b23ab9c2
|
Readd broken files
|
2024-12-06 09:10:47 +01:00 |
|
Felix Koppe
|
78f1dbb3d3
|
Remove broken files
|
2024-12-06 09:08:52 +01:00 |
|