Gruppe-01-fin

peet/Gruppe-01-fin

Fork 0

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

38687b6d25 added turboflag Cedric Beck 2024-12-09 03:37:35 +01:00
c038073bad Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Cedric Beck 2024-12-09 03:23:06 +01:00
5bccee96a2 working on turbo not Cedric Beck 2024-12-09 03:23:02 +01:00
ecb751824c created two flags to be able to determine if a turbo card has been played Fleischer Hanno 2024-12-09 03:20:54 +01:00
a7969d7a68 Minor change+ Felix Koppe 2024-12-09 03:25:04 +01:00
3a1b17ed01 Merge commit Felix Koppe 2024-12-09 03:17:47 +01:00
3dd6fc9f37 Add DEBUG_MULTIPLIER Felix Koppe 2024-12-09 03:17:28 +01:00
3ae9028b82 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Cedric Beck 2024-12-09 03:11:49 +01:00
536c14bf7c working on turbocard Cedric Beck 2024-12-09 03:11:43 +01:00
fb3a663db1 added overwrite of dicemodifier when receiving PlayCard Turbo message Fleischer Hanno 2024-12-09 03:07:12 +01:00
b91d448ee6 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Cedric Beck 2024-12-09 02:55:57 +01:00
935577462b added shieldRing move Cedric Beck 2024-12-09 02:55:52 +01:00
f79d590620 Merge commit Felix Koppe 2024-12-09 02:50:57 +01:00
69d160d0fd Java23 Felix Koppe 2024-12-09 02:50:45 +01:00
8922cb8f1c added removeshield notification Fleischer Hanno 2024-12-09 02:41:44 +01:00
de592cfa48 Move receive DrawCardMessage to GameState Felix Koppe 2024-12-09 02:43:02 +01:00
f10df60ad3 Merge commit Felix Koppe 2024-12-09 02:40:57 +01:00
1c87b566e9 Add DrawCardMessage logic Felix Koppe 2024-12-09 02:40:45 +01:00
6ecf5a66bf added animation end in playCardNotification Cedric Beck 2024-12-09 02:30:15 +01:00
3f93d6e569 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Cedric Beck 2024-12-09 02:18:35 +01:00
cc72b82be9 added shield Messages Cedric Beck 2024-12-09 02:18:30 +01:00
41ac04f69d added in can infield move to return false when occupant is shielded Fleischer Hanno 2024-12-09 02:15:45 +01:00
cb60cb1c42 Add bonus node logic Felix Koppe 2024-12-09 02:19:43 +01:00
61d67fd833 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Fleischer Hanno 2024-12-09 02:04:11 +01:00
4ca7c38170 Minor change in notification processing Felix Koppe 2024-12-09 02:09:09 +01:00
e457fe23d4 added a reset for the dice modifier in the server Fleischer Hanno 2024-12-09 02:03:57 +01:00
b86aeb63e6 Merge commit Felix Koppe 2024-12-09 01:53:33 +01:00
daa8c0bf9d 500IQ Felix Koppe 2024-12-09 01:53:18 +01:00
d38690ea48 merge Cedric Beck 2024-12-09 01:43:25 +01:00
6487bafed1 Merge commit Felix Koppe 2024-12-09 01:47:47 +01:00
8af3b2d9d4 Fix uuid serialisation error Felix Koppe 2024-12-09 01:47:32 +01:00
daa7d31bdd working on shield Cedric Beck 2024-12-09 01:42:59 +01:00
5e79a4a64c added remove handcard Fleischer Hanno 2024-12-09 01:35:37 +01:00
8e2fc6c1a1 Merge commit Felix Koppe 2024-12-09 01:18:47 +01:00
5a12d8e96f Fix dice more than once error Felix Koppe 2024-12-09 01:18:29 +01:00
3af6e94920 added DrawCardMessageSupport Fleischer Hanno 2024-12-09 01:16:31 +01:00
4efc557849 added node hover/select with piece Cedric Beck 2024-12-09 01:06:12 +01:00
1646526ce1 Try fix error Felix Koppe 2024-12-09 00:36:38 +01:00
904aa17358 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Cedric Beck 2024-12-08 23:23:27 +01:00
f4e774ee5b Minor change Felix Koppe 2024-12-08 23:28:26 +01:00
76b3e18dbe added jet_noGear Cedric Beck 2024-12-08 23:23:21 +01:00
d4cbd0dda6 added swapnotification Cedric Beck 2024-12-08 23:08:59 +01:00
7a189a98e3 Merge commit Felix Koppe 2024-12-08 23:05:44 +01:00
00902d2e6b Add move throw sync Felix Koppe 2024-12-08 23:05:30 +01:00
7256cde020 changed the ionput list for selectableMoveNotification Fleischer Hanno 2024-12-08 22:52:42 +01:00
b817af29b5 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Cedric Beck 2024-12-08 22:28:57 +01:00
fa18ae4280 added swap functionality in model for server & client Cedric Beck 2024-12-08 22:28:51 +01:00
521c7439c2 Add error in animation logixc Felix Koppe 2024-12-08 22:04:16 +01:00
84c5553154 fixed former bug Fleischer Hanno 2024-12-08 21:47:28 +01:00
2c94737023 fixed bug when moving pieces from waiting to infield for non active players Fleischer Hanno 2024-12-08 21:37:22 +01:00
d3d75d7f49 added missing error messages Fleischer Hanno 2024-12-08 21:23:16 +01:00
5e67b2d0c7 fixed a bug where the home index of piece was wrong Fleischer Hanno 2024-12-08 21:18:34 +01:00
992efd403d fixed waiting piece move bug Fleischer Hanno 2024-12-08 21:14:20 +01:00
2d7fddf09a fixed swap select Cedric Beck 2024-12-08 21:13:44 +01:00
f7c886f084 333IQ Felix Koppe 2024-12-08 21:12:09 +01:00
a1d85177c6 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Fleischer Hanno 2024-12-08 20:46:58 +01:00
e27d325faa added serializable tag to choosepiecestatemessage Fleischer Hanno 2024-12-08 20:45:53 +01:00
bd98f301c8 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Cedric Beck 2024-12-08 20:44:28 +01:00
a7850f7d43 fixed rotation Cedric Beck 2024-12-08 20:42:57 +01:00
3040595193 minor fixes to initialize method in noPiece state of server Fleischer Hanno 2024-12-08 20:28:09 +01:00
5d45cf2934 fixed an error in clientstates where a missing servermessage received istn overwritte Fleischer Hanno 2024-12-08 20:24:05 +01:00
a5d949b7e5 added the functionality of multiple roll dice when all pieces in waiting Fleischer Hanno 2024-12-08 20:17:53 +01:00
f4a224621e deleted unwanted code (next Color) Cedric Beck 2024-12-08 20:05:37 +01:00
876c238db3 Fix colorNext Felix Koppe 2024-12-08 19:48:26 +01:00
b61b8214fe Fix colorNext Felix Koppe 2024-12-08 19:46:09 +01:00
5dc3124533 Fix colorNext Felix Koppe 2024-12-08 19:40:10 +01:00
c25e17fd90 fixed waitingpiece move Fleischer Hanno 2024-12-08 19:14:48 +01:00
5e27473875 fixed bugs in MoveMessage Cedric Beck 2024-12-08 19:10:25 +01:00
1be2d6aa13 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Cedric Beck 2024-12-08 18:06:10 +01:00
ab9de3acf8 Replace waitMoveNotification with moveNotification Felix Koppe 2024-12-08 18:09:13 +01:00
2ab19d0fc8 200 iq move Cedric Beck 2024-12-08 18:05:35 +01:00
f489357bbb fixed calcTargetIndex Cedric Beck 2024-12-08 17:24:36 +01:00
34cde15a0d Fix error Felix Koppe 2024-12-08 17:24:18 +01:00
1e52df2812 Fix error Felix Koppe 2024-12-08 17:14:22 +01:00
884c5afc4e Remove moveOccupant Felix Koppe 2024-12-08 17:12:35 +01:00
d6e44c2d29 added logger Cedric Beck 2024-12-08 16:44:28 +01:00
d593233fa3 Fix error Felix Koppe 2024-12-08 15:29:23 +01:00
d1b4aa9dda Fix error Felix Koppe 2024-12-08 15:24:59 +01:00
25b6480c42 Fix error Felix Koppe 2024-12-08 15:10:14 +01:00
3dd81ea02c Add trace statement Felix Koppe 2024-12-08 14:58:07 +01:00
e6dbedab0f Try fix active player logic Felix Koppe 2024-12-08 14:33:37 +01:00
f5b0481d3c Adjust print statements Felix Koppe 2024-12-08 14:25:38 +01:00
f9f381ac2d Fix color.next Felix Koppe 2024-12-08 14:16:14 +01:00
ee94d901f4 Adjust print statements development Felix Koppe 2024-12-08 13:54:39 +01:00
bca02bfe4b Adjust print statements Felix Koppe 2024-12-08 13:51:05 +01:00
acdf5ec6a9 Add missing registration of SelectPieceMessage Felix Koppe 2024-12-08 13:29:44 +01:00
41d6f70d51 added logger Cedric Beck 2024-12-08 12:50:58 +01:00
4c064cb615 Merge commit+ Felix Koppe 2024-12-08 12:45:36 +01:00
121f47d070 Fix selectPieceState and startPieceState logic Felix Koppe 2024-12-08 12:45:08 +01:00
ae436589a2 edited MoveMessage in WaitingState Cedric Beck 2024-12-08 12:38:59 +01:00
bc399b1bf9 edited String queals in Piece Cedric Beck 2024-12-08 12:03:05 +01:00
98a6f2e689 added debug Cedric Beck 2024-12-08 11:57:30 +01:00
9a07375fed Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development Cedric Beck 2024-12-08 11:39:42 +01:00
498c2eb054 Merge remote-tracking branch 'origin/development' into development Felix Koppe 2024-12-08 11:44:38 +01:00
ce55ca8bb5 added further node select implementation Cedric Beck 2024-12-08 11:39:37 +01:00
9c729059bf Merge branch 'refs/heads/dev/server_h' into development Felix Koppe 2024-12-08 11:30:09 +01:00
3b7ef37364 added selectNode when right piece is selected Cedric Beck 2024-12-08 11:27:56 +01:00
ec295c94f1 fixed the equals method in piece dev/server_h Fleischer Hanno 2024-12-08 11:23:53 +01:00
adfe2b94b8 fixed cardLayer shutdown bug Cedric Beck 2024-12-08 11:19:00 +01:00
69108063a0 fixed Notification bug Cedric Beck 2024-12-08 10:33:56 +01:00

1 2 3 4 5 ...