Benjamin Feyer
0aeb02a5f2
Merge branch 'development' into 'dev/test'
...
merge dev into test
See merge request progproj/gruppen-ht24/Gruppe-01!30
2024-12-02 00:29:39 +00:00
Benjamin Feyer
5240150ec2
added some parts of test-method piecetest
2024-12-02 01:28:42 +01:00
Daniel Grigencha
a19ac2fc51
Updated 'GameState' class.
...
Updated the 'GameState' class by changing the data types of 'determineStartPlayerState, 'animationState' and 'turnState' attributes in it.
2024-12-02 01:27:21 +01:00
Daniel Grigencha
79f0e55c52
default value of playerData in 'Board'
2024-12-02 01:19:41 +01:00
Fleischer Hanno
44378486d4
Merge remote-tracking branch 'origin/development' into development
2024-12-02 01:17:14 +01:00
Fleischer Hanno
149931d2cb
fixed PlayerData mistake
2024-12-02 01:16:33 +01:00
Daniel Grigencha
1250500558
Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development
2024-12-02 01:01:49 +01:00
Daniel Grigencha
177bfe3001
Updated 'DetermineStartPlayerState' class.
...
Updated the 'DeterminStartPlayerState' class by removing the 'getDiceResults' method from it. In Addition, the logic inside the 'received(RequestDieMessage msg, int from)' was added.
2024-12-02 01:01:42 +01:00
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
1b6407b75b
fixed bug
2024-12-02 00:52:28 +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
Benjamin Feyer
7bf41bc358
Merge branch 'development' into 'dev/test'
...
merge dev int test
See merge request progproj/gruppen-ht24/Gruppe-01!29
2024-12-01 22:33:42 +00: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
