Gruppe-01-fin

peet/Gruppe-01-fin

Fork 0

Commit Graph

Select branches

Hide Pull Requests

b_Bauer_Lukas

b_Beck_Cedric

b_Brennfoerder_Timo

b_Feyer_Benjamin

b_Fleischer_Hanno

b_Grigencha_Daniel

b_koppe_felix

dev/client

dev/client_beck

dev/client_koppe

dev/client_koppe2

dev/model

dev/server_h

dev/test

dev_client

development

development2

main

view_assets

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#5

#6

#7

#8

#9

Version1.0

Version1.1

Version1.1.1

8ffab12f49 Merge remote-tracking branch 'origin/development' into development Fleischer Hanno 2024-12-01 20:57:57 +01:00
da2b1af698 fixed shutdown guiHandler bug Cedric Beck 2024-12-01 20:45:24 +01:00
8369797120 added JavaDocs for the 'InterruptState' classe Daniel Grigencha 2024-12-01 20:41:30 +01:00
ef450a23f5 added logger to server state chart Daniel Grigencha 2024-12-01 20:35:40 +01:00
e5b007accd debug commit Cedric Beck 2024-12-01 20:24:26 +01:00
17f0aa0209 added the 'Die' class to the 'Game' class Daniel Grigencha 2024-12-01 19:46:59 +01:00
1d8eff8ea9 Merge remote-tracking branch 'origin/development' into development Fleischer Hanno 2024-12-01 19:45:06 +01:00
ff31335a98 added a new class 'Die' to handle the dice. added this class to the class 'Game' Daniel Grigencha 2024-12-01 19:38:26 +01:00
3467dd2f04 added a new method getColorByIndex(int) and next() method to the enum 'Color' Daniel Grigencha 2024-12-01 19:37:40 +01:00
fb6cfaa518 added JavaDocs for the classes in the package 'game' Daniel Grigencha 2024-12-01 19:36:58 +01:00
c08c81ea46 edited map Cedric Beck 2024-12-01 18:42:57 +01:00
e9d45f241f Merge remote-tracking branch 'origin/development' into development Fleischer Hanno 2024-12-01 18:22:29 +01:00
bf38a7e00c added a new method 'disconnectClient' in 'ServerSender' interface Daniel Grigencha 2024-12-01 18:21:54 +01:00
5d638a1da7 Merge remote-tracking branch 'origin/development' into development Fleischer Hanno 2024-12-01 18:20:16 +01:00
b83279e835 Merge remote-tracking branch 'origin/development' into development Fleischer Hanno 2024-12-01 18:16:05 +01:00
eb54cfbc80 adjusted constructor for mdga server Daniel Grigencha 2024-12-01 18:15:56 +01:00
453aacfe1a fixed missing messages Cedric Beck 2024-12-01 18:12:31 +01:00
1513576291 added javadocs to the 'ServerState' class Daniel Grigencha 2024-12-01 18:03:46 +01:00
2732a89da6 fixed error with SelectObjectOutliner Cedric Beck 2024-12-01 17:47:04 +01:00
5b8032bed9 Prepare for model Felix Koppe 2024-12-01 17:44:37 +01:00
21f98de3e6 Minor adjustment Felix Koppe 2024-12-01 17:32:05 +01:00
b099972656 merge from dev/client_beck Cedric Beck 2024-12-01 17:10:04 +01:00
5206b03966 added java docs Fleischer Hanno 2024-12-01 17:03:56 +01:00
eb703cbd2c fixed bad performancegit status!; edited GameNotification; fixed error because of changed 'Color' enum Cedric Beck 2024-12-01 17:03:09 +01:00
8c03b282b3 deleted the color attribute and their usages Daniel Grigencha 2024-12-01 16:58:37 +01:00
a29e942191 added logic to the 'MdgaServer' class Daniel Grigencha 2024-12-01 16:57:48 +01:00
efc7a2f09d added logic to the 'LobbyState' class - for leaving the lobby Daniel Grigencha 2024-12-01 16:49:05 +01:00
121d668bf2 added logic to the 'LobbyState' class Daniel Grigencha 2024-12-01 16:08:14 +01:00
ba5b9dc4b4 added the getter for the forcestartGame value in teh corresponding message Fleischer Hanno 2024-12-01 16:04:55 +01:00
772c7a51e0 updated enum 'Color' Daniel Grigencha 2024-12-01 15:54:06 +01:00
ed04bc1119 changed all messages to work with a UUID of a piece instead of a string identifier Fleischer Hanno 2024-12-01 15:45:30 +01:00
7712ee2e7c renamed JoinServerMessage to JoinedLobbyMessage and wrote a getter for the name in the message Fleischer Hanno 2024-12-01 15:14:42 +01:00
1d5733a4b9 added a method for getting a piece through a uuid Fleischer Hanno 2024-12-01 15:05:26 +01:00
a1bd8007de added some comments in Piecetest Benjamin Feyer 2024-12-01 14:59:56 +01:00
dfea7e8736 added java docs for choosepowercard Fleischer Hanno 2024-12-01 14:37:04 +01:00
55ef5438d2 added som javadoc in the PieceTest-class Benjamin Feyer 2024-12-01 14:31:06 +01:00
d7b0ac92b8 added in PieceTest the declaration and initialization of two players Benjamin Feyer 2024-12-01 14:23:26 +01:00
2c81665f80 Update startmenu.png Felix Koppe 2024-12-01 14:22:18 +01:00
150e4e4c22 Merge development Felix Koppe 2024-12-01 14:18:44 +01:00
4ff84e64ed Merge development Felix Koppe 2024-12-01 14:11:10 +01:00
0d043e4bb4 added some more messages to test the server Benjamin Feyer 2024-12-01 14:10:05 +01:00
e6fb78507c Remove garbarge files Felix Koppe 2024-12-01 14:10:04 +01:00
9067a9b04c Add javadoc Felix Koppe 2024-12-01 14:08:33 +01:00
6758abd60e Add javadoc to buttons Felix Koppe 2024-12-01 13:56:45 +01:00
e70331d85d changed parameter of DieMessage and included the force resumgame logic in intterrupt Fleischer Hanno 2024-12-01 13:56:31 +01:00
c3ad8fe79a Gerneral improvements Felix Koppe 2024-12-01 13:35:14 +01:00
26d2d0587d added the remaining logic for GameState and its substatemachines Fleischer Hanno 2024-12-01 12:36:44 +01:00
27de0ccece Merge branch 'development' into 'dev/test' Benjamin Feyer 2024-12-01 11:14:19 +00:00
8d49528a92 added the nextmethods Benjamin Feyer 2024-12-01 12:13:29 +01:00
00b3ef1d80 added selectNext in CLG Fleischer Hanno 2024-12-01 12:12:37 +01:00
8b1868e03b Merge branch 'development' into 'dev/test' Benjamin Feyer 2024-12-01 11:10:24 +00:00
56f32c5c0b edited some comments in the methods and wrote in som methods, to test unwanted statechanges Benjamin Feyer 2024-12-01 12:09:13 +01:00
789868863f added some more client game logic Fleischer Hanno 2024-12-01 12:06:06 +01:00
bdc527b83e added more logic to the client (choosepiece and powercard) Fleischer Hanno 2024-12-01 08:40:16 +01:00
c41848b061 adjusted some Todos and deleted some mention of statemachines Benjamin Feyer 2024-12-01 00:35:46 +01:00
0fd190419d Merge branch 'development' into 'dev/test' Benjamin Feyer 2024-11-30 23:34:40 +00:00
5ff56ed9d8 added all necessary logic for the turn waiting class and adjusted some messages Fleischer Hanno 2024-11-30 22:23:40 +01:00
81d037d232 made the determinstartplayer machine fully functional Fleischer Hanno 2024-11-30 20:50:57 +01:00
422e94ec48 Dialog state machine is now fully functional Fleischer Hanno 2024-11-30 19:49:52 +01:00
b3d754e77f added all current State getter in every client state machine Fleischer Hanno 2024-11-30 16:42:24 +01:00
0297193be1 added more functionality to the client state machine and implemeted the first notifications Fleischer Hanno 2024-11-30 16:23:09 +01:00
a630ade2e1 Fix lobbyView leave Felix Koppe 2024-11-30 14:21:45 +01:00
b197d70d44 Fix errors Felix Koppe 2024-11-30 14:18:00 +01:00
67d120c278 Fix error Felix Koppe 2024-11-30 14:10:42 +01:00
d53067f21a Merge dev/client Felix Koppe 2024-11-30 14:03:54 +01:00
4313468a0c Finish merge Felix Koppe 2024-11-30 14:00:42 +01:00
0393e9b534 Fixing errors Felix Koppe 2024-11-30 13:47:34 +01:00
f3bc6bc2f0 Fixing errors Felix Koppe 2024-11-30 13:38:08 +01:00
12abe081c9 Minor changes Felix Koppe 2024-11-30 13:21:31 +01:00
02b536aa82 102IQ Felix Koppe 2024-11-30 13:17:53 +01:00
99ffee749e 101IQ Felix Koppe 2024-11-30 13:14:41 +01:00
6f71a8b16d Work# Felix Koppe 2024-11-30 13:12:51 +01:00
a78b3acacd 100IQ Felix Koppe 2024-11-30 13:10:46 +01:00
0487ff0238 modified messages to work with piece uuid instead of an identifier. Fleischer Hanno 2024-11-30 13:02:23 +01:00
6a85aca970 Readd .run after some fool deleted it Felix Koppe 2024-11-30 12:56:12 +01:00
c2cfd8c175 Merge remote-tracking branch 'origin/dev/client_beck' into dev/client_beck Felix Koppe 2024-11-30 12:48:49 +01:00
af5d4a95cd Remove notifications Felix Koppe 2024-11-30 12:45:08 +01:00
129ce54dd8 Merge branch 'refs/heads/development' into dev/client_beck Felix Koppe 2024-11-30 12:44:04 +01:00
8c8bd4db0d Add sounds Felix Koppe 2024-11-30 12:37:18 +01:00
1c222ce0e0 tried mergee with development Cedric Beck 2024-11-30 12:36:09 +01:00
f7a34d0d59 tried merge with dev/client Cedric Beck 2024-11-30 12:34:39 +01:00
cbb21e92f8 added init/shutdown Cedric Beck 2024-11-30 12:07:42 +01:00
4d6cd63a3d made all notifications constructors public Fleischer Hanno 2024-11-30 11:24:46 +01:00
36d31e99e9 Fix error Felix Koppe 2024-11-30 11:19:54 +01:00
28a2c9a448 Add confirm button Felix Koppe 2024-11-30 11:17:42 +01:00
dd8b16f1ac Merge commit Felix Koppe 2024-11-30 10:52:44 +01:00
be15b3bd63 Minor changes Felix Koppe 2024-11-30 10:51:35 +01:00
07f0f55192 added further notification implemenation Cedric Beck 2024-11-30 00:33:10 +01:00
13690cf73d added skybox; reworked guiHandler Cedric Beck 2024-11-29 21:28:50 +01:00
220d8ff47e added activePlayer+diceNum text display Cedric Beck 2024-11-29 17:26:04 +01:00
838beee345 added some more tests andd edited some mor Benjamin Feyer 2024-11-29 16:49:11 +01:00
c6462a50ca added two more tests for the substates of turn to their end-states and added some simulated inputs in the lobby and dialogs Benjamin Feyer 2024-11-29 16:00:10 +01:00
67bb30d124 added new notifications for client-view communication Cedric Beck 2024-11-29 15:23:34 +01:00
184410ba31 Merge commit Felix Koppe 2024-11-29 14:38:23 +01:00
3147f5b7a3 Fix some errors Felix Koppe 2024-11-29 14:37:46 +01:00
0e79f35cb0 Merge dev/client_koppe2 Felix Koppe 2024-11-29 14:02:59 +01:00
f024ba4866 Add preferences and sounds Felix Koppe 2024-11-29 14:01:18 +01:00
35270cce7b Fix ceremony statistics error Felix Koppe 2024-11-29 12:49:07 +01:00
b0761082ce Fix error after merge Felix Koppe 2024-11-29 12:42:03 +01:00
46182b33a8 Merge dev/client_koppe2 and development Felix Koppe 2024-11-29 12:36:07 +01:00

... 6 7 8 9 10 ...