Benjamin Feyer
|
6d58ceee3d
|
corrected the classes of the states in the statetests
|
2024-11-28 19:45:18 +01:00 |
|
Benjamin Feyer
|
ecf1cc6e9a
|
push after merge
|
2024-11-28 18:53:32 +01:00 |
|
Benjamin Feyer
|
dd836aa6b9
|
Merge remote-tracking branch 'origin/development' into dev/test
# Conflicts:
# Projekte/mdga/model/src/test/java/pp/mdga/client/clientState/ClientStateTest.java
|
2024-11-28 18:44:47 +01:00 |
|
Benjamin Feyer
|
b3504925a5
|
corrected some testmethods in the serverStateTest,
changed all assertTrue( .... isinstanceof ....) to assertEquals(...,....)
|
2024-11-28 18:40:07 +01:00 |
|
Fleischer Hanno
|
7690340b8f
|
added mor client state transitions
and renamed every client state with state as its suffix and renamed every message with messag as its suffix
|
2024-11-28 18:28:55 +01:00 |
|
Benjamin Feyer
|
8a5ebfd9d2
|
added some clientStateTests
|
2024-11-28 18:01:22 +01:00 |
|
Benjamin Feyer
|
a3a155a7e3
|
corrected some testmethods due to renaming of classes and changed state-architecture
|
2024-11-28 16:52:00 +01:00 |
|
Hanno Fleischer
|
476ca82bda
|
created the first part of the cliejnt state machine with its corresponding logic
|
2024-11-28 15:27:31 +01:00 |
|
Hanno Fleischer
|
cbbef16374
|
added two more todos
|
2024-11-27 09:20:22 +01:00 |
|
Hanno Fleischer
|
c9362a7a95
|
fixed bugs so the programm would start and added some Todo where code is missing or was fraudulent
|
2024-11-27 09:19:57 +01:00 |
|
Benjamin Feyer
|
5ef07e35d1
|
Merge branch 'development' into 'dev/test'
merge edited model into test
See merge request progproj/gruppen-ht24/Gruppe-01!18
|
2024-11-26 22:32:02 +00:00 |
|
Daniel Grigencha
|
20c9000d56
|
Merge remote-tracking branch 'origin/development' into development
|
2024-11-26 23:29:02 +01:00 |
|
Daniel Grigencha
|
5a911326ba
|
minor changes to the server state automaton
|
2024-11-26 23:28:49 +01:00 |
|
Hanno Fleischer
|
621bb9efae
|
fixed bugs inside of the client state machine and the message UpdateTSK
|
2024-11-26 20:31:16 +01:00 |
|
Fleischer Hanno
|
84c289cfd1
|
implemented all methods required for the state pattern in the client and adjusted the messages to work with player ids instead of names
|
2024-11-26 20:04:58 +01:00 |
|
Fleischer Hanno
|
f827757ad1
|
added next method for Color
|
2024-11-26 18:16:19 +01:00 |
|
Daniel Grigencha
|
e4a9b16fd5
|
Merge remote-tracking branch 'origin/development' into development
|
2024-11-26 18:12:32 +01:00 |
|
Daniel Grigencha
|
d63d0cc2a0
|
changed default constructor of 'Player' class
|
2024-11-26 18:12:08 +01:00 |
|
Hanno Fleischer
|
a127ee524a
|
Merge remote-tracking branch 'origin/development' into development
# Conflicts:
# Projekte/.run/MdgaApp.run.xml
|
2024-11-26 18:05:37 +01:00 |
|
Hanno Fleischer
|
5c2df2430d
|
reworked the client state machine and removed the seperate classes for the statemachines
these machines are now directly included in the parent states
|
2024-11-26 18:04:56 +01:00 |
|
Daniel Grigencha
|
2e76c41d3a
|
added new 'Disconnect' client message and updated 'Player' and 'Game' classes
|
2024-11-26 18:02:19 +01:00 |
|
Fleischer Hanno
|
7eafa3da39
|
refactored the whole client package structure
|
2024-11-25 17:43:29 +01:00 |
|
Benjamin Feyer
|
ef3193cd68
|
Merge branch 'development' into 'dev/test'
merge after refactoring
See merge request progproj/gruppen-ht24/Gruppe-01!16
|
2024-11-25 15:52:35 +00:00 |
|
Fleischer Hanno
|
7178935553
|
refactored the model to incoporate a correct folder structure
|
2024-11-25 16:41:44 +01:00 |
|
Daniel Grigencha
|
0b538efbfb
|
Merge remote-tracking branch 'origin/development' into development
|
2024-11-25 16:36:53 +01:00 |
|
Daniel Grigencha
|
f2d5221328
|
added import statement with the refactored server messages
|
2024-11-25 16:36:40 +01:00 |
|
Daniel Grigencha
|
06195854d8
|
added mdga server controller
|
2024-11-25 16:35:49 +01:00 |
|
Daniel Grigencha
|
321909387d
|
added new server state chart
|
2024-11-25 16:35:27 +01:00 |
|
Hanno Fleischer
|
933c7ecad7
|
Merge branch 'dev/test' into 'development'
merge for refactoring of project structure
See merge request progproj/gruppen-ht24/Gruppe-01!15
|
2024-11-25 15:34:42 +00:00 |
|
Felix
|
806a149bfc
|
Merge dev/client_koppe
|
2024-11-25 16:33:04 +01:00 |
|
Benjamin Feyer
|
1803fb5549
|
edted some tests with null tests
|
2024-11-25 16:32:51 +01:00 |
|
Felix
|
96489f2454
|
Minor work
|
2024-11-25 16:32:16 +01:00 |
|
Felix
|
439231aecf
|
Add rotateable cam
|
2024-11-25 16:15:59 +01:00 |
|
Daniel Grigencha
|
9759b6871b
|
reverted server messages
|
2024-11-25 16:14:15 +01:00 |
|
Daniel Grigencha
|
52d9fff493
|
deleted server state automaton
|
2024-11-25 15:43:29 +01:00 |
|
Hanno Fleischer
|
31b449662f
|
added two Pieces in RequestPlayCard in order to differentiate between own and enemy pieces
|
2024-11-25 15:09:24 +01:00 |
|
Hanno Fleischer
|
3be037d590
|
added two lists in PossiblePiece in order to differentiate between own and enemy pieces
|
2024-11-25 15:07:43 +01:00 |
|
Felix
|
8982662f5b
|
Remove debug statement
|
2024-11-25 14:01:06 +01:00 |
|
Felix
|
d70efb32ea
|
Fix audio settings
|
2024-11-25 13:59:55 +01:00 |
|
Hanno Fleischer
|
d15242f816
|
added static methods to construct a PlayCard message for each card type
|
2024-11-25 13:42:00 +01:00 |
|
Hanno Fleischer
|
4705512648
|
added getter for ArrayList Player in Game and created a flag for ready status in Player
|
2024-11-25 12:52:22 +01:00 |
|
Hanno Fleischer
|
7efb89c634
|
Merge remote-tracking branch 'origin/development' into development
|
2024-11-25 11:20:09 +01:00 |
|
Hanno Fleischer
|
15d1c36dad
|
added an ArrayList of Player in game and added the received methods in clientgamelogic
|
2024-11-25 11:19:17 +01:00 |
|
Benjamin Feyer
|
ce528457a5
|
added javadocs
|
2024-11-25 02:30:43 +01:00 |
|
Benjamin Feyer
|
2cfa328c4c
|
added some more testmethods
|
2024-11-25 01:50:02 +01:00 |
|
Benjamin Feyer
|
928304fb4b
|
corrected testmethods in clientStateTest
|
2024-11-25 01:24:11 +01:00 |
|
Benjamin Feyer
|
aa88dff566
|
added tests in the serverStateTest
added the testmethods for rolldice and movepiece
|
2024-11-25 00:36:59 +01:00 |
|
Benjamin Feyer
|
f7bd9a0f38
|
edited some tests in ServerStateTest
|
2024-11-25 00:20:47 +01:00 |
|
Daniel Grigencha
|
cc800a8dd7
|
added default constructor for serialization purposes
|
2024-11-24 23:55:48 +01:00 |
|
Daniel Grigencha
|
7c5720cb9d
|
fixed sonarlint errors and deleted map playerConnectionID
|
2024-11-24 23:06:30 +01:00 |
|