Benjamin Feyer
|
8b1868e03b
|
Merge branch 'development' into 'dev/test'
merge development int test branch
See merge request progproj/gruppen-ht24/Gruppe-01!23
|
2024-12-01 11:10:24 +00:00 |
|
Benjamin Feyer
|
56f32c5c0b
|
edited some comments in the methods and wrote in som methods, to test unwanted statechanges
|
2024-12-01 12:09:13 +01:00 |
|
Fleischer Hanno
|
789868863f
|
added some more client game logic
|
2024-12-01 12:06:06 +01:00 |
|
Fleischer Hanno
|
bdc527b83e
|
added more logic to the client (choosepiece and powercard)
|
2024-12-01 08:40:16 +01:00 |
|
Benjamin Feyer
|
c41848b061
|
adjusted some Todos and deleted some mention of statemachines
|
2024-12-01 00:41:37 +01:00 |
|
Benjamin Feyer
|
0fd190419d
|
Merge branch 'development' into 'dev/test'
merge development into test
See merge request progproj/gruppen-ht24/Gruppe-01!22
|
2024-11-30 23:34:40 +00:00 |
|
Fleischer Hanno
|
5ff56ed9d8
|
added all necessary logic for the turn waiting class and adjusted some messages
|
2024-11-30 22:23:40 +01:00 |
|
Fleischer Hanno
|
81d037d232
|
made the determinstartplayer machine fully functional
|
2024-11-30 20:50:57 +01:00 |
|
Fleischer Hanno
|
422e94ec48
|
Dialog state machine is now fully functional
|
2024-11-30 19:49:52 +01:00 |
|
Fleischer Hanno
|
b3d754e77f
|
added all current State getter in every client state machine
|
2024-11-30 16:42:24 +01:00 |
|
Fleischer Hanno
|
0297193be1
|
added more functionality to the client state machine and implemeted the first notifications
|
2024-11-30 16:23:09 +01:00 |
|
Fleischer Hanno
|
0487ff0238
|
modified messages to work with piece uuid instead of an identifier.
|
2024-11-30 13:02:23 +01:00 |
|
Fleischer Hanno
|
4d6cd63a3d
|
made all notifications constructors public
|
2024-11-30 11:24:46 +01:00 |
|
Benjamin Feyer
|
838beee345
|
added some more tests andd edited some mor
|
2024-11-29 16:49:11 +01:00 |
|
Benjamin Feyer
|
c6462a50ca
|
added two more tests for the substates of turn to their end-states and added some simulated inputs in the lobby and dialogs
|
2024-11-29 16:00:10 +01:00 |
|
Cedric Beck
|
67bb30d124
|
added new notifications for client-view communication
|
2024-11-29 15:23:34 +01:00 |
|
Benjamin Feyer
|
d0361b2759
|
commented the 'received(interruptMessage)' out, to ensure, there are no unwanted state-changes
|
2024-11-29 00:33:33 +01:00 |
|
Benjamin Feyer
|
eff011f69f
|
implemented more tests for the clientStartgame
|
2024-11-29 00:13:06 +01:00 |
|
Benjamin Feyer
|
fad853b34a
|
implemented more tests for the clientstatetests
|
2024-11-28 23:24:31 +01:00 |
|
Benjamin Feyer
|
4a89c4fa65
|
processed some Todo in the Client State, to test unwanted statechanged
|
2024-11-28 22:46:50 +01:00 |
|
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 |
|