6c74acc334
added a getter for the BonusCrad in PowerCard
Hanno Fleischer
2024-12-05 23:07:22 +01:00
6894802c00
Added 'HiddenCard', 'ShieldCard', 'SwapCard' and 'TurboCard' classes. Updated the 'HiddenCard', 'ShieldCard', 'SwapCard' and 'TurboCard' classes to this project. They will be used to display different types of power cards.
Daniel Grigencha
2024-12-06 00:04:21 +01:00
a09211da5f
Updated abstract 'PowerCard' class. Updated the abstract 'PowerCard' class by setting the 'card' attribute to 'protected' in it.
Daniel Grigencha
2024-12-06 00:03:16 +01:00
c9c9c5dcf6
Added abstract 'PowerCard' class. Added the abstract 'PowerCard' class to this project. It will be used to display different types of hand cards.
Daniel Grigencha
2024-12-05 23:58:43 +01:00
1e46b1dc59
Added 'Visitor' interface. Added the 'Visitor' interface to this project. It will be used to handle all types of power cards.
Daniel Grigencha
2024-12-05 23:54:55 +01:00
421231aa12
made BonusCard Serializable and added the method calls to display handcards during the intro
Hanno Fleischer
2024-12-05 22:46:48 +01:00
d8bb458e9c
Updated 'LobbyState' class. Updated the 'LobbyState' class by updating the 'initializeGame' method in it.
Daniel Grigencha
2024-12-05 23:45:24 +01:00
f0080118d0
Changed and : removed the selectAnimationEnd Method from Waitranking and moved logic into the receivedActivePlayerMessage. Added in selectStart to always send a StartGameMessage in order to trigger incorrectRequestMEssage
Hanno Fleischer
2024-12-05 22:34:53 +01:00
8a438ab069
Updated 'DetermineStartPlayerState' class. Updated the 'DetermineStartPlayerState' class by updating the whole start player determination process in it.
Daniel Grigencha
2024-12-05 23:29:21 +01:00
0ce8184069
Updated 'Game' class. Updated the 'Game' class by adding the 'draw' method to it. In Addition, the 'initializeDrawPile' method was updated by shuffling the 'drawPile' attribute after filling it.
Daniel Grigencha
2024-12-05 23:27:06 +01:00
2c524477d7
Merge branch 'dev/model' into dev/client_koppe2
Felix Koppe
2024-12-05 22:18:00 +01:00
587af466e8
Merge branch 'development' into dev/client_koppe2
Felix Koppe
2024-12-05 22:17:53 +01:00
8d398450f1
Minor changes
Felix Koppe
2024-12-05 22:15:59 +01:00
0a96dd6f9f
Repair sounds
Felix Koppe
2024-12-05 22:07:36 +01:00
e8a556de27
Add missle
Felix Koppe
2024-12-05 22:02:02 +01:00
1214d3c87c
added an getter for the error id in the IncorrectrequestMessage and implemeted how to handle it in the client game logic.
Hanno Fleischer
2024-12-05 21:11:40 +01:00
f2c34aee2d
Updated 'DetermineStartPlayerState' class. Updated the 'DetermineStartPlayerState' class by updating the 'received(RequestDieMessage msg, int from)' method in it.
Daniel Grigencha
2024-12-05 22:03:48 +01:00
2da1fec7dd
Updated 'RankingResponseMessage' class. Updated the 'RankingResponseMessage' class by removing the 'startingPlayerId' attribute and its getter method from it. In Addition the 'rankingResults' attribute and its getter method were added.
Daniel Grigencha
2024-12-05 22:01:05 +01:00
5d76a89b95
Updated 'LobbyState' class. Updated the 'LobbyState' class by updating the 'JoinedLobbyMessage' and 'LobbyReadyMessage' handlings in it.
Daniel Grigencha
2024-12-05 21:58:20 +01:00
60ebef3518
Updated 'LobbyState' class. Updated the 'LobbyState' class by adding an 'IncorrectRequestMessage' to the start game handling.
Daniel Grigencha
2024-12-05 19:58:23 +01:00
a399b14291
Improve interrupt
Felix Koppe
2024-12-05 18:11:57 +01:00
74194d8514
Merge branch 'development' into 'dev/model'
Hanno Fleischer
2024-12-05 16:58:50 +00:00
9d21e2ce87
Merge commit
Felix Koppe
2024-12-05 18:00:27 +01:00
2255bfd648
Remove test binding
Felix Koppe
2024-12-05 18:00:04 +01:00
cabd98a24a
adjusted a broadcast in lobby state to a send to reduce traffic (original commit f1124f32) and removed souts as well as added comments back into the code
Fleischer Hanno
2024-12-05 17:51:18 +01:00
d14a0aef86
fixed ownColor sync problem
Cedric Beck
2024-12-05 17:22:37 +01:00
ac5d7ed74b
Add sounds
Felix Koppe
2024-12-05 17:11:07 +01:00
f1124f3245
Fix missing ready update from server on join of new player in LobbyState
Felix Koppe
2024-12-05 16:38:09 +01:00
fc4a357e9e
Merge branch 'dev/model' into dev/client_koppe2
Felix Koppe
2024-12-05 16:25:23 +01:00
a8b02faa96
Merge branch 'development' into dev/client_koppe2
Felix Koppe
2024-12-05 16:25:11 +01:00
4a7c23708c
Add jetAnimation
Felix Koppe
2024-12-05 16:21:13 +01:00
4478291852
added the movement of pieces in the intro state to be also done in the model
Hanno Fleischer
2024-12-05 15:22:38 +01:00
0622c35303
fixed state transitions and implemented the Intro state to move the pieces to the correct start setup added some logic so that the client only transitions to the intro state when the animation has finished at it received the new active Player, and after animating the setup it switches to the corresponding state baserd on the active player and displays the now new active player.
Hanno Fleischer
2024-12-05 14:02:02 +01:00
3b0cd9ebdb
Updated the JavaDocs in multiple classes, to improve readability.
Daniel Grigencha
2024-12-05 05:21:33 +01:00
e81aa67d36
Updated the JavaDocs in multiple classes, to improve readability.
Daniel Grigencha
2024-12-05 05:09:15 +01:00
4fb848420b
Updated the 'DisconnectedMessage' class. Updated the 'DisconnectedMessage' class by adding JavaDocs.
Daniel Grigencha
2024-12-05 05:03:39 +01:00
07a833afe7
Updated the 'ClientInterpreter' interface. Updated the 'ClientInterpreter' interface by adjusting the JavaDocs.
Daniel Grigencha
2024-12-05 05:00:29 +01:00
6576250113
Updated the 'Player' class. Updated the 'Player' class by adjusting the JavaDocs and writing the logic for the 'isFinished()' method.
Daniel Grigencha
2024-12-05 04:54:12 +01:00
154efccf31
Updated 'Game' class. Updated the 'Game' class by adjusting the JavaDocs and rewriting the constructor for maintainability and readability.
Daniel Grigencha
2024-12-05 04:52:59 +01:00
f90aed7bbb
Updated 'Color' enum. Updated the 'Color' enum by adjusting the JavaDocs and adding a new static method 'getColor(int)'
Daniel Grigencha
2024-12-05 04:51:55 +01:00
3a86837307
Updated the JavaDocs in multiple classes, to improve readability.
Daniel Grigencha
2024-12-05 04:50:34 +01:00
da0756452c
Updated the JavaDocs in multiple classes, to improve readability.
Daniel Grigencha
2024-12-05 04:49:49 +01:00
bfe8a20f92
Updated 'Board' class. Updated the 'Board' class by rewriting the constructor, to make it maintainable and scalable.
Daniel Grigencha
2024-12-05 04:46:01 +01:00
0e6a2499b7
Fix fullscreen issue
Felix Koppe
2024-12-04 18:38:35 +01:00
354cdc0a9c
added Intro state and its logic
Hanno Fleischer
2024-12-04 17:03:57 +01:00
00d86c5c10
Improve ceremonyView
Felix Koppe
2024-12-04 15:33:34 +01:00
990e476753
Add Q/E rotation
Felix Koppe
2024-12-04 15:27:33 +01:00
71fc08a05c
Add interrupt
Felix Koppe
2024-12-04 15:11:31 +01:00
5c71531277
Merge branch 'development' into dev/client_koppe2
Felix Koppe
2024-12-04 13:43:33 +01:00
6f7c5346d2
Merge commit
Felix Koppe
2024-12-04 13:34:14 +01:00
ef1ce63db6
Try to make server stop on leave
Felix Koppe
2024-12-04 13:33:39 +01:00
e8d1442e5b
made the model checkstyle compliant
Hanno Fleischer
2024-12-04 12:10:48 +01:00
bdacc4aad3
created the Intro state and renamed all packages to be checkstyle compliant
Hanno Fleischer
2024-12-04 12:08:38 +01:00
44ef21e6af
added handCard Num to playerName display + added remove card in guiHandler
Cedric Beck
2024-12-04 11:38:35 +01:00
8e8104b672
forgot to add StartGameMessage in previous commit
Hanno Fleischer
2024-12-04 11:10:26 +01:00
de899cef35
removed from every Message the getInfoTest method and only overrode the toString method in messages with content, in every other message it is handled through the parent class
Hanno Fleischer
2024-12-04 11:07:55 +01:00
11d6dd4500
Improve video dialog
Felix Koppe
2024-12-04 10:00:41 +01:00
d71f824ca6
Add fullscreen option
Felix Koppe
2024-12-04 09:41:08 +01:00
8e6cb27662
Fix lobbyView ready behavior on tskChange
Felix Koppe
2024-12-04 07:53:18 +01:00
29711d6210
Updated 'ClientStartGameMessage' class. Updated the 'ClientStartGameMesssage' class by preparing it for the correct BPMN diagram.
Daniel Grigencha
2024-12-04 02:46:07 +01:00
29d8e791f6
Updated 'Player' class. Updated the 'Player' class by adding the 'setPieceInHome' method to it.
Daniel Grigencha
2024-12-04 02:44:28 +01:00
4440341f79
Updated 'LobbyState' class. Updated the 'LobbyState' class by updating the creation of the 'ServerStartGameMessage' object. In Addition, the start process if all players are ready was removed.
Daniel Grigencha
2024-12-04 02:44:03 +01:00
de5c8bf44c
Updated 'Game' class. Updated the 'Game' class by adding the 'getPlayersAsList' method to it.
Daniel Grigencha
2024-12-04 02:43:29 +01:00
ab5cece1b3
Updated 'StartGameMessage' class. Updated the 'StartGameMessage' class by removing the unused 'forceStartGame' attribute from it.
Daniel Grigencha
2024-12-04 02:42:57 +01:00
b8ed5060d6
Updated 'Board' class. Updated the 'Board' class by removing the 'playerData' attribute and its getter method from it.
Daniel Grigencha
2024-12-04 02:42:16 +01:00
c0b72ae4da
Updated 'ServerStartGameMessage' class. Updated the 'ServerStartGameMessage' class by adding the 'players' attribute and its getter method to it.
Daniel Grigencha
2024-12-04 02:41:44 +01:00
c1b4caa82b
Updated 'LobbyState' class. Updated the 'LobbyState' class by updating the 'received(ServerStartGameMessage msg)' method in it after updating the 'ServerStartGameMessage' class.
Daniel Grigencha
2024-12-04 02:22:58 +01:00
a757158477
Updated 'MdgaServer' class. Updated the 'MdgaServer' class by removing the serializer registration in it.
Daniel Grigencha
2024-12-04 02:09:20 +01:00
964ff87b11
Updated client states. Updated the client states by removing all references to the 'PlayerData' class.
Daniel Grigencha
2024-12-04 01:47:31 +01:00
7053b163e5
adjusted LobbyState in the client to use the correct Data
Hanno Fleischer
2024-12-03 18:19:55 +01:00
81cb2f33ff
adjusted all constuctors of nodes so that if someone creates a node the piece will be null and the option for a constuctor without arguments is still given for serialization purposes
Hanno Fleischer
2024-12-03 17:56:39 +01:00
69865bb504
added the playeringamenotification to be created from the right dataset
Hanno Fleischer
2024-12-03 16:48:08 +01:00
db50986f3f
Fix serialisation issue
Felix Koppe
2024-12-03 15:38:13 +01:00
a0a088a0c4
Fix minor error in notification processing
Felix Koppe
2024-12-03 15:00:00 +01:00
c4d11ff961
added window title
Cedric Beck
2024-12-03 09:15:14 +01:00
ee70699150
added some logic to the tests
dev/test
Benjamin Feyer
2024-12-03 06:35:45 +01:00
bb51976127
Updated 'Node' class. Updated the 'Node' class by overload the 'isOccupied' method in it.
Daniel Grigencha
2024-12-03 04:57:30 +01:00
0db1f08f3c
Updated abstract 'GameAutomatonState' class. Updated the abstract 'GameAutomatonState' class by adding the 'getGameAutomaton' method to it.
Daniel Grigencha
2024-12-03 04:49:16 +01:00
336f1ec316
Updated 'Resources' class. Updated the 'Resources' class by adding the 'MAX_EYES' constant to it.
Daniel Grigencha
2024-12-03 04:29:16 +01:00
a1e687912a
Updated abstract 'TurnAutomatonState' class. Updated the abstract 'TurnAutomatonState' class by adding the 'getTurnAutomaton' method to it.
Daniel Grigencha
2024-12-03 04:09:35 +01:00
2248d044c1
Updated 'AnimationState' class. Updated the 'AnimationState' class by updating the content inside the 'received(AnimationEndMessage msg, int from) method in it.
Daniel Grigencha
2024-12-03 03:41:58 +01:00
79bf1c16e8
Updated 'Game' class. Updated the 'Game' class by adding the 'getActivePlayerId' method to it.
Daniel Grigencha
2024-12-03 03:40:24 +01:00
3353a890d3
Updated 'Game' class. Updated the 'Game' class by adding the 'getPlayerIdByColor' method to it.
Daniel Grigencha
2024-12-03 03:36:22 +01:00
a012402a85
Updated abstract 'TurnAutomatonState' class. Updated the abstract 'TurnAutomatonState' class by updating the JavaDoc text of the constructor.
Daniel Grigencha
2024-12-03 02:15:10 +01:00
5aaf8d4850
Updated 'TurnState' class. Updated the 'TurnState' class by setting the start state in it.
Daniel Grigencha
2024-12-03 01:31:22 +01:00
35ab777f04
Updated 'DetermineStartPlayerState' class. Updated the 'DetermineStartPlayerState' class by fixing the logic inside the received(RequestDieMessage msg, int from)' method in it.
Daniel Grigencha
2024-12-03 01:30:39 +01:00
c707abc465
Updated 'Die' class. Updated the 'Die' class by adding another constructor for test cases to it.
Daniel Grigencha
2024-12-03 01:04:02 +01:00
2a84e7cf65
Updated 'Player' class. Updated the 'Player' class by moving all content of 'PlayerData' class in 'Player' class.
Daniel Grigencha
2024-12-03 00:51:45 +01:00
3a02edb944
Updated 'PlayerData' class. Updated the 'PlayerData' class by updating the 'Piece' creation inside the constructor.
Daniel Grigencha
2024-12-03 00:50:53 +01:00
1870d4fe0e
Updated 'ShieldState' enumeration. Updated the 'ShieldState' enumeration by removing unused methods from it.
Daniel Grigencha
2024-12-03 00:49:09 +01:00
5cf9746931
Updated 'PieceState' enumeration. Updated the 'PieceState' enumeration by removing unused methods from it.
Daniel Grigencha
2024-12-03 00:48:39 +01:00
5b9bc7aa36
Updated 'Piece' class. Updated the 'Piece' class by removing the unused 'id' parameter from the constructor.
Daniel Grigencha
2024-12-03 00:38:24 +01:00
abe66aff5d
Updated 'LobbyState' class. Updated 'LobbyState' class by removed unused imports in it.
Daniel Grigencha
2024-12-03 00:37:24 +01:00
9ef897f873
minor changes
Benjamin Feyer
2024-12-02 23:26:45 +01:00
eea566cc8b
added the logic for server shutdown
Fleischer Hanno
2024-12-02 23:25:54 +01:00