peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity
707 Commits 19 Branches 3 Tags
34cde15a0d62528d616f4442d836f8adb7cf3f94
Commit Graph

370 Commits

Author SHA1 Message Date
Felix Koppe
34cde15a0d Fix error 2024-12-08 17:24:18 +01:00
Felix Koppe
1e52df2812 Fix error 2024-12-08 17:14:22 +01:00
Felix Koppe
884c5afc4e Remove moveOccupant 2024-12-08 17:12:35 +01:00
Cedric Beck
d6e44c2d29 added logger 2024-12-08 16:44:28 +01:00
Felix Koppe
d1b4aa9dda Fix error 2024-12-08 15:24:59 +01:00
Felix Koppe
25b6480c42 Fix error 2024-12-08 15:10:14 +01:00
Felix Koppe
3dd81ea02c Add trace statement 2024-12-08 14:58:07 +01:00
Felix Koppe
e6dbedab0f Try fix active player logic 2024-12-08 14:33:37 +01:00
Felix Koppe
f5b0481d3c Adjust print statements 2024-12-08 14:25:38 +01:00
Felix Koppe
f9f381ac2d Fix color.next 2024-12-08 14:16:14 +01:00
Felix Koppe
ee94d901f4 Adjust print statements 2024-12-08 13:54:39 +01:00
Felix Koppe
bca02bfe4b Adjust print statements 2024-12-08 13:51:05 +01:00
Cedric Beck
41d6f70d51 added logger 2024-12-08 12:50:58 +01:00
Felix Koppe
4c064cb615 Merge commit+ 2024-12-08 12:45:36 +01:00
Felix Koppe
121f47d070 Fix selectPieceState and startPieceState logic 2024-12-08 12:45:08 +01:00
Cedric Beck
ae436589a2 edited MoveMessage in WaitingState 2024-12-08 12:38:59 +01:00
Cedric Beck
bc399b1bf9 edited String queals in Piece 2024-12-08 12:03:05 +01:00
Cedric Beck
98a6f2e689 added debug 2024-12-08 11:57:30 +01:00
Fleischer Hanno
ec295c94f1 fixed the equals method in piece 2024-12-08 11:23:53 +01:00
Hanno Fleischer
c9c99709ba added more communication fixes, states now use correct messages 2024-12-08 09:52:23 +01:00
Hanno Fleischer
8b27ccce22 adjusted stattransition methods to work correctly 2024-12-08 03:08:47 +01:00
Hanno Fleischer
8c22d935a9 implemented rest of the server logic in choosepiece substates, and began to fix bugs after testing 2024-12-08 01:59:29 +01:00
Hanno Fleischer
0c49d7ed1c Merge branch 'dev/server_h' of https://athene1.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into dev/server_h 2024-12-07 15:37:02 +01:00
Hanno Fleischer
c37bac4614 replaced DicaAgain message with DicveNow 2024-12-07 15:34:34 +01:00
Felix Koppe
06b37584cb Merge dev/client_beck into development 2024-12-07 15:05:03 +01:00
Felix Koppe
0c42a2df88 Merge branch 'dev/client_beck' into development 
# Conflicts:
#	Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java
#	Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java
#	Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/AcousticHandler.java
#	Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/MdgaSound.java
#	Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/SoundAsset.java
#	Projekte/mdga/client/src/main/java/pp/mdga/client/animation/JetAnimation.java
#	Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java
#	Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/GameStates.java
 2024-12-07 15:00:27 +01:00
Hanno Fleischer
5a9f7a8118 added AnimationEndMessages to 'RollDiceState', 'MovePieceState' and 'PlayPowerCardState' 2024-12-06 18:45:14 +01:00
Hanno Fleischer
2e1fe3c050 fixed a missing method call ind TurnState and removed debug sout statements ind 'RollDiceMessage' 2024-12-06 15:19:04 +01:00
Cedric Beck
2ac2de645b working on matrix-animation 2024-12-06 14:56:04 +01:00
Daniel Grigencha
4904b32ea3 Updated 'ChoosePieceState' class. 
Updated the 'ChoosePieceState' class by adding the 'RequestMoveMessage' handling to it.
 2024-12-06 08:58:51 +01:00
