960 Commits

Author SHA1 Message Date
Benjamin Feyer
cecd7e1a23 fixed buck 2024-12-11 19:59:01 +01:00
Hanno Fleischer
f9772732c4 added better network support and disconnecting doesnt clos the client who hosts the server now 2024-12-11 19:10:46 +01:00
Benjamin Feyer
f09766eb42 Merge remote-tracking branch 'origin/development2' into development2
# Conflicts:
#	Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/rolldice/FirstRollState.java
#	Projekte/mdga/model/src/test/java/pp/mdga/client/clientState/ClientStateTest.java
#	Projekte/mdga/model/src/test/java/pp/mdga/game/PieceTest.java
2024-12-11 17:16:26 +01:00
Benjamin Feyer
62e3dd7932 fixed some tests 2024-12-11 17:13:59 +01:00
Hanno Fleischer
d80499a18a Merge remote-tracking branch 'origin/development2' into development2 2024-12-11 16:50:18 +01:00
Hanno Fleischer
4b665c4cf2 getter and setter fo isDied 2024-12-11 16:49:45 +01:00
Cedric Beck
3048caf5c9 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 2024-12-11 14:23:44 +01:00
Cedric Beck
b8df688ba3 added highlight/hover/select to nodes 2024-12-11 14:23:24 +01:00
Hanno Fleischer
8201ab4b63 added error handling when the drawpile is empty 2024-12-11 14:11:07 +01:00
Felix Koppe
14a407b7d5 Merge commit 2024-12-11 13:57:43 +01:00
Felix Koppe
170a282077 Add selectNext 2024-12-11 13:56:55 +01:00
Hanno Fleischer
5854609b12 added notification to change to startdialog state when calling next in statitics state 2024-12-11 13:43:15 +01:00
Hanno Fleischer
ea25f66dae wrote getter for ceremonyview in mdga app 2024-12-11 13:34:38 +01:00
Felix Koppe
c069a61f2d Merge commit 2024-12-11 13:12:51 +01:00
Felix Koppe
07029407d8 Add ceremony 2024-12-11 13:11:48 +01:00
Hanno Fleischer
42a73ceb24 after switching from spectator to animation you should now be reset correctly into spectator 2024-12-11 13:03:39 +01:00
Hanno Fleischer
42283f29a0 fixed missing passthrough statement in choosepiecestate 2024-12-11 12:28:48 +01:00
Hanno Fleischer
574f8bb681 added java docs 2024-12-11 12:00:39 +01:00
Hanno Fleischer
c1641cdac1 added the possibility when someone rolls a 6 and then has no valid move he can dice again 2024-12-11 10:54:50 +01:00
Cedric Beck
f251bad97f fixed node selected after clear 2024-12-11 08:59:21 +00:00
Felix Koppe
f8a021b310 Fix error in notification syncronizer 2024-12-11 08:40:31 +01:00
Daniel Grigencha
aa44b84648 removed unused imports and reformatted the code for code style 2024-12-11 05:34:34 +01:00
Benjamin Feyer
d8816be811 fixed some tests 2024-12-11 01:03:18 +01:00
Benjamin Feyer
e61265fc99 fixed some tests 2024-12-11 00:25:14 +01:00
Benjamin Feyer
9e2a0819ca fixed some tests 2024-12-10 21:18:31 +01:00
Benjamin Feyer
cc756453a1 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 2024-12-10 21:03:21 +01:00
Benjamin Feyer
f23f1f5abc fixed some tests 2024-12-10 21:03:07 +01:00
Benjamin Feyer
cc8b2abbde fixed some tests 2024-12-10 20:56:08 +01:00
Hanno Fleischer
8d7701cbf2 removed presentation die results 2024-12-10 20:50:48 +01:00
Hanno Fleischer
874bba0fe9 removed starting alone ability 2024-12-10 20:47:51 +01:00
Hanno Fleischer
3b73d1229b fixed ceremony statetransition 2024-12-10 19:30:58 +01:00
Hanno Fleischer
9f1dafece2 added Ceremony integration 2024-12-10 19:29:06 +01:00
Hanno Fleischer hanno.fleischer@unibw.de
997b31eba2 reverted turbo card percentages to normal 2024-12-10 15:56:16 +01:00
Felix Koppe
148b769232 Add missing sound 2024-12-10 15:43:35 +01:00
Hanno Fleischer
f0f4e0eb5e added presentation die results and powercards as well as fixed a bug where when a piece was thrown with a suppressed shield it wouldnt be cleared 2024-12-10 15:06:35 +01:00
Cedric Beck
bda1a40cdb Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 2024-12-10 14:53:26 +01:00
Cedric Beck
0c8cb92fe8 fix anims 2024-12-10 14:53:16 +01:00
Fleischer Hanno
e952233d20 added a hashset to fix double checking of powercards in the visitor 2024-12-10 14:36:26 +01:00
Cedric Beck
9f8fd9c22f changed var name 2024-12-10 14:34:44 +01:00
Cedric Beck
0432dd6bd7 merge 2024-12-10 14:29:02 +01:00
Cedric Beck
4d31fc098b fixed swap bug 2024-12-10 14:27:50 +01:00
Benjamin Feyer
40a61daa58 added flag 2024-12-10 14:07:52 +01:00
Benjamin Feyer
6e54ad0196 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 2024-12-10 14:06:25 +01:00
Benjamin Feyer
11fa303f1b added flag 2024-12-10 14:05:43 +01:00
Fleischer Hanno
d65111680b added RankingResponseNotification to be sent to the client 2024-12-10 13:55:58 +01:00
Felix Koppe
485b8f36d7 Merge commit7 2024-12-10 13:57:08 +01:00
Felix Koppe
4eee62079e Add RankingResponceNotification 2024-12-10 13:56:42 +01:00
Cedric Beck
888b52f314 moved timermanger to app 2024-12-10 13:38:26 +01:00
Cedric Beck
bc2c80dd27 added asfjiop 2024-12-10 13:28:40 +01:00
Cedric Beck
50f0cdfce6 added timermanager 2024-12-10 13:26:56 +01:00