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 |
|
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 |
|
Benjamin Feyer
|
48923cddd6
|
Merge branch 'development' into 'dev/test'
merge dev into test
See merge request progproj/gruppen-ht24/Gruppe-01!28
|
2024-12-01 22:11:24 +00:00 |
|
Benjamin Feyer
|
a1934e30cb
|
minor changes
|
2024-12-01 23:08:56 +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 |
|
Felix Koppe
|
bec199036c
|
Minor change
|
2024-12-01 23:10:25 +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 |
|
Cedric Beck
|
12cb87ef70
|
added outline package back
|
2024-12-01 22:56:09 +01:00 |
|
Cedric Beck
|
9cb7a156bb
|
Merge branch 'development' into dev/client_beck
|
2024-12-01 22:47:48 +01:00 |
|
Fleischer Hanno
|
76e2606847
|
reverted the client state machine
|
2024-12-01 22:47:13 +01:00 |
|
Cedric Beck
|
7762b97303
|
added init & taktical view by ownColor
|
2024-12-01 22:46:17 +01:00 |
|
Daniel Grigencha
|
eaf46f3e14
|
updated the project to pass the checkstyle
|
2024-12-01 22:37:49 +01:00 |
|
Fleischer Hanno
|
92be52b62a
|
fixed server join logic
|
2024-12-01 22:33:30 +01:00 |
|
Fleischer Hanno
|
7a0a3589a5
|
trying to fix server ip to use outward ip
|
2024-12-01 22:14:09 +01:00 |
|
Cedric Beck
|
661c28f096
|
merge to dev/client_beck from development
|
2024-12-01 22:06:30 +01:00 |
|
Benjamin Feyer
|
9718ad111f
|
Merge branch 'development' into 'dev/test'
merge Development into test
See merge request progproj/gruppen-ht24/Gruppe-01!27
|
2024-12-01 20:56:49 +00:00 |
|
Cedric Beck
|
4a94e85aac
|
Merge branch 'dev/client' into dev/client_beck
|
2024-12-01 21:55:37 +01:00 |
|
Felix Koppe
|
799bd096a0
|
Merge development
|
2024-12-01 21:56:52 +01:00 |
|
Benjamin Feyer
|
6370ec15c2
|
added minor changes
|
2024-12-01 21:53:38 +01:00 |
|
Fleischer Hanno
|
5a68d3b146
|
fixed a method call for getMoveIndices
|
2024-12-01 21:52:28 +01:00 |
|
Cedric Beck
|
63fa692910
|
removed comments
|
2024-12-01 21:52:28 +01:00 |
|
Felix Koppe
|
638cb93d7b
|
Merge dev/client_beck
|
2024-12-01 21:51:01 +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 |
|
Cedric Beck
|
7db75a2ca1
|
added converted assets
|
2024-12-01 21:48:40 +01:00 |
|
Daniel Grigencha
|
71d5701cc7
|
added javadoc for the classes in the notification package
|
2024-12-01 21:44:35 +01:00 |
|
Benjamin Feyer
|
1c826bcec0
|
added comments
|
2024-12-01 21:12:19 +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 |
|
Benjamin Feyer
|
bd9d8c688d
|
Merge branch 'development' into 'dev/test'
merge development into test
See merge request progproj/gruppen-ht24/Gruppe-01!26
|
2024-12-01 20:02:47 +00: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 |
|
Cedric Beck
|
da2b1af698
|
fixed shutdown guiHandler bug
|
2024-12-01 20:45:24 +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 |
|
Cedric Beck
|
e5b007accd
|
debug commit
|
2024-12-01 20:24:26 +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 |
|