Daniel Grigencha
b00219c4fb Updated 'PlayPowerCardState' class. 
Updated the 'PlayPowerCardState' class by adding the 'AnimationEndMessage' handling to it.
 2024-12-06 08:58:01 +01:00
Daniel Grigencha
12cf5f3e71 Updated 'PowerCardState' class. 
Updated the 'PowerCardState' class by adding the 'SelectedPiecesMessage' handling to it.
 2024-12-06 08:57:08 +01:00
Daniel Grigencha
77b0207214 Updated 'TurnState' class. 
Updated the 'TurnState' class by adding the 'SelectedPiecesMessage', 'NoPowerCardMessage', 'RequestDieMessage' and 'ReuqestMoveMessage' handling to it.
 2024-12-06 08:56:21 +01:00
Daniel Grigencha
a18165bc02 Updated 'Game' class. 
Updated the 'Game' class by commenting out the creation of turbo and shield cards. This is only for testing purposes.
 2024-12-06 08:55:01 +01:00
Daniel Grigencha
62ceff822f Updated 'DetermineStartPlayerState' class. 
Updated the 'DetermineStartPlayerState' class by adding logic for the roll again event to the 'RequestDieMessage' handling.
 2024-12-06 04:54:14 +01:00
Hanno Fleischer
33afc4ab3b added selectDice method in RollDiceState 2024-12-06 04:48:05 +01:00
Daniel Grigencha
322d539cfd Merge branch 'dev/model' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into dev/model 2024-12-06 04:28:40 +01:00
Daniel Grigencha
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.
 2024-12-06 04:28:33 +01:00
Daniel Grigencha
9d1430e488 Updated 'AnimationState' class. 
Updated the 'AnimationState' class by setting the data type of 'messageReceived' from 'Map' to 'Set'.
 2024-12-06 04:27:10 +01:00
Daniel Grigencha
dd2146d417 Updated 'DetermineStartPlayerState' class. 
Updated the 'DetermineStartPlayerState' class by setting the data type of 'messageReceived' from 'Map' to 'Set'.
 2024-12-06 04:26:38 +01:00
Daniel Grigencha
d9ad0f0a4b Updated 'LobbyState' class. 
Updated the 'LobbyState' class by setting the first waiting piece on the start node.
 2024-12-06 04:25:45 +01:00
Hanno Fleischer
0368ec8541 implemented the correct transition, when the player can play no powercard 2024-12-06 04:18:58 +01:00
Daniel Grigencha
72f0bc5a2f Updated 'RollDiceState' class. 
Updated the 'RollDiceState' class by adding the 'received(RequestDieMessage msg, int from)' method to it.
 2024-12-06 04:17:29 +01:00
Daniel Grigencha
23ae4a3080 Updated 'DetermineStartPlayaerState' class. 
Updated the 'DetermineStartPlayerState' class by calling the right method of the 'entry' inside the 'RequestDieMessage' handling.
 2024-12-06 04:14:42 +01:00
Daniel Grigencha
765b1884fe Updated 'AnimationState' class. 
Updated the 'AnimationState' class by removing the unused 'DiceNowMessage' call from it.
 2024-12-06 03:57:42 +01:00
Daniel Grigencha
e3febd6ba1 Updated 'DetermineStartPlayerState' class. 
Updated the 'DetermineStartPlayerState' class by removing the 'rolls' attribute and its usage from it.
 2024-12-06 03:49:39 +01:00
Daniel Grigencha
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.
 2024-12-06 03:29:11 +01:00
Daniel Grigencha
39ed4238b5 Updated 'AnimationState' class. 
Updated the 'AnimationState' class by adding a missing semicolon.
 2024-12-06 03:27:55 +01:00
Daniel Grigencha
620063e894 Updated 'AnimationState' class. 
Updated the 'AnimationState' class by updating the 'messageReceived' attribute in it. In Addition, the 'AnimationEndMessage' handling was updated.
 2024-12-06 03:22:25 +01:00
Daniel Grigencha
2d0788eb72 Updated 'TurnState' class. 
Updated the 'TurnState' class by updating the imports in it.
 2024-12-06 03:20:28 +01:00