960 Commits

Author SHA1 Message Date
Cedric Beck
536c14bf7c working on turbocard 2024-12-09 03:11:43 +01:00
Fleischer Hanno
fb3a663db1 added overwrite of dicemodifier when receiving PlayCard Turbo message 2024-12-09 03:07:12 +01:00
Cedric Beck
b91d448ee6 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 2024-12-09 02:55:57 +01:00
Cedric Beck
935577462b added shieldRing move 2024-12-09 02:55:52 +01:00
Felix Koppe
f79d590620 Merge commit 2024-12-09 02:50:57 +01:00
Felix Koppe
69d160d0fd Java23 2024-12-09 02:50:45 +01:00
Felix Koppe
de592cfa48 Move receive DrawCardMessage to GameState 2024-12-09 02:43:02 +01:00
Fleischer Hanno
8922cb8f1c added removeshield notification 2024-12-09 02:41:44 +01:00
Felix Koppe
f10df60ad3 Merge commit 2024-12-09 02:40:57 +01:00
Felix Koppe
1c87b566e9 Add DrawCardMessage logic 2024-12-09 02:40:45 +01:00
Cedric Beck
6ecf5a66bf added animation end in playCardNotification 2024-12-09 02:30:15 +01:00
Cedric Beck
3f93d6e569 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 2024-12-09 02:18:35 +01:00
Cedric Beck
cc72b82be9 added shield Messages 2024-12-09 02:18:30 +01:00
Fleischer Hanno
41ac04f69d added in can infield move to return false when occupant is shielded 2024-12-09 02:15:45 +01:00
Felix Koppe
cb60cb1c42 Add bonus node logic 2024-12-09 02:19:43 +01:00
Fleischer Hanno
61d67fd833 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 2024-12-09 02:04:11 +01:00
Felix Koppe
4ca7c38170 Minor change in notification processing 2024-12-09 02:09:09 +01:00
Fleischer Hanno
e457fe23d4 added a reset for the dice modifier in the server 2024-12-09 02:03:57 +01:00
Felix Koppe
b86aeb63e6 Merge commit 2024-12-09 01:53:33 +01:00
Felix Koppe
daa8c0bf9d 500IQ 2024-12-09 01:53:18 +01:00
Felix Koppe
6487bafed1 Merge commit 2024-12-09 01:47:47 +01:00
Felix Koppe
8af3b2d9d4 Fix uuid serialisation error 2024-12-09 01:47:32 +01:00
Cedric Beck
d38690ea48 merge 2024-12-09 01:43:25 +01:00
Cedric Beck
daa7d31bdd working on shield 2024-12-09 01:42:59 +01:00
Fleischer Hanno
5e79a4a64c added remove handcard 2024-12-09 01:35:37 +01:00
Felix Koppe
8e2fc6c1a1 Merge commit 2024-12-09 01:18:47 +01:00
Felix Koppe
5a12d8e96f Fix dice more than once error 2024-12-09 01:18:29 +01:00
Fleischer Hanno
3af6e94920 added DrawCardMessageSupport 2024-12-09 01:16:31 +01:00
Cedric Beck
4efc557849 added node hover/select with piece 2024-12-09 01:06:12 +01:00
Felix Koppe
1646526ce1 Try fix error 2024-12-09 00:36:38 +01:00
Cedric Beck
904aa17358 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 2024-12-08 23:23:27 +01:00
Felix Koppe
f4e774ee5b Minor change 2024-12-08 23:28:26 +01:00
Cedric Beck
76b3e18dbe added jet_noGear 2024-12-08 23:23:21 +01:00
Cedric Beck
d4cbd0dda6 added swapnotification 2024-12-08 23:08:59 +01:00
Felix Koppe
7a189a98e3 Merge commit 2024-12-08 23:05:44 +01:00
Felix Koppe
00902d2e6b Add move throw sync 2024-12-08 23:05:30 +01:00
Fleischer Hanno
7256cde020 changed the ionput list for selectableMoveNotification 2024-12-08 22:52:42 +01:00
Cedric Beck
b817af29b5 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 2024-12-08 22:28:57 +01:00
Cedric Beck
fa18ae4280 added swap functionality in model for server & client 2024-12-08 22:28:51 +01:00
Felix Koppe
521c7439c2 Add error in animation logixc 2024-12-08 22:04:16 +01:00
Fleischer Hanno
84c5553154 fixed former bug 2024-12-08 21:47:28 +01:00
Fleischer Hanno
2c94737023 fixed bug when moving pieces from waiting to infield for non active players 2024-12-08 21:37:22 +01:00
Fleischer Hanno
d3d75d7f49 added missing error messages 2024-12-08 21:23:16 +01:00
Fleischer Hanno
5e67b2d0c7 fixed a bug where the home index of piece was wrong 2024-12-08 21:18:34 +01:00
Fleischer Hanno
992efd403d fixed waiting piece move bug 2024-12-08 21:14:20 +01:00
Cedric Beck
2d7fddf09a fixed swap select 2024-12-08 21:13:44 +01:00
Felix Koppe
f7c886f084 333IQ 2024-12-08 21:12:09 +01:00
Fleischer Hanno
a1d85177c6 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 2024-12-08 20:46:58 +01:00
Fleischer Hanno
e27d325faa added serializable tag to choosepiecestatemessage 2024-12-08 20:45:53 +01:00
Cedric Beck
bd98f301c8 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 2024-12-08 20:44:28 +01:00