Commit Graph

Select branches

Hide Pull Requests

b_Bauer_Lukas

b_Beck_Cedric

b_Brennfoerder_Timo

b_Feyer_Benjamin

b_Fleischer_Hanno

b_Grigencha_Daniel

b_koppe_felix

dev/client

dev/client_beck

dev/client_koppe

dev/client_koppe2

dev/model

dev/server_h

dev/test

dev_client

development

development2

main

view_assets

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#5

#6

#7

#8

#9

Version1.0

Version1.1

Version1.1.1

Mono Color

• 6e54ad0196 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Benjamin Feyer 2024-12-10 14:06:25 +01:00
• 11fa303f1b added flag Benjamin Feyer 2024-12-10 14:05:43 +01:00
• d65111680b added RankingResponseNotification to be sent to the client Fleischer Hanno 2024-12-10 13:55:58 +01:00
• 485b8f36d7 Merge commit7 Felix Koppe 2024-12-10 13:57:08 +01:00
• 4eee62079e Add RankingResponceNotification Felix Koppe 2024-12-10 13:56:42 +01:00
• 888b52f314 moved timermanger to app Cedric Beck 2024-12-10 13:38:26 +01:00
• bc2c80dd27 added asfjiop Cedric Beck 2024-12-10 13:28:40 +01:00
• 50f0cdfce6 added timermanager Cedric Beck 2024-12-10 13:26:56 +01:00
• 0c7030659a removed fadeControl Cedric Beck 2024-12-10 13:00:03 +01:00
• 30997eb571 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Benjamin Feyer 2024-12-10 12:47:22 +01:00
• ea1978d5a8 edited flag=false in enter in rolldice Benjamin Feyer 2024-12-10 12:46:56 +01:00
• 1ead0e2e9e fixed uuid reference bug Cedric Beck 2024-12-10 12:46:04 +01:00
• 70c821f2ac added logger and simpliefied logic Benjamin Feyer 2024-12-10 12:06:21 +01:00
• 8867e8156f merge Cedric Beck 2024-12-10 11:55:17 +01:00
• 36c2f2efec commit Cedric Beck 2024-12-10 11:54:45 +01:00
• b8d992590f added logger for swap-card Benjamin Feyer 2024-12-10 11:52:52 +01:00
• a86a146091 added logger for swap-card Benjamin Feyer 2024-12-10 11:52:05 +01:00
• 3e060897fc added the flag in the client roldice-states, so you can't roll twice Benjamin Feyer 2024-12-10 11:18:10 +01:00
• fe95a7c159 added the piecetest and implemented more logic in the moveLogic Benjamin Feyer 2024-12-10 10:47:06 +01:00
• d60c0347cc Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Benjamin Feyer 2024-12-10 08:13:33 +01:00
• bbde17aa27 initial test commit for clientStateTest and ServerStatetest Benjamin Feyer 2024-12-10 08:13:11 +01:00
• 38c865d135 reformatted code Benjamin Feyer 2024-12-10 02:23:19 +01:00
• 91d4718179 fixed the move-logic Benjamin Feyer 2024-12-10 02:19:48 +01:00
• bb1bf22713 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Benjamin Feyer 2024-12-09 22:22:49 +01:00
• 380341114c minor changes Benjamin Feyer 2024-12-09 22:21:52 +01:00
• f56eb8cd60 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Cedric Beck 2024-12-09 22:03:39 +01:00
• 3797da1246 fixed crash get bonus Cedric Beck 2024-12-09 22:03:34 +01:00
• e79a1168c0 corrected movelogic Benjamin Feyer 2024-12-09 21:02:46 +01:00
• 6ab8f2d90d fixed missing check on shield state after swap Fleischer Hanno 2024-12-09 19:55:03 +01:00
• ece249cf66 fixed bug in no turn state with double next color itteration Fleischer Hanno 2024-12-09 19:50:22 +01:00
• e95f0866d5 fixed shield state for waiting state Fleischer Hanno 2024-12-09 19:43:50 +01:00
• 0fce2fb5d2 added the possiblity when the drawpile has only 1 card the discard pile will be shuffeled and then put into the draw pile. Fleischer Hanno 2024-12-09 19:11:45 +01:00
• 0010717411 when triggering BonusNode it will now be addded to the hand Fleischer Hanno 2024-12-09 19:05:28 +01:00
• cf9acf981f Merge commit Felix Koppe 2024-12-09 19:06:08 +01:00
• e2a4f7f85c Fix serialize error Felix Koppe 2024-12-09 19:05:59 +01:00
• d0afaa57f5 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Cedric Beck 2024-12-09 18:59:56 +01:00
• 1ffabe6b19 Merge commit Felix Koppe 2024-12-09 19:05:02 +01:00
• 0ba5a2f9fd Add serialization of SpectatorMessage Felix Koppe 2024-12-09 19:04:47 +01:00
• 00a79ddce3 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Cedric Beck 2024-12-09 18:59:42 +01:00
• bce6a1e0eb added cardlayerhandler back and fixed clear selectable Cedric Beck 2024-12-09 18:59:38 +01:00
• 37dcc0122c Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Benjamin Feyer 2024-12-09 18:51:04 +01:00
• 4007036cb2 bug fixes Benjamin Feyer 2024-12-09 18:50:54 +01:00
• 5b958740c4 Merge remote-tracking branch 'origin/development2' into development2 Hanno Fleischer 2024-12-09 18:45:58 +01:00
• 06cb25b6a9 fixed card selection, to use an already selected and discarded card Hanno Fleischer 2024-12-09 18:45:23 +01:00
• afec74416f fixed ChoosePowerCardState Cedric Beck 2024-12-09 18:45:00 +01:00
• ceb9e48f55 updated Error messages Hanno Fleischer 2024-12-09 18:36:42 +01:00
• f8179f191f Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Cedric Beck 2024-12-09 18:12:08 +01:00
• ec77b9a6ef added more start cards for testing Cedric Beck 2024-12-09 18:11:45 +01:00
• 2d01e4b31b Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Fleischer Hanno 2024-12-09 18:11:44 +01:00
• 0be25ecb29 made Intro state work with more PowerCards on the hand Fleischer Hanno 2024-12-09 18:11:21 +01:00
• 1210324194 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Benjamin Feyer 2024-12-09 18:05:40 +01:00
• 569ce39d2a bug Fixed Benjamin Feyer 2024-12-09 18:04:24 +01:00
• 80989310e5 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Cedric Beck 2024-12-09 17:52:53 +01:00
• a2f57bcaae deleted node unselect in BoardHandler clearSelectable Cedric Beck 2024-12-09 17:52:48 +01:00
• 68702f11a4 Deleted the 'MdgaApp.run.xml. Lukas Bauer 2024-12-09 17:51:40 +01:00
• 13948ec4bb Fix error Felix Koppe 2024-12-09 17:47:03 +01:00
• 570c915964 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Cedric Beck 2024-12-09 17:21:51 +01:00
• ac719c55e6 revert commit Cedric Beck 2024-12-09 17:20:34 +01:00
• 189e8a7ec3 fixed client shield state animation Hanno Fleischer 2024-12-09 17:11:30 +01:00
• 6bc769f5bb merge Cedric Beck 2024-12-09 17:04:45 +01:00
• 5d2ece41b7 Merge commit Felix Koppe 2024-12-09 17:05:55 +01:00
• 7f92d8183b Adjust delays Felix Koppe 2024-12-09 17:05:42 +01:00
• a21794ddc1 added new card order in CardLayerHandler Cedric Beck 2024-12-09 17:03:35 +01:00
• a56f68efdc fixed Turbo card with zero modifier Fleischer Hanno 2024-12-09 16:54:26 +01:00
• e699f4556e Fix error Felix Koppe 2024-12-09 16:58:05 +01:00
• 55328e9e69 Fixe dice Felix Koppe 2024-12-09 16:43:21 +01:00
• 50dc634a94 Add powercard drawing Felix Koppe 2024-12-09 16:37:08 +01:00
• d37b9ee269 Add powercard drawing Felix Koppe 2024-12-09 16:36:07 +01:00
• 3937b75bf7 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Benjamin Feyer 2024-12-09 16:11:32 +01:00
• 7d5b8a6b13 404 IQ-Move added move logic Benjamin Feyer 2024-12-09 16:10:56 +01:00
• 39d5b43cb8 Quality of live improvement Felix Koppe 2024-12-09 16:10:15 +01:00
• de0f04b5b7 Quality of live improvement Felix Koppe 2024-12-09 16:07:26 +01:00
• 6a4bdfa455 Fix swap card issue Felix Koppe 2024-12-09 14:50:29 +01:00
• db16b0d8b6 Fix shield card issue Felix Koppe 2024-12-09 14:45:41 +01:00
• 08db05a7d6 added more logic for the move Benjamin Feyer 2024-12-09 14:15:05 +01:00
• e47fcd1643 merge Cedric Beck 2024-12-09 14:14:43 +01:00
• dfd361d8be added isStart + (DU) Cedric Beck 2024-12-09 14:14:15 +01:00
• bf3d800c10 Add turboCardLogic Felix Koppe 2024-12-09 13:57:16 +01:00
• 8943dfb15e Allow all bonusCards Felix Koppe 2024-12-09 13:48:05 +01:00
• 64f11eb99b Adjust diceRoll time Felix Koppe 2024-12-09 13:42:15 +01:00
• 0e9ff609ec fixed a bug where if two player rolled the same number in DSP u would be stuck in an infinite loop Hanno Fleischer 2024-12-09 12:57:47 +01:00
• d37db68838 fixed bug with too early state transition after playing a powercard Hanno Fleischer 2024-12-09 12:05:28 +01:00
• 25fff99ff0 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Benjamin Feyer 2024-12-09 04:50:01 +01:00
• 2dbdb1e17b revert 2 dicenow Cedric Beck 2024-12-09 04:42:55 +01:00
• f954a24b32 fixed in firstroll catching of endanimation messages by non active palyers Fleischer Hanno 2024-12-09 04:36:08 +01:00
• c7a05011ff Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Cedric Beck 2024-12-09 04:34:52 +01:00
• 15b7aa9e8c fixed 2 dicenow notification Cedric Beck 2024-12-09 04:34:47 +01:00
• 84a50ec215 Fix something Felix Koppe 2024-12-09 04:33:21 +01:00
• e05b057190 reenvented the wheel (; , rewrite the canMove-logic, etc Benjamin Feyer 2024-12-09 04:32:55 +01:00
• 9ea6837e89 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Cedric Beck 2024-12-09 04:21:11 +01:00
• a26a3d171f 99,99 IQ Felix Koppe 2024-12-09 04:26:16 +01:00
• a2e85cebc9 99,9 IQ Felix Koppe 2024-12-09 04:25:36 +01:00
• 3fe2d90d75 added toString Cedric Beck 2024-12-09 04:21:06 +01:00
• 4181456598 Adjust delay Felix Koppe 2024-12-09 04:13:30 +01:00
• 6f34b1fe33 Adjust delay Felix Koppe 2024-12-09 04:10:14 +01:00
• 659fef6c50 Add bonus sounds Felix Koppe 2024-12-09 04:07:52 +01:00
• 9c7a13c568 fixed bug Cedric Beck 2024-12-09 03:57:53 +01:00
• 14699e3edf fixed bug Cedric Beck 2024-12-09 03:55:51 +01:00
• 961da990ce fixed no broadcast bug Cedric Beck 2024-12-09 03:46:09 +01:00
• be8d4b2d6e made turbo flag work with only one flag Fleischer Hanno 2024-12-09 03:39:24 +01:00