Cedric Beck
|
0c7030659a
|
removed fadeControl
|
2024-12-10 13:00:03 +01:00 |
|
Benjamin Feyer
|
30997eb571
|
Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
|
2024-12-10 12:47:22 +01:00 |
|
Benjamin Feyer
|
ea1978d5a8
|
edited flag=false in enter in rolldice
|
2024-12-10 12:46:56 +01:00 |
|
Cedric Beck
|
1ead0e2e9e
|
fixed uuid reference bug
|
2024-12-10 12:46:04 +01:00 |
|
Benjamin Feyer
|
70c821f2ac
|
added logger and simpliefied logic
|
2024-12-10 12:06:21 +01:00 |
|
Cedric Beck
|
8867e8156f
|
merge
|
2024-12-10 11:55:17 +01:00 |
|
Cedric Beck
|
36c2f2efec
|
commit
|
2024-12-10 11:54:45 +01:00 |
|
Benjamin Feyer
|
b8d992590f
|
added logger for swap-card
|
2024-12-10 11:52:52 +01:00 |
|
Benjamin Feyer
|
a86a146091
|
added logger for swap-card
|
2024-12-10 11:52:05 +01:00 |
|
Benjamin Feyer
|
3e060897fc
|
added the flag in the client roldice-states, so you can't roll twice
|
2024-12-10 11:18:10 +01:00 |
|
Benjamin Feyer
|
fe95a7c159
|
added the piecetest and implemented more logic in the moveLogic
|
2024-12-10 10:47:06 +01:00 |
|
Benjamin Feyer
|
d60c0347cc
|
Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
|
2024-12-10 08:13:33 +01:00 |
|
Benjamin Feyer
|
bbde17aa27
|
initial test commit for clientStateTest and ServerStatetest
|
2024-12-10 08:13:11 +01:00 |
|
Benjamin Feyer
|
38c865d135
|
reformatted code
|
2024-12-10 02:23:19 +01:00 |
|
Benjamin Feyer
|
91d4718179
|
fixed the move-logic
|
2024-12-10 02:19:48 +01:00 |
|
Benjamin Feyer
|
bb1bf22713
|
Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
|
2024-12-09 22:22:49 +01:00 |
|
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 |
|