Cedric Beck
208261c6bf
added clickDice Action + modelSync
2024-12-02 17:11:55 +01:00
Hanno Fleischer
0411f2ead4
fixed state transitions in gamestateclient automaton
2024-12-02 17:08:46 +01:00
Cedric Beck
eb819d4d5e
merge development
2024-12-02 16:49:37 +01:00
Cedric Beck
a2856bb157
added rollRankingResults
2024-12-02 16:47:28 +01:00
Daniel Grigencha
bcf17a0651
Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development
2024-12-02 16:35:49 +01:00
Daniel Grigencha
eee6fccde5
Updated 'DetermineStartPlayerState' class.
...
Updated the 'DetermineStartPlayerState' class by setting the start state correctly and enter it.
2024-12-02 16:35:40 +01:00
Felix Koppe
2118c72891
Adjust RollDiceNotification
2024-12-02 16:34:55 +01:00
Daniel Grigencha
cb362c4d0c
Used auto-reformate code.
2024-12-02 16:31:57 +01:00
Daniel Grigencha
1bcb73cff7
Updated 'PlayerData' class.
...
Updated the 'PlayerData' class by adding the 'isFinished' method to it. In Addition, the empty constructor was optimized to initalize all class attributes for serializable cases.
2024-12-02 16:29:32 +01:00
Daniel Grigencha
167d898a3c
Updated 'StartNode' class.
...
Updated the 'StartNode' class by reverting all enumerations to its origin types in it.
2024-12-02 16:25:33 +01:00
Daniel Grigencha
6c136b78b8
Updated 'Piece' class.
...
Updated the 'Piece' class by reverting all enumeration to its orgin types.
2024-12-02 16:22:50 +01:00
Felix Koppe
82234a7ff9
Merge commit
2024-12-02 15:44:41 +01:00
Felix Koppe
92d2e74748
Fix error regarding color in lobbyState
2024-12-02 13:06:59 +01:00
Felix Koppe
4561a962d4
Fix lobby isSelf logic and no longer assign color on join
2024-12-02 12:52:07 +01:00
Hanno Fleischer
5db7b64cef
fixed bug with seriliazation of Board, now sending playerdata seperate from teh board
2024-12-02 12:16:53 +01:00
Felix Koppe
bb1b721e77
Fix lobby in serverAutomaton and adjust TskUpdateMessage
2024-12-02 11:48:54 +01:00
Cedric Beck
206cad2f79
removed test card
2024-12-02 11:01:02 +01:00
Cedric Beck
3717e7b794
added javadocs to board
2024-12-02 03:48:11 +01:00
Cedric Beck
a15d7932d4
fixed bug
2024-12-02 03:15:18 +01:00
Cedric Beck
d649e41e75
Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development
2024-12-02 03:13:48 +01:00
Cedric Beck
6d0552f5a7
added javadocs to animation; moved outline package
2024-12-02 03:13:42 +01:00
Fleischer Hanno
47f9f46277
Merge remote-tracking branch 'origin/development' into development
2024-12-02 03:03:47 +01:00
Felix Koppe
b87f5de5fb
Fix error
2024-12-02 03:03:54 +01:00
Fleischer Hanno
c434bcb684
minor changes
2024-12-02 03:03:36 +01:00
Daniel Grigencha
b9617c0a14
Merge remote-tracking branch 'origin/development' into development
2024-12-02 02:53:05 +01:00
Daniel Grigencha
0aa73ca6ee
added the received method for a Shutdown Message
2024-12-02 02:52:48 +01:00
Cedric Beck
fbc7246037
Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development
2024-12-02 02:52:41 +01:00
Cedric Beck
2703084df1
added move/swap/throw animation; reworked waitingNodes logic in BoardHandler
2024-12-02 02:51:52 +01:00
Daniel Grigencha
31b1d535ac
added a new 'ShutdownMessage' for the server
2024-12-02 02:32:50 +01:00
Daniel Grigencha
b3fb2f8fa4
added a new 'ShutdownMessage' for the server
2024-12-02 02:31:55 +01:00
Daniel Grigencha
8fcac9b809
Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development
2024-12-02 02:15:29 +01:00
Daniel Grigencha
6985d988f4
Updated 'DetermineStartPlayerState' class.
...
Updated the 'DetermineStartPlayerState' class by updating the logic inside the 'received(RequestDieMessage msg, int from)' method in it.
2024-12-02 02:15:22 +01:00
Fleischer Hanno
6c3103b2ed
fixing serialization error
2024-12-02 02:14:45 +01:00
Fleischer Hanno
3658c88d72
made all enums look like the color enum
2024-12-02 02:11:40 +01:00
Fleischer Hanno
bfc812b003
minas please help no serialization
2024-12-02 02:07:02 +01:00
Felix Koppe
413f35d7bf
Merge commit
2024-12-02 01:59:49 +01:00
Felix Koppe
c5cb3d4dd0
Add restart on resolution change
2024-12-02 01:59:37 +01:00
Daniel Grigencha
efb4439431
Updated 'Game' class.
...
Updated the 'Game' class by adding the 'setDie' method to it.
2024-12-02 01:53:10 +01:00
Felix Koppe
601366f08d
Merge commit
2024-12-02 01:40:58 +01:00
Felix Koppe
918c1f2a8a
Add videoSettings
2024-12-02 01:40:45 +01:00
Daniel Grigencha
bf75b8afc9
Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development
2024-12-02 01:39:07 +01:00
Daniel Grigencha
0b45727bd7
Updated 'Die' class.
...
Updated the 'Die' class by adding a third constructor for test cases.
2024-12-02 01:39:01 +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
