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

7178935553 refactored the model to incoporate a correct folder structure Fleischer Hanno 2024-11-25 16:41:44 +01:00
0b538efbfb Merge remote-tracking branch 'origin/development' into development Daniel Grigencha 2024-11-25 16:36:53 +01:00
f2d5221328 added import statement with the refactored server messages Daniel Grigencha 2024-11-25 16:36:40 +01:00
06195854d8 added mdga server controller Daniel Grigencha 2024-11-25 16:35:49 +01:00
321909387d added new server state chart Daniel Grigencha 2024-11-25 16:35:27 +01:00
933c7ecad7 Merge branch 'dev/test' into 'development' Hanno Fleischer 2024-11-25 15:34:42 +00:00
806a149bfc Merge dev/client_koppe Felix 2024-11-25 16:33:04 +01:00
1803fb5549 edted some tests with null tests Benjamin Feyer 2024-11-25 16:32:51 +01:00
96489f2454 Minor work Felix 2024-11-25 16:32:16 +01:00
439231aecf Add rotateable cam Felix 2024-11-25 16:15:59 +01:00
9759b6871b reverted server messages Daniel Grigencha 2024-11-25 16:14:15 +01:00
52d9fff493 deleted server state automaton Daniel Grigencha 2024-11-25 15:43:29 +01:00
31b449662f added two Pieces in RequestPlayCard in order to differentiate between own and enemy pieces Hanno Fleischer 2024-11-25 15:09:24 +01:00
3be037d590 added two lists in PossiblePiece in order to differentiate between own and enemy pieces Hanno Fleischer 2024-11-25 15:07:43 +01:00
8982662f5b Remove debug statement Felix 2024-11-25 14:01:06 +01:00
d70efb32ea Fix audio settings Felix 2024-11-25 13:59:55 +01:00
d15242f816 added static methods to construct a PlayCard message for each card type Hanno Fleischer 2024-11-25 13:42:00 +01:00
4705512648 added getter for ArrayList Player in Game and created a flag for ready status in Player Hanno Fleischer 2024-11-25 12:52:22 +01:00
7efb89c634 Merge remote-tracking branch 'origin/development' into development Hanno Fleischer 2024-11-25 11:20:09 +01:00
15d1c36dad added an ArrayList of Player in game and added the received methods in clientgamelogic Hanno Fleischer 2024-11-25 11:19:17 +01:00
ce528457a5 added javadocs Benjamin Feyer 2024-11-25 02:30:43 +01:00
2cfa328c4c added some more testmethods Benjamin Feyer 2024-11-25 01:50:02 +01:00
928304fb4b corrected testmethods in clientStateTest Benjamin Feyer 2024-11-25 01:24:11 +01:00
aa88dff566 added tests in the serverStateTest added the testmethods for rolldice and movepiece Benjamin Feyer 2024-11-25 00:36:59 +01:00
f7bd9a0f38 edited some tests in ServerStateTest Benjamin Feyer 2024-11-25 00:20:47 +01:00
cc800a8dd7 added default constructor for serialization purposes Daniel Grigencha 2024-11-24 23:55:48 +01:00
7c5720cb9d fixed sonarlint errors and deleted map playerConnectionID Daniel Grigencha 2024-11-24 23:06:30 +01:00
b9986ded87 try push Cedric Beck 2024-11-24 22:41:17 +01:00
fd09460d61 try push Cedric Beck 2024-11-24 22:40:50 +01:00
e5dca013d1 try push Cedric Beck 2024-11-24 22:38:23 +01:00
7bfc6e7c3e try push Cedric Beck 2024-11-24 22:37:37 +01:00
1821a222e9 minor changes Benjamin Feyer 2024-11-24 22:24:39 +01:00
2e302ddc75 Merge branch 'development' into 'dev/test' Benjamin Feyer 2024-11-24 21:23:23 +00:00
ed47883281 refactored ceremony message Fleischer Hanno 2024-11-24 22:20:04 +01:00
599b3e8f47 corrected refactoring mistake, ich which RankingResponce was renamed to RankingResponse Fleischer Hanno 2024-11-24 22:18:48 +01:00
040b8830ab added getter for dialogstatemachine in dialogs Fleischer Hanno 2024-11-24 22:03:19 +01:00
6fa3e8c00d Merge branch 'development' into 'dev/test' Benjamin Feyer 2024-11-24 20:58:39 +00:00
83c79af31a made all con structors of clients states public Fleischer Hanno 2024-11-24 21:56:32 +01:00
653c3fb962 added javadocs to all server messages Daniel Grigencha 2024-11-24 20:51:03 +01:00
8932c8a8cd added javadocs to all client messages Daniel Grigencha 2024-11-24 19:56:51 +01:00
10428deedd added resource restructuring Cedric Beck 2024-11-24 19:54:29 +01:00
a196d3d7f2 added basic player name display Cedric Beck 2024-11-24 19:49:54 +01:00
4c078ab0e2 added some testmethods and corrected other in the clientStatemachineTests Benjamin Feyer 2024-11-24 19:37:03 +01:00
2a97ede985 added some testmethods for the client testing the statechanges in the dialogs Benjamin Feyer 2024-11-24 19:03:19 +01:00
56492cdda6 added some mor testcases for the clientstatemachine Benjamin Feyer 2024-11-24 18:40:10 +01:00
a71619612a added the empty testmethods in serverstateTest and edited the testmethods for substates of choocePiece in Client into MovePiece Benjamin Feyer 2024-11-24 18:21:26 +01:00
f18a62b089 Merge branch 'development' into 'dev/test' Benjamin Feyer 2024-11-24 15:09:07 +00:00
c204984a74 edited a test in the clientStateTest Benjamin Feyer 2024-11-24 16:03:12 +01:00
1d4048cf16 added the constructors for all client states and their statemachines Fleischer Hanno 2024-11-24 16:02:04 +01:00
2095ea5866 editet tests for the server and client statemachines Benjamin Feyer 2024-11-24 15:49:01 +01:00
f425eff26b added more logic for the server state diagram Daniel Grigencha 2024-11-24 15:27:10 +01:00
cd22ece485 Merge branch 'dev/client' into 'development' Hanno Fleischer 2024-11-24 09:45:30 +00:00
16dc28013e merge development into dev/client Cedric Beck 2024-11-24 10:39:28 +01:00
9ab71bfaf6 merge dev/client_koppe into dev/client Cedric Beck 2024-11-24 10:34:48 +01:00
ccad47f95a Merge branch 'dev/client' into dev/client_koppe Cedric Beck 2024-11-24 10:32:00 +01:00
f830aec8ce Merge branch 'dev/client_beck' into 'dev/client' Cedric Beck 2024-11-24 09:31:33 +00:00
c8c0188452 merge dev/client into dev/client_koppe Cedric Beck 2024-11-24 10:30:37 +01:00
a5b7488e92 Merge branch 'dev/client' into dev/client_beck Cedric Beck 2024-11-24 09:23:57 +01:00
11794b6ac7 added GuiHandler and showing bonuscards Cedric Beck 2024-11-24 09:21:44 +01:00
a8d80fd3f4 Merge branch 'dev/client_beck' into 'dev/client' Cedric Beck 2024-11-23 21:12:14 +00:00
806f0d7d9d added message contents to the messages addedn the conentents for all messages regarding the BPMN diagramm and own interpretation. also created an identifier for pieces to be used for network communication between server and client so that they talk about the same piece. Fleischer Hanno 2024-11-23 12:26:20 +01:00
7368014b10 merge dev/client into dev/client_beck Cedric Beck 2024-11-22 20:38:00 +01:00
ebdedc6494 added working piece outline; added final tweaks for boardHandler Cedric Beck 2024-11-22 19:53:32 +01:00
df2a7151f0 Merge branch 'development' into 'dev/test' Benjamin Feyer 2024-11-22 12:56:51 +00:00
00014eeb09 tried fixing outline problem Cedric Beck 2024-11-22 13:56:43 +01:00
89232901a7 added more logic for the server state diagram Daniel Grigencha 2024-11-22 09:37:49 +01:00
a79a315f83 Minor work Felix 2024-11-21 16:44:28 +01:00
c470c205e4 Add host&join menu and work on modelSyncronizer Felix 2024-11-21 16:14:06 +01:00
982ca00b55 Make lobby buttons colored Felix 2024-11-20 15:21:07 +01:00
c1f4ea480c Add host&join menu and work on modelSyncronizer Felix 2024-11-21 16:14:06 +01:00
a8a725611f added highlighting -> bug all assets are transparent Cedric Beck 2024-11-21 09:56:40 +01:00
02ce0df614 Make lobby buttons colored Felix 2024-11-20 15:21:07 +01:00
6e57e309cc Merge branch 'dev/client_koppe' into 'dev/client' Felix Koppe 2024-11-20 12:50:00 +00:00
d87acd46cc Fix camera init/shutdown Felix 2024-11-20 13:48:59 +01:00
58395fe3cb Merge dev/client_beck Felix 2024-11-20 13:42:10 +01:00
5f54eff038 Add inputHandler Felix 2024-11-20 13:32:50 +01:00
184b565526 Add volume controll Felix 2024-11-20 12:40:51 +01:00
176efc2aca Add settings menus Felix 2024-11-20 09:24:01 +01:00
bb491a2682 Make button size dynamic Felix 2024-11-19 19:27:04 +01:00
51e83c5ae4 Implement notificationSyncronizer Felix 2024-11-19 19:01:52 +01:00
47f0e44d0a Merge development Felix 2024-11-19 18:40:08 +01:00
80fab1ffdc Begin work on actionHandler Felix 2024-11-19 18:36:49 +01:00
03eef66332 Finish buttons Felix 2024-11-19 18:28:37 +01:00
34415bc9f2 Add left/right buttons Felix 2024-11-19 14:16:01 +01:00
030842d251 Some work Felix 2024-11-19 12:52:43 +01:00
a3a9f0d88d Merge branch 'development' into 'dev/test' Hanno Fleischer 2024-11-19 11:48:06 +00:00
6790be782e added empty serverstatetests Benjamin Feyer 2024-11-19 12:42:11 +01:00
56256fb9c0 fixed rotation and added functionality für BoardHandler; added shiel visual Cedric Beck 2024-11-18 21:30:30 +01:00
c6438d75cc Fix acousticHandler error Felix 2024-11-18 16:40:01 +01:00
728530a8f2 Finish loop Felix 2024-11-18 16:16:56 +01:00
7c09107d28 Work on Dialogs Felix 2024-11-18 15:58:30 +01:00
2399bf2678 added world and trees for tree positioning Cedric Beck 2024-11-18 12:40:40 +01:00
06d795b3e6 working on asset simplification Cedric Beck 2024-11-18 12:03:42 +01:00
8d9a923970 added rotation for move piece, fixed problems because rotation on the z axis is reversed Cedric Beck 2024-11-18 01:58:24 +01:00
c95beaeb14 working on pieceMovement Cedric Beck 2024-11-17 23:57:36 +01:00
04501de11c Merge remote-tracking branch 'origin/development' into development Daniel Grigencha 2024-11-17 21:18:38 +01:00
9cd9cc871c fixed a bug with use of addLast method for ArrayList which doesnot exist in Java 20 Fleischer Hanno 2024-11-17 21:18:19 +01:00
f69a2a9fda added a method to check if a player has pieces in his waiting area Fleischer Hanno 2024-11-17 21:04:13 +01:00
e83ed1c835 Merge remote-tracking branch 'origin/development' into development Daniel Grigencha 2024-11-17 20:17:29 +01:00
f379a6b638 added more logic for the server state diagram Daniel Grigencha 2024-11-17 20:17:19 +01:00

... 8 9 10 11 12 ...