16e7488fae
Merge branch 'dev/server_h' into 'development'
Hanno Fleischer
2024-12-08 09:13:47 +00:00
c9c99709ba
added more communication fixes, states now use correct messages
Hanno Fleischer
2024-12-08 09:52:23 +01:00
e069017375
Merge remote-tracking branch 'origin/dev/server_h' into development
Felix Koppe
2024-12-08 09:44:23 +01:00
8b27ccce22
adjusted stattransition methods to work correctly
Hanno Fleischer
2024-12-08 03:08:47 +01:00
8c22d935a9
implemented rest of the server logic in choosepiece substates, and began to fix bugs after testing
Hanno Fleischer
2024-12-08 01:59:29 +01:00
c8d7d91de0
added import in NotiSync
Cedric Beck
2024-12-07 21:57:41 +01:00
389d1b6056
merge development into dev/client_beck
Cedric Beck
2024-12-07 17:04:43 +01:00
4430b37581
fixed wrong dice rotation because of fps drop
dev/client_beck
Cedric Beck
2024-12-07 17:00:42 +01:00
525809899e
Minor improvements
Felix Koppe
2024-12-07 11:03:30 +01:00
fd9708752c
Merge dev/model into development
Felix Koppe
2024-12-06 18:49:15 +01:00
5a9f7a8118
added AnimationEndMessages to 'RollDiceState', 'MovePieceState' and 'PlayPowerCardState'
dev/model
Hanno Fleischer
2024-12-06 18:45:14 +01:00
236d3db930
Add ambience
Felix Koppe
2024-12-06 18:10:09 +01:00
2e1fe3c050
fixed a missing method call ind TurnState and removed debug sout statements ind 'RollDiceMessage'
Hanno Fleischer
2024-12-06 15:19:04 +01:00
2ac2de645b
working on matrix-animation
Cedric Beck
2024-12-06 14:56:04 +01:00
d39f85fbe9
Add some javaDoc to client
Felix Koppe
2024-12-06 14:26:13 +01:00
960a57caba
Fix broken lose sound
Felix Koppe
2024-12-06 13:28:38 +01:00
36631df2e9
Fix broken jet-sound
Felix Koppe
2024-12-06 13:26:28 +01:00
df27c23cd5
Fix shadercode
Felix Koppe
2024-12-06 13:19:17 +01:00
acd64d1507
Fix shadercode
Felix Koppe
2024-12-06 13:14:54 +01:00
76f86c8a66
Improve audioSettings
Felix Koppe
2024-12-06 11:35:05 +01:00
308b592b65
Merge branch 'development' into 'dev/model'
Hanno Fleischer
2024-12-06 09:55:19 +00:00
c4e7fb1d41
Fix logic in modelSyncronizer
Felix Koppe
2024-12-06 10:54:02 +01:00
aacc0440b3
Update .gitignore
Felix Koppe
2024-12-06 10:33:13 +01:00
43c0e3bcc7
Merge branch 'development' into 'dev/model'
Hanno Fleischer
2024-12-06 09:09:29 +00:00
95635f5fb7
Fix ownColor in gameView
Felix Koppe
2024-12-06 09:59:28 +01:00
0237bcc4be
Fix card select issue
Felix Koppe
2024-12-06 09:51:17 +01:00
26836d16cc
Fix card select issue
Felix Koppe
2024-12-06 09:48:24 +01:00
a6c8cc33f4
Make cardSelect trigger needCconfirm
Felix Koppe
2024-12-06 09:31:02 +01:00
7f5f4b8c68
Fix broken sound
Felix Koppe
2024-12-06 09:24:49 +01:00
7f3483aa6b
Add broken sound
Felix Koppe
2024-12-06 09:22:10 +01:00
8422b7be1e
Merge branch 'development' into dev/client_koppe2
Felix Koppe
2024-12-06 09:11:09 +01:00
f0b23ab9c2
Readd broken files
Felix Koppe
2024-12-06 09:10:47 +01:00
78f1dbb3d3
Remove broken files
Felix Koppe
2024-12-06 09:08:52 +01:00
4904b32ea3
Updated 'ChoosePieceState' class. Updated the 'ChoosePieceState' class by adding the 'RequestMoveMessage' handling to it.
Daniel Grigencha
2024-12-06 08:58:51 +01:00
b00219c4fb
Updated 'PlayPowerCardState' class. Updated the 'PlayPowerCardState' class by adding the 'AnimationEndMessage' handling to it.
Daniel Grigencha
2024-12-06 08:58:01 +01:00
12cf5f3e71
Updated 'PowerCardState' class. Updated the 'PowerCardState' class by adding the 'SelectedPiecesMessage' handling to it.
Daniel Grigencha
2024-12-06 08:57:08 +01:00
77b0207214
Updated 'TurnState' class. Updated the 'TurnState' class by adding the 'SelectedPiecesMessage', 'NoPowerCardMessage', 'RequestDieMessage' and 'ReuqestMoveMessage' handling to it.
Daniel Grigencha
2024-12-06 08:56:21 +01:00
a18165bc02
Updated 'Game' class. Updated the 'Game' class by commenting out the creation of turbo and shield cards. This is only for testing purposes.
Daniel Grigencha
2024-12-06 08:55:01 +01:00
9e758e4417
Merge branch 'dev/model' into dev/client_koppe2
Felix Koppe
2024-12-06 08:11:37 +01:00
62ceff822f
Updated 'DetermineStartPlayerState' class. Updated the 'DetermineStartPlayerState' class by adding logic for the roll again event to the 'RequestDieMessage' handling.
Daniel Grigencha
2024-12-06 04:54:14 +01:00
33afc4ab3b
added selectDice method in RollDiceState
Hanno Fleischer
2024-12-06 04:48:05 +01:00
9c4f2387ee
Updated 'FirstRollState', 'SecondRollState' and 'ThirdROllState' classes. Updated the 'FirstRollState', 'SecondRollState' and 'ThirdROllState' class by adding the 'received(RequestDieMessage msg, int from)' method to them.
Daniel Grigencha
2024-12-06 04:28:33 +01:00
9d1430e488
Updated 'AnimationState' class. Updated the 'AnimationState' class by setting the data type of 'messageReceived' from 'Map' to 'Set'.
Daniel Grigencha
2024-12-06 04:27:10 +01:00
dd2146d417
Updated 'DetermineStartPlayerState' class. Updated the 'DetermineStartPlayerState' class by setting the data type of 'messageReceived' from 'Map' to 'Set'.
Daniel Grigencha
2024-12-06 04:26:38 +01:00
d9ad0f0a4b
Updated 'LobbyState' class. Updated the 'LobbyState' class by setting the first waiting piece on the start node.
Daniel Grigencha
2024-12-06 04:25:45 +01:00
0368ec8541
implemented the correct transition, when the player can play no powercard
Hanno Fleischer
2024-12-06 04:18:58 +01:00
72f0bc5a2f
Updated 'RollDiceState' class. Updated the 'RollDiceState' class by adding the 'received(RequestDieMessage msg, int from)' method to it.
Daniel Grigencha
2024-12-06 04:17:29 +01:00
23ae4a3080
Updated 'DetermineStartPlayaerState' class. Updated the 'DetermineStartPlayerState' class by calling the right method of the 'entry' inside the 'RequestDieMessage' handling.
Daniel Grigencha
2024-12-06 04:14:42 +01:00
765b1884fe
Updated 'AnimationState' class. Updated the 'AnimationState' class by removing the unused 'DiceNowMessage' call from it.
Daniel Grigencha
2024-12-06 03:57:42 +01:00
e3febd6ba1
Updated 'DetermineStartPlayerState' class. Updated the 'DetermineStartPlayerState' class by removing the 'rolls' attribute and its usage from it.
Daniel Grigencha
2024-12-06 03:49:39 +01:00
1a562a8d38
Updated 'DeterminStartPlayerState' class. Updated the 'DetermineStartPlayerState' class by adding the multi roll support to it. In Addition, the server model will be updated correctly.
Daniel Grigencha
2024-12-06 03:29:11 +01:00
39ed4238b5
Updated 'AnimationState' class. Updated the 'AnimationState' class by adding a missing semicolon.
Daniel Grigencha
2024-12-06 03:27:55 +01:00
620063e894
Updated 'AnimationState' class. Updated the 'AnimationState' class by updating the 'messageReceived' attribute in it. In Addition, the 'AnimationEndMessage' handling was updated.
Daniel Grigencha
2024-12-06 03:22:25 +01:00
2d0788eb72
Updated 'TurnState' class. Updated the 'TurnState' class by updating the imports in it.
Daniel Grigencha
2024-12-06 03:20:28 +01:00
8470a96908
Updated 'DetermineStartPlayerState' class. Updated the 'DetermineStartPlayerState' class by updating the 'AnimationEndMessage' handling in it. In Addition, the 'RequestDieMessage' handling was updated as well.
Daniel Grigencha
2024-12-06 02:55:14 +01:00
a6205c982a
now sending AnimationEndMessage when in Waitranking State
Hanno Fleischer
2024-12-06 02:40:16 +01:00
1e6856744b
Updated 'DetermineStartPlayerState' class. Updated the 'DetermineStartPlayerState' class by adding the 'received(AnimationEndMessage msg, int from)' method to it.
Daniel Grigencha
2024-12-06 02:38:46 +01:00
f713e00c36
made all 'PowerCards' serializable
Hanno Fleischer
2024-12-06 02:30:13 +01:00
81ae896ae8
Updated 'TurnState' class. Updated the 'TurnState' class by removing the start state of this state machine of the constructor.
Daniel Grigencha
2024-12-06 02:22:46 +01:00
5b55d39c9a
Updated 'AnimationState' class. Updated the 'AnimationState' class by solving the transition error due to the separat state change.
Daniel Grigencha
2024-12-06 02:22:07 +01:00
f36e2ff7bb
adjusted the getter for the card in the intro to get BonusCards instead of PowerCards
Hanno Fleischer
2024-12-06 02:16:58 +01:00
55d398b428
adjusted all useages of the SelectedPieces consturctor to transfer the right parameters
Hanno Fleischer
2024-12-06 02:12:59 +01:00
affa2ecd7e
Added 'ChoosePowerCardState', 'ShieldCardState', 'SwapCardState' and 'TurboCardState' classes. Updated the 'ChoosePowerCardState', 'ShieldCardState', 'SwapCardState' and 'TurboCardState' classes to this project. They will be used inside the power card state. In Addition, the abstract 'PowerCardAutomatonState' class was added.
Daniel Grigencha
2024-12-06 02:11:32 +01:00
0a1bd1f503
adjusted all State containing 'received(PlayCardMessage msg)' to work with the new message
Hanno Fleischer
2024-12-06 02:04:55 +01:00
a2867fc88a
Added 'ServerCardVisitor' class. Added the 'ServerCardVisitor' class to this project. It will be used as a visitor on the server to differentiate between all types of power cards.
Daniel Grigencha
2024-12-06 01:41:45 +01:00
c6761d91d1
Updated 'PowerCardState' class. Updated the 'PowerCardState' class by updating the content of the 'enter' in it.
Daniel Grigencha
2024-12-06 01:37:24 +01:00
5708ee6ffe
Updated 'PlayCardMessage' class. Updated the 'PlayCardMessage' class by removing the 'ownPieceID' and 'enemyPieceID' attributes and their getter methods from it. In Addition, the 'pieces' attribute and its getter method was added.
Daniel Grigencha
2024-12-06 01:28:44 +01:00
d61b68aa41
overrode hachCode and equals method of Piece
Hanno Fleischer
2024-12-06 01:15:06 +01:00
66dc9c02ea
Updated 'PowerCardState' class. Updated the 'PowerCardState' class by adding the 'currentState', 'choosePowerCardState', 'shieldCardState', 'swapCardState' and 'turboCardState' attributes and its getter methods to it. In Addition, logic was written into the 'enter' method.
Daniel Grigencha
2024-12-06 00:53:11 +01:00
dd95356abd
Updated 'TurnState' class. Updated the 'TurnState' class by adding the 'player' attribute and its getter method to it.
Daniel Grigencha
2024-12-06 00:50:48 +01:00
84776c71b2
Updated 'SelectedPiecesMessage' class. Updated the 'SelectedPiecesMessage' class by removing 'pieceIdentifier' attribute and its getter method from it. In Addition, the 'pieces' attribute and its getter method was added.
Daniel Grigencha
2024-12-06 00:47:33 +01:00
d07eee6251
Updated 'Piece' class. Updated the 'Piece' class by overwriting the 'toString' method in it.
Daniel Grigencha
2024-12-06 00:45:56 +01:00
b601ff2cf7
renamed 'PossibleCardMEssage' to 'PossibleCardsMessage' and completed JavaDocs for method 'getPowerCardByType' in 'Player'
Hanno Fleischer
2024-12-06 00:36:06 +01:00
04119d2f3e
modified 'ChoosePowerCardState' to work with PowerCards as well as adjusted 'SelectcardMessage' to use 'PowerCards'
Hanno Fleischer
2024-12-06 00:31:12 +01:00
a92c06a70e
added a method in 'Player' to return the first 'PowerCard' of a specific Type
Hanno Fleischer
2024-12-06 00:30:08 +01:00
50f9c0ef0c
Updated 'PossibleCardMessage' class. Updated the 'PossibleCardMessage' class by replacing all 'BonusCard' with 'PowerCard' in it.
Daniel Grigencha
2024-12-06 00:19:11 +01:00
8a738a3633
Updated 'Game' class. Updated the 'Game' class by replacing all 'BonusCard' with 'PowerCard' in it.
Daniel Grigencha
2024-12-06 00:16:38 +01:00
3a32a7ebf7
Updated 'Player' class. Updated the 'Player' class by replacing all 'BonusCard' with 'PowerCard' in it.
Daniel Grigencha
2024-12-06 00:11:50 +01:00
Hanno Fleischer
Felix Koppe
Cedric Beck
Cedric Beck
Daniel Grigencha