Felix Koppe
138444439d
Merge remote-tracking branch 'origin/development' into development
2024-12-02 00:53:58 +01:00
Felix Koppe
702f96b8db
Add videoSettings
2024-12-02 00:53:11 +01:00
Fleischer Hanno
c649b8f3ae
creating MapCreation Notification
2024-12-02 00:44:11 +01:00
Daniel Grigencha
41a669d44d
Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development
2024-12-02 00:42:17 +01:00
Daniel Grigencha
4b6b12c0ac
Updated 'Board' class.
...
Updated the 'Board' class by adding the 'addPlayerData' method to it.
2024-12-02 00:42:07 +01:00
Daniel Grigencha
c1280ba089
Updated 'LobbyState' class.
...
Updated the 'LobbyState' class by adding 'initializeGame' method to it.
2024-12-02 00:40:21 +01:00
Felix Koppe
02f285a258
Remove cheat button
2024-12-02 00:39:58 +01:00
Daniel Grigencha
bcb0ebc0f8
Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development
2024-12-02 00:29:21 +01:00
Daniel Grigencha
a19902f819
Updated 'LobbyState' class.
...
Updated the 'LobbyState' class by changing the method call 'isActive' to 'isReady'.
2024-12-02 00:28:59 +01:00
Fleischer Hanno
585687055c
Merge remote-tracking branch 'origin/development' into development
2024-12-02 00:28:41 +01:00
Fleischer Hanno
a86319082c
included the LobbyPlayerJoined MEssage parameter of isHost
2024-12-02 00:28:04 +01:00
Daniel Grigencha
7acc55fe25
Updated 'MdgaServer' class.
...
Updated the 'MdgaServer' class by saving the host into the 'Game' class.
2024-12-02 00:28:01 +01:00
Daniel Grigencha
3e56de2a17
Updated 'LobbyState' class.
...
Updated the 'LobbyState' class by changing the method call 'isActive' to 'isReady'.
2024-12-02 00:23:03 +01:00
Daniel Grigencha
468cd97374
Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development
2024-12-02 00:20:41 +01:00
Daniel Grigencha
dee6bf9f9c
Updated 'Game' class.
...
Updated the 'Game' class by adding the 'host' attribute and its getter method to it.
2024-12-02 00:19:46 +01:00
Daniel Grigencha
ea6431faa4
Updated 'LobbyPlayerJoinedMessage' class.
...
Updated the 'LobbyPlayerJoinedMessage' class by adding the 'host' attribute and its getter method to.
2024-12-02 00:12:46 +01:00
Cedric Beck
f272fd6f08
fixed bug again
2024-12-02 00:10:58 +01:00
Cedric Beck
bfc74ee126
fixed bug
2024-12-02 00:04:48 +01:00
Cedric Beck
d890d11978
Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development
2024-12-01 23:58:57 +01:00
Daniel Grigencha
9af20346f1
Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development
2024-12-01 23:58:44 +01:00
Cedric Beck
f853b0b54f
Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development
2024-12-01 23:57:59 +01:00
Cedric Beck
9dd2d3f58b
added finish text; edited Notifications
2024-12-01 23:57:53 +01:00
Daniel Grigencha
06e43903e6
Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development
2024-12-01 23:57:39 +01:00
Fleischer Hanno
00a04c2403
fixed a bug
2024-12-01 23:57:39 +01:00
Daniel Grigencha
92cbd9202a
Updated 'LobbyState' class.
...
Updated the 'LobbyState' class by fixing the error by sending the 'ServerStartGameMessage' after all players are ready.
2024-12-01 23:57:26 +01:00
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
8137a727f5
Merge remote-tracking branch 'origin/development' into development
2024-12-01 23:49:30 +01:00
Felix Koppe
d904a28ee0
Remove mock
2024-12-01 23:48:18 +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
697b974ce1
Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development
2024-12-01 23:42:09 +01:00
Felix Koppe
f0cab64910
Minor change
2024-12-01 23:46:46 +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
Cedric Beck
eaef4b20ba
Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development
2024-12-01 23:34:02 +01:00
Cedric Beck
d3fe2fec14
added show/hide functionality for select button
2024-12-01 23:33:28 +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
Felix Koppe
bec199036c
Minor change
2024-12-01 23:10:25 +01:00
Fleischer Hanno
a7e048d4b4
Merge remote-tracking branch 'origin/development' into development
2024-12-01 23:08:50 +01:00
Felix Koppe
bcd510804f
Merge commit
2024-12-01 23:12:46 +01:00
Felix Koppe
7319f7a62c
Process startMenuNotification in lobby
2024-12-01 23:12:36 +01:00
Fleischer Hanno
a1e51fb2f4
added logic to the leave game method
2024-12-01 23:08:25 +01:00
Daniel Grigencha
f15d0eb5d8
Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development
2024-12-01 23:06:31 +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
Felix Koppe
5905a232a5
Adjust state
2024-12-01 23:03:26 +01:00
