Felix Koppe
9a06afe998
Merge commit
2024-12-01 23:56:33 +01:00
Felix Koppe
289390c528
Add comment
2024-12-01 23:56:24 +01:00
Fleischer Hanno
7712a23d00
added transition from Lobby to Game
2024-12-01 23:50:37 +01:00
Fleischer Hanno
2f2d9c7479
Merge remote-tracking branch 'origin/development' into development
2024-12-01 23:42:56 +01:00
Fleischer Hanno
c2b6e6e9e9
made all classes for ServerStartGameMEssage serializiable
2024-12-01 23:42:32 +01:00
Daniel Grigencha
adcf65d7aa
Updated 'LobbyState' class.
...
Updated the 'LobbyState' class by sending a broadcast message after all players are ready. In Addition, the 'ServerStartGameMessage' getting the 'Board' object.
2024-12-01 23:41:10 +01:00
Daniel Grigencha
8f53b76a3e
Updated 'ServerStartGameMessage' class.
...
Updated the 'ServerStartGameMessage' class by adding the 'board' attribute and its getter method to it.
2024-12-01 23:39:36 +01:00
Daniel Grigencha
02d7ef1dd8
Updated 'ChoosePieceState' class.
...
Updated the 'ChoosePieceState' to work correctly as a state automaton.
2024-12-01 23:28:50 +01:00
Daniel Grigencha
23aa2db714
Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development
2024-12-01 23:27:50 +01:00
Daniel Grigencha
e68369074f
Updated 'RollDiceState' class.
...
Updated the 'RollDiceState' class by removing a spelling mistake.
2024-12-01 23:27:45 +01:00
Daniel Grigencha
aafc804c3f
Updated 'ChoosePieceState' class.
...
Updated the 'ChoosePieceState' to work correctly as a state automaton.
2024-12-01 23:26:53 +01:00
Fleischer Hanno
a1e51fb2f4
added logic to the leave game method
2024-12-01 23:08:25 +01:00
Daniel Grigencha
f484a4abc8
Updated server states.
...
Updated server stats by adding the logger to all states. In Addition, new joined clients should be updated correctly.
2024-12-01 23:06:02 +01:00
Fleischer Hanno
76e2606847
reverted the client state machine
2024-12-01 22:47:13 +01:00
Daniel Grigencha
eaf46f3e14
updated the project to pass the checkstyle
2024-12-01 22:37:49 +01:00
Cedric Beck
661c28f096
merge to dev/client_beck from development
2024-12-01 22:06:30 +01:00
Felix Koppe
799bd096a0
Merge development
2024-12-01 21:56:52 +01:00
Fleischer Hanno
133f900ec7
added the server and network functionality for mdga and fixed the communication in the Lobby
2024-12-01 21:50:28 +01:00
Fleischer Hanno
33ddea4221
Merge remote-tracking branch 'origin/development' into development
2024-12-01 21:49:30 +01:00
Daniel Grigencha
977a7294ad
updated server state diagram and added missing classes
2024-12-01 21:49:11 +01:00
Daniel Grigencha
71d5701cc7
added javadoc for the classes in the notification package
2024-12-01 21:44:35 +01:00
Fleischer Hanno
42feca466d
Merge remote-tracking branch 'origin/development' into development
2024-12-01 21:05:41 +01:00
Daniel Grigencha
95a1f8d858
removed all inheritance of the automaton for testing purposes
2024-12-01 21:05:22 +01:00
Fleischer Hanno
76757c19a9
Merge remote-tracking branch 'origin/development' into development
2024-12-01 21:02:11 +01:00
Daniel Grigencha
c3fdcf4dc7
added the states of the server automaton for testing purposes
2024-12-01 21:01:37 +01:00
Fleischer Hanno
8ffab12f49
Merge remote-tracking branch 'origin/development' into development
2024-12-01 20:57:57 +01:00
Daniel Grigencha
8369797120
added JavaDocs for the 'InterruptState' classe
2024-12-01 20:41:30 +01:00
Daniel Grigencha
ef450a23f5
added logger to server state chart
2024-12-01 20:35:40 +01:00
Daniel Grigencha
17f0aa0209
added the 'Die' class to the 'Game' class
2024-12-01 19:46:59 +01:00
Fleischer Hanno
1d8eff8ea9
Merge remote-tracking branch 'origin/development' into development
2024-12-01 19:45:06 +01:00
Daniel Grigencha
ff31335a98
added a new class 'Die' to handle the dice. added this class to the class 'Game'
2024-12-01 19:38:26 +01:00
Daniel Grigencha
3467dd2f04
added a new method getColorByIndex(int) and next() method to the enum 'Color'
2024-12-01 19:37:40 +01:00
Daniel Grigencha
fb6cfaa518
added JavaDocs for the classes in the package 'game'
2024-12-01 19:36:58 +01:00
Fleischer Hanno
e9d45f241f
Merge remote-tracking branch 'origin/development' into development
2024-12-01 18:22:29 +01:00
Daniel Grigencha
bf38a7e00c
added a new method 'disconnectClient' in 'ServerSender' interface
2024-12-01 18:21:54 +01:00
Fleischer Hanno
b83279e835
Merge remote-tracking branch 'origin/development' into development
2024-12-01 18:16:05 +01:00
Cedric Beck
453aacfe1a
fixed missing messages
2024-12-01 18:12:31 +01:00
Daniel Grigencha
1513576291
added javadocs to the 'ServerState' class
2024-12-01 18:03:46 +01:00
Cedric Beck
2732a89da6
fixed error with SelectObjectOutliner
2024-12-01 17:47:04 +01:00
Fleischer Hanno
5206b03966
added java docs
2024-12-01 17:03:56 +01:00
Cedric Beck
eb703cbd2c
fixed bad performancegit status!; edited GameNotification; fixed error because of changed 'Color' enum
2024-12-01 17:03:09 +01:00
Daniel Grigencha
8c03b282b3
deleted the color attribute and their usages
2024-12-01 16:58:37 +01:00
Daniel Grigencha
efc7a2f09d
added logic to the 'LobbyState' class
...
- for leaving the lobby
2024-12-01 16:49:05 +01:00
Daniel Grigencha
121d668bf2
added logic to the 'LobbyState' class
2024-12-01 16:08:14 +01:00
Fleischer Hanno
ba5b9dc4b4
added the getter for the forcestartGame value in teh corresponding message
2024-12-01 16:04:55 +01:00
Daniel Grigencha
772c7a51e0
updated enum 'Color'
2024-12-01 15:54:06 +01:00
Fleischer Hanno
ed04bc1119
changed all messages to work with a UUID of a piece instead of a string identifier
2024-12-01 15:45:30 +01:00
Fleischer Hanno
7712ee2e7c
renamed JoinServerMessage to JoinedLobbyMessage and wrote a getter for the name in the message
2024-12-01 15:14:42 +01:00
Fleischer Hanno
1d5733a4b9
added a method for getting a piece through a uuid
2024-12-01 15:05:26 +01:00
Fleischer Hanno
dfea7e8736
added java docs for choosepowercard
2024-12-01 14:37:04 +01:00
