Hanno Fleischer hanno.fleischer@unibw.de
|
997b31eba2
|
reverted turbo card percentages to normal
|
2024-12-10 15:56:16 +01:00 |
|
Felix Koppe
|
148b769232
|
Add missing sound
|
2024-12-10 15:43:35 +01:00 |
|
Hanno Fleischer
|
f0f4e0eb5e
|
added presentation die results and powercards as well as fixed a bug where when a piece was thrown with a suppressed shield it wouldnt be cleared
|
2024-12-10 15:06:35 +01:00 |
|
Cedric Beck
|
bda1a40cdb
|
Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
|
2024-12-10 14:53:26 +01:00 |
|
Cedric Beck
|
0c8cb92fe8
|
fix anims
|
2024-12-10 14:53:16 +01:00 |
|
Fleischer Hanno
|
e952233d20
|
added a hashset to fix double checking of powercards in the visitor
|
2024-12-10 14:36:26 +01:00 |
|
Cedric Beck
|
9f8fd9c22f
|
changed var name
|
2024-12-10 14:34:44 +01:00 |
|
Cedric Beck
|
0432dd6bd7
|
merge
|
2024-12-10 14:29:02 +01:00 |
|
Cedric Beck
|
4d31fc098b
|
fixed swap bug
|
2024-12-10 14:27:50 +01:00 |
|
Benjamin Feyer
|
40a61daa58
|
added flag
|
2024-12-10 14:07:52 +01:00 |
|
Benjamin Feyer
|
6e54ad0196
|
Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
|
2024-12-10 14:06:25 +01:00 |
|
Benjamin Feyer
|
11fa303f1b
|
added flag
|
2024-12-10 14:05:43 +01:00 |
|
Fleischer Hanno
|
d65111680b
|
added RankingResponseNotification to be sent to the client
|
2024-12-10 13:55:58 +01:00 |
|
Felix Koppe
|
485b8f36d7
|
Merge commit7
|
2024-12-10 13:57:08 +01:00 |
|
Felix Koppe
|
4eee62079e
|
Add RankingResponceNotification
|
2024-12-10 13:56:42 +01:00 |
|
Cedric Beck
|
888b52f314
|
moved timermanger to app
|
2024-12-10 13:38:26 +01:00 |
|
Cedric Beck
|
bc2c80dd27
|
added asfjiop
|
2024-12-10 13:28:40 +01:00 |
|
Cedric Beck
|
50f0cdfce6
|
added timermanager
|
2024-12-10 13:26:56 +01:00 |
|
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 |
|