Benjamin Feyer
|
380341114c
|
minor changes
|
2024-12-09 22:21:52 +01:00 |
|
Cedric Beck
|
f56eb8cd60
|
Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
|
2024-12-09 22:03:39 +01:00 |
|
Cedric Beck
|
3797da1246
|
fixed crash get bonus
|
2024-12-09 22:03:34 +01:00 |
|
Benjamin Feyer
|
e79a1168c0
|
corrected movelogic
|
2024-12-09 21:02:46 +01:00 |
|
Fleischer Hanno
|
6ab8f2d90d
|
fixed missing check on shield state after swap
|
2024-12-09 19:55:03 +01:00 |
|
Fleischer Hanno
|
ece249cf66
|
fixed bug in no turn state with double next color itteration
|
2024-12-09 19:50:22 +01:00 |
|
Fleischer Hanno
|
e95f0866d5
|
fixed shield state for waiting state
|
2024-12-09 19:43:50 +01:00 |
|
Fleischer Hanno
|
0fce2fb5d2
|
added the possiblity when the drawpile has only 1 card the discard pile will be shuffeled and then put into the draw pile.
|
2024-12-09 19:11:45 +01:00 |
|
Fleischer Hanno
|
0010717411
|
when triggering BonusNode it will now be addded to the hand
|
2024-12-09 19:05:28 +01:00 |
|
Felix Koppe
|
cf9acf981f
|
Merge commit
|
2024-12-09 19:06:08 +01:00 |
|
Felix Koppe
|
e2a4f7f85c
|
Fix serialize error
|
2024-12-09 19:05:59 +01:00 |
|
Felix Koppe
|
1ffabe6b19
|
Merge commit
|
2024-12-09 19:05:02 +01:00 |
|
Felix Koppe
|
0ba5a2f9fd
|
Add serialization of SpectatorMessage
|
2024-12-09 19:04:47 +01:00 |
|
Cedric Beck
|
d0afaa57f5
|
Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
|
2024-12-09 18:59:56 +01:00 |
|
Cedric Beck
|
00a79ddce3
|
Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
|
2024-12-09 18:59:42 +01:00 |
|
Cedric Beck
|
bce6a1e0eb
|
added cardlayerhandler back and fixed clear selectable
|
2024-12-09 18:59:38 +01:00 |
|
Benjamin Feyer
|
37dcc0122c
|
Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
|
2024-12-09 18:51:04 +01:00 |
|
Benjamin Feyer
|
4007036cb2
|
bug fixes
|
2024-12-09 18:50:54 +01:00 |
|
Hanno Fleischer
|
5b958740c4
|
Merge remote-tracking branch 'origin/development2' into development2
|
2024-12-09 18:45:58 +01:00 |
|
Hanno Fleischer
|
06cb25b6a9
|
fixed card selection, to use an already selected and discarded card
|
2024-12-09 18:45:23 +01:00 |
|
Cedric Beck
|
afec74416f
|
fixed ChoosePowerCardState
|
2024-12-09 18:45:00 +01:00 |
|
Hanno Fleischer
|
ceb9e48f55
|
updated Error messages
|
2024-12-09 18:36:42 +01:00 |
|
Cedric Beck
|
f8179f191f
|
Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
|
2024-12-09 18:12:08 +01:00 |
|
Cedric Beck
|
ec77b9a6ef
|
added more start cards for testing
|
2024-12-09 18:11:45 +01:00 |
|
Fleischer Hanno
|
2d01e4b31b
|
Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
|
2024-12-09 18:11:44 +01:00 |
|
Fleischer Hanno
|
0be25ecb29
|
made Intro state work with more PowerCards on the hand
|
2024-12-09 18:11:21 +01:00 |
|
Benjamin Feyer
|
1210324194
|
Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
|
2024-12-09 18:05:40 +01:00 |
|
Benjamin Feyer
|
569ce39d2a
|
bug Fixed
|
2024-12-09 18:04:24 +01:00 |
|
Cedric Beck
|
80989310e5
|
Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
|
2024-12-09 17:52:53 +01:00 |
|
Cedric Beck
|
a2f57bcaae
|
deleted node unselect in BoardHandler clearSelectable
|
2024-12-09 17:52:48 +01:00 |
|
Lukas Bauer
|
68702f11a4
|
Deleted the 'MdgaApp.run.xml.
|
2024-12-09 17:51:40 +01:00 |
|
Felix Koppe
|
13948ec4bb
|
Fix error
|
2024-12-09 17:47:03 +01:00 |
|
Cedric Beck
|
570c915964
|
Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
|
2024-12-09 17:21:51 +01:00 |
|
Cedric Beck
|
ac719c55e6
|
revert commit
|
2024-12-09 17:20:34 +01:00 |
|
Hanno Fleischer
|
189e8a7ec3
|
fixed client shield state animation
|
2024-12-09 17:11:30 +01:00 |
|
Felix Koppe
|
5d2ece41b7
|
Merge commit
|
2024-12-09 17:05:55 +01:00 |
|
Felix Koppe
|
7f92d8183b
|
Adjust delays
|
2024-12-09 17:05:42 +01:00 |
|
Cedric Beck
|
6bc769f5bb
|
merge
|
2024-12-09 17:04:45 +01:00 |
|
Cedric Beck
|
a21794ddc1
|
added new card order in CardLayerHandler
|
2024-12-09 17:03:35 +01:00 |
|
Felix Koppe
|
e699f4556e
|
Fix error
|
2024-12-09 16:58:05 +01:00 |
|
Fleischer Hanno
|
a56f68efdc
|
fixed Turbo card with zero modifier
|
2024-12-09 16:54:26 +01:00 |
|
Felix Koppe
|
55328e9e69
|
Fixe dice
|
2024-12-09 16:43:21 +01:00 |
|
Felix Koppe
|
50dc634a94
|
Add powercard drawing
|
2024-12-09 16:37:08 +01:00 |
|
Felix Koppe
|
d37b9ee269
|
Add powercard drawing
|
2024-12-09 16:36:07 +01:00 |
|
Benjamin Feyer
|
3937b75bf7
|
Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
|
2024-12-09 16:11:32 +01:00 |
|
Benjamin Feyer
|
7d5b8a6b13
|
404 IQ-Move added move logic
|
2024-12-09 16:10:56 +01:00 |
|
Felix Koppe
|
39d5b43cb8
|
Quality of live improvement
|
2024-12-09 16:10:15 +01:00 |
|
Felix Koppe
|
de0f04b5b7
|
Quality of live improvement
|
2024-12-09 16:07:26 +01:00 |
|
Felix Koppe
|
6a4bdfa455
|
Fix swap card issue
|
2024-12-09 14:50:29 +01:00 |
|
Felix Koppe
|
db16b0d8b6
|
Fix shield card issue
|
2024-12-09 14:45:41 +01:00 |
|