Version 1.0 #40

Merged

j23f0779 merged 947 commits from development2 into main 2024-12-13 10:26:49 +01:00

Conversation 2 Commits 947 Files Changed 528 +42790 -1353

947 Commits

Author	SHA1	Message	Date
Hanno Fleischer	3658a91b7b	added possiblity to build jar file and override shutdown behavior when closing via alt-f4 or the close button of the window	2024-12-13 10:15:45 +01:00
Benjamin Feyer	1e5c5bd5eb	added T016	2024-12-13 05:58:22 +01:00
Benjamin Feyer	23d4bf31a7	added testcase T004	2024-12-13 05:49:23 +01:00
Benjamin Feyer	5826d93be4	added test case T003	2024-12-13 05:47:30 +01:00
Benjamin Feyer	9c3b949e5a	corrected javaDoc in GameTest	2024-12-13 05:24:15 +01:00
Benjamin Feyer	81223653f9	added Piecetest T005/T006	2024-12-13 05:15:30 +01:00
Benjamin Feyer	28c06c931e	added the game-test 6/7 (T008-T009)	2024-12-13 04:25:37 +01:00
Benjamin Feyer	f93da332b3	added the game-test8 t010	2024-12-13 04:20:18 +01:00
Benjamin Feyer	379e4bcec1	corrected a pieceTest	2024-12-13 04:08:36 +01:00
Benjamin Feyer	dc7dae5db9	added some gameTests and reformatted ServerStateTests	2024-12-13 04:07:00 +01:00
Benjamin Feyer	702154c018	fixed PieceTest18	2024-12-13 02:52:11 +01:00
Benjamin Feyer	032cd76ec2	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-13 02:39:59 +01:00
Benjamin Feyer	5c8dce0626	finished the serverStateTests	2024-12-13 02:39:48 +01:00
Benjamin Feyer	911ab42101	edited some tests for the server	2024-12-13 02:18:45 +01:00
Benjamin Feyer	ea3f4df636	aaded some tests!	2024-12-13 01:59:34 +01:00
Timo Brennförder	065a626307	added Tests for LobbyStateTests	2024-12-13 00:44:37 +01:00
Timo Brennförder	2ec9b3a246	added NetworkDialogClientTests ... testEnterIP -> passes testEnterPort -> can't be tested in model testConnectToServer -> passes testCantConnectToServer -> passes testCancelJoining -> passes	2024-12-12 20:53:04 +01:00
Benjamin Feyer	48d6516073	fixed and added some tests	2024-12-12 15:01:57 +01:00
Benjamin Feyer	0d4685f3c2	added some tests and corrected some tests and added logic for the tests like getter and setter	2024-12-12 13:46:23 +01:00
Benjamin Feyer	d12b0b6a77	fixed some tests	2024-12-12 02:58:30 +01:00
Benjamin Feyer	4dda9229b3	fixed some tests	2024-12-12 02:02:29 +01:00
Benjamin Feyer	e6453b2f1b	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-12 01:03:04 +01:00
Benjamin Feyer	af8ab21e5f	fixed some tests	2024-12-12 01:02:55 +01:00
Hanno Fleischer	d21e963d33	Merge remote-tracking branch 'origin/development2' into development2	2024-12-12 00:21:13 +01:00
Hanno Fleischer	1f3b07709c	added java docs to NoPieceState	2024-12-12 00:20:15 +01:00
Benjamin Feyer	a6215b9986	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-12 00:03:32 +01:00
Benjamin Feyer	6381d7b3b9	fixed some tests	2024-12-12 00:03:24 +01:00
Hanno Fleischer	176affa9c5	added java docs to view	2024-12-11 23:58:32 +01:00
Benjamin Feyer	67ea9ede18	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-11 23:32:30 +01:00
Benjamin Feyer	173cbe31e5	fixed some tests	2024-12-11 23:32:19 +01:00
Hanno Fleischer	c13152bb29	added java docs to model	2024-12-11 23:31:52 +01:00
Benjamin Feyer	a3d0056f7f	finished clientStateTests	2024-12-11 21:54:14 +01:00
Benjamin Feyer	06dcc4c0e4	fixed buck	2024-12-11 20:19:15 +01:00
Benjamin Feyer	61e168cefb	fixed buck	2024-12-11 20:08:26 +01:00
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
Cedric Beck	0c7030659a	removed fadeControl	2024-12-10 13:00:03 +01:00
Benjamin Feyer	30997eb571	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-10 12:47:22 +01:00
Benjamin Feyer	ea1978d5a8	edited flag=false in enter in rolldice	2024-12-10 12:46:56 +01:00
Cedric Beck	1ead0e2e9e	fixed uuid reference bug	2024-12-10 12:46:04 +01:00
Benjamin Feyer	70c821f2ac	added logger and simpliefied logic	2024-12-10 12:06:21 +01:00
Cedric Beck	8867e8156f	merge	2024-12-10 11:55:17 +01:00
Cedric Beck	36c2f2efec	commit	2024-12-10 11:54:45 +01:00
Benjamin Feyer	b8d992590f	added logger for swap-card	2024-12-10 11:52:52 +01:00
Benjamin Feyer	a86a146091	added logger for swap-card	2024-12-10 11:52:05 +01:00
Benjamin Feyer	3e060897fc	added the flag in the client roldice-states, so you can't roll twice	2024-12-10 11:18:10 +01:00
Benjamin Feyer	fe95a7c159	added the piecetest and implemented more logic in the moveLogic	2024-12-10 10:47:06 +01:00
Benjamin Feyer	d60c0347cc	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-10 08:13:33 +01:00
Benjamin Feyer	bbde17aa27	initial test commit for clientStateTest and ServerStatetest	2024-12-10 08:13:11 +01:00
Benjamin Feyer	38c865d135	reformatted code	2024-12-10 02:23:19 +01:00
Benjamin Feyer	91d4718179	fixed the move-logic	2024-12-10 02:19:48 +01:00
Benjamin Feyer	bb1bf22713	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-09 22:22:49 +01:00
Benjamin Feyer	380341114c	minor changes	2024-12-09 22:21:52 +01:00
Cedric Beck	f56eb8cd60	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-09 22:03:39 +01:00
Cedric Beck	3797da1246	fixed crash get bonus	2024-12-09 22:03:34 +01:00
Benjamin Feyer	e79a1168c0	corrected movelogic	2024-12-09 21:02:46 +01:00
Fleischer Hanno	6ab8f2d90d	fixed missing check on shield state after swap	2024-12-09 19:55:03 +01:00
Fleischer Hanno	ece249cf66	fixed bug in no turn state with double next color itteration	2024-12-09 19:50:22 +01:00
Fleischer Hanno	e95f0866d5	fixed shield state for waiting state	2024-12-09 19:43:50 +01:00
Fleischer Hanno	0fce2fb5d2	added the possiblity when the drawpile has only 1 card the discard pile will be shuffeled and then put into the draw pile.	2024-12-09 19:11:45 +01:00
Fleischer Hanno	0010717411	when triggering BonusNode it will now be addded to the hand	2024-12-09 19:05:28 +01:00
Felix Koppe	cf9acf981f	Merge commit	2024-12-09 19:06:08 +01:00
Felix Koppe	e2a4f7f85c	Fix serialize error	2024-12-09 19:05:59 +01:00
Felix Koppe	1ffabe6b19	Merge commit	2024-12-09 19:05:02 +01:00
Felix Koppe	0ba5a2f9fd	Add serialization of SpectatorMessage	2024-12-09 19:04:47 +01:00
Cedric Beck	d0afaa57f5	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-09 18:59:56 +01:00
Cedric Beck	00a79ddce3	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-09 18:59:42 +01:00
Cedric Beck	bce6a1e0eb	added cardlayerhandler back and fixed clear selectable	2024-12-09 18:59:38 +01:00
Benjamin Feyer	37dcc0122c	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-09 18:51:04 +01:00
Benjamin Feyer	4007036cb2	bug fixes	2024-12-09 18:50:54 +01:00
Hanno Fleischer	5b958740c4	Merge remote-tracking branch 'origin/development2' into development2	2024-12-09 18:45:58 +01:00
Hanno Fleischer	06cb25b6a9	fixed card selection, to use an already selected and discarded card	2024-12-09 18:45:23 +01:00
Cedric Beck	afec74416f	fixed ChoosePowerCardState	2024-12-09 18:45:00 +01:00
Hanno Fleischer	ceb9e48f55	updated Error messages	2024-12-09 18:36:42 +01:00
Cedric Beck	f8179f191f	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-09 18:12:08 +01:00
Cedric Beck	ec77b9a6ef	added more start cards for testing	2024-12-09 18:11:45 +01:00
Fleischer Hanno	2d01e4b31b	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-09 18:11:44 +01:00
Fleischer Hanno	0be25ecb29	made Intro state work with more PowerCards on the hand	2024-12-09 18:11:21 +01:00
Benjamin Feyer	1210324194	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-09 18:05:40 +01:00
Benjamin Feyer	569ce39d2a	bug Fixed	2024-12-09 18:04:24 +01:00
Cedric Beck	80989310e5	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-09 17:52:53 +01:00
Cedric Beck	a2f57bcaae	deleted node unselect in BoardHandler clearSelectable	2024-12-09 17:52:48 +01:00
Lukas Bauer	68702f11a4	Deleted the 'MdgaApp.run.xml.	2024-12-09 17:51:40 +01:00
Felix Koppe	13948ec4bb	Fix error	2024-12-09 17:47:03 +01:00
Cedric Beck	570c915964	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-09 17:21:51 +01:00
Cedric Beck	ac719c55e6	revert commit	2024-12-09 17:20:34 +01:00
Hanno Fleischer	189e8a7ec3	fixed client shield state animation	2024-12-09 17:11:30 +01:00
Felix Koppe	5d2ece41b7	Merge commit	2024-12-09 17:05:55 +01:00
Felix Koppe	7f92d8183b	Adjust delays	2024-12-09 17:05:42 +01:00
Cedric Beck	6bc769f5bb	merge	2024-12-09 17:04:45 +01:00
Cedric Beck	a21794ddc1	added new card order in CardLayerHandler	2024-12-09 17:03:35 +01:00
Felix Koppe	e699f4556e	Fix error	2024-12-09 16:58:05 +01:00
Fleischer Hanno	a56f68efdc	fixed Turbo card with zero modifier	2024-12-09 16:54:26 +01:00
Felix Koppe	55328e9e69	Fixe dice	2024-12-09 16:43:21 +01:00
Felix Koppe	50dc634a94	Add powercard drawing	2024-12-09 16:37:08 +01:00
Felix Koppe	d37b9ee269	Add powercard drawing	2024-12-09 16:36:07 +01:00
Benjamin Feyer	3937b75bf7	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-09 16:11:32 +01:00
Benjamin Feyer	7d5b8a6b13	404 IQ-Move added move logic	2024-12-09 16:10:56 +01:00
Felix Koppe	39d5b43cb8	Quality of live improvement	2024-12-09 16:10:15 +01:00
Felix Koppe	de0f04b5b7	Quality of live improvement	2024-12-09 16:07:26 +01:00
Felix Koppe	6a4bdfa455	Fix swap card issue	2024-12-09 14:50:29 +01:00
Felix Koppe	db16b0d8b6	Fix shield card issue	2024-12-09 14:45:41 +01:00
Benjamin Feyer	08db05a7d6	added more logic for the move	2024-12-09 14:15:05 +01:00
Cedric Beck	e47fcd1643	merge	2024-12-09 14:14:43 +01:00
Cedric Beck	dfd361d8be	added isStart + (DU)	2024-12-09 14:14:15 +01:00
Felix Koppe	bf3d800c10	Add turboCardLogic	2024-12-09 13:57:16 +01:00
Felix Koppe	8943dfb15e	Allow all bonusCards	2024-12-09 13:48:05 +01:00
Felix Koppe	64f11eb99b	Adjust diceRoll time	2024-12-09 13:42:15 +01:00
Hanno Fleischer	0e9ff609ec	fixed a bug where if two player rolled the same number in DSP u would be stuck in an infinite loop	2024-12-09 12:57:47 +01:00
Hanno Fleischer	d37db68838	fixed bug with too early state transition after playing a powercard	2024-12-09 12:05:28 +01:00
Benjamin Feyer	25fff99ff0	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 ... # Conflicts: # Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java # Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/ChoosePieceAutomatonState.java # Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/SelectPieceState.java	2024-12-09 04:50:01 +01:00
Cedric Beck	2dbdb1e17b	revert 2 dicenow	2024-12-09 04:42:55 +01:00
Fleischer Hanno	f954a24b32	fixed in firstroll catching of endanimation messages by non active palyers	2024-12-09 04:36:08 +01:00
Cedric Beck	c7a05011ff	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-09 04:34:52 +01:00
Cedric Beck	15b7aa9e8c	fixed 2 dicenow notification	2024-12-09 04:34:47 +01:00
Felix Koppe	84a50ec215	Fix something	2024-12-09 04:33:21 +01:00
Benjamin Feyer	e05b057190	reenvented the wheel (; , rewrite the canMove-logic, etc	2024-12-09 04:32:55 +01:00
Cedric Beck	9ea6837e89	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-09 04:21:11 +01:00
Felix Koppe	a26a3d171f	99,99 IQ	2024-12-09 04:26:16 +01:00
Felix Koppe	a2e85cebc9	99,9 IQ	2024-12-09 04:25:36 +01:00
Cedric Beck	3fe2d90d75	added toString	2024-12-09 04:21:06 +01:00
Felix Koppe	4181456598	Adjust delay	2024-12-09 04:13:30 +01:00
Felix Koppe	6f34b1fe33	Adjust delay	2024-12-09 04:10:14 +01:00
Felix Koppe	659fef6c50	Add bonus sounds	2024-12-09 04:07:52 +01:00
Cedric Beck	9c7a13c568	fixed bug	2024-12-09 03:57:53 +01:00
Cedric Beck	14699e3edf	fixed bug	2024-12-09 03:55:51 +01:00
Cedric Beck	961da990ce	fixed no broadcast bug	2024-12-09 03:46:09 +01:00
Fleischer Hanno	be8d4b2d6e	made turbo flag work with only one flag	2024-12-09 03:39:24 +01:00
Cedric Beck	38687b6d25	added turboflag	2024-12-09 03:37:35 +01:00
Cedric Beck	c038073bad	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-09 03:23:06 +01:00
Cedric Beck	5bccee96a2	working on turbo not	2024-12-09 03:23:02 +01:00
Fleischer Hanno	ecb751824c	created two flags to be able to determine if a turbo card has been played	2024-12-09 03:20:54 +01:00
Felix Koppe	a7969d7a68	Minor change+	2024-12-09 03:25:04 +01:00
Felix Koppe	3a1b17ed01	Merge commit	2024-12-09 03:17:47 +01:00
Felix Koppe	3dd6fc9f37	Add DEBUG_MULTIPLIER	2024-12-09 03:17:28 +01:00
Cedric Beck	3ae9028b82	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-09 03:11:49 +01:00
Cedric Beck	536c14bf7c	working on turbocard	2024-12-09 03:11:43 +01:00
Fleischer Hanno	fb3a663db1	added overwrite of dicemodifier when receiving PlayCard Turbo message	2024-12-09 03:07:12 +01:00
Cedric Beck	b91d448ee6	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-09 02:55:57 +01:00
Cedric Beck	935577462b	added shieldRing move	2024-12-09 02:55:52 +01:00
Felix Koppe	f79d590620	Merge commit	2024-12-09 02:50:57 +01:00
Felix Koppe	69d160d0fd	Java23	2024-12-09 02:50:45 +01:00
Felix Koppe	de592cfa48	Move receive DrawCardMessage to GameState	2024-12-09 02:43:02 +01:00
Fleischer Hanno	8922cb8f1c	added removeshield notification	2024-12-09 02:41:44 +01:00
Felix Koppe	f10df60ad3	Merge commit	2024-12-09 02:40:57 +01:00
Felix Koppe	1c87b566e9	Add DrawCardMessage logic	2024-12-09 02:40:45 +01:00
Cedric Beck	6ecf5a66bf	added animation end in playCardNotification	2024-12-09 02:30:15 +01:00
Cedric Beck	3f93d6e569	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-09 02:18:35 +01:00
Cedric Beck	cc72b82be9	added shield Messages	2024-12-09 02:18:30 +01:00
Fleischer Hanno	41ac04f69d	added in can infield move to return false when occupant is shielded	2024-12-09 02:15:45 +01:00
Felix Koppe	cb60cb1c42	Add bonus node logic	2024-12-09 02:19:43 +01:00
Fleischer Hanno	61d67fd833	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-09 02:04:11 +01:00
Felix Koppe	4ca7c38170	Minor change in notification processing	2024-12-09 02:09:09 +01:00
Fleischer Hanno	e457fe23d4	added a reset for the dice modifier in the server	2024-12-09 02:03:57 +01:00
Felix Koppe	b86aeb63e6	Merge commit	2024-12-09 01:53:33 +01:00
Felix Koppe	daa8c0bf9d	500IQ	2024-12-09 01:53:18 +01:00
Felix Koppe	6487bafed1	Merge commit	2024-12-09 01:47:47 +01:00
Felix Koppe	8af3b2d9d4	Fix uuid serialisation error	2024-12-09 01:47:32 +01:00
Cedric Beck	d38690ea48	merge	2024-12-09 01:43:25 +01:00
Cedric Beck	daa7d31bdd	working on shield	2024-12-09 01:42:59 +01:00
Fleischer Hanno	5e79a4a64c	added remove handcard	2024-12-09 01:35:37 +01:00
Felix Koppe	8e2fc6c1a1	Merge commit	2024-12-09 01:18:47 +01:00
Felix Koppe	5a12d8e96f	Fix dice more than once error	2024-12-09 01:18:29 +01:00
Fleischer Hanno	3af6e94920	added DrawCardMessageSupport	2024-12-09 01:16:31 +01:00
Cedric Beck	4efc557849	added node hover/select with piece	2024-12-09 01:06:12 +01:00
Felix Koppe	1646526ce1	Try fix error	2024-12-09 00:36:38 +01:00
Cedric Beck	904aa17358	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-08 23:23:27 +01:00
Felix Koppe	f4e774ee5b	Minor change	2024-12-08 23:28:26 +01:00
Cedric Beck	76b3e18dbe	added jet_noGear	2024-12-08 23:23:21 +01:00
Cedric Beck	d4cbd0dda6	added swapnotification	2024-12-08 23:08:59 +01:00
Felix Koppe	7a189a98e3	Merge commit	2024-12-08 23:05:44 +01:00
Felix Koppe	00902d2e6b	Add move throw sync	2024-12-08 23:05:30 +01:00
Fleischer Hanno	7256cde020	changed the ionput list for selectableMoveNotification	2024-12-08 22:52:42 +01:00
Cedric Beck	b817af29b5	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-08 22:28:57 +01:00
Cedric Beck	fa18ae4280	added swap functionality in model for server & client	2024-12-08 22:28:51 +01:00
Felix Koppe	521c7439c2	Add error in animation logixc	2024-12-08 22:04:16 +01:00
Fleischer Hanno	84c5553154	fixed former bug	2024-12-08 21:47:28 +01:00
Fleischer Hanno	2c94737023	fixed bug when moving pieces from waiting to infield for non active players	2024-12-08 21:37:22 +01:00
Fleischer Hanno	d3d75d7f49	added missing error messages	2024-12-08 21:23:16 +01:00
Fleischer Hanno	5e67b2d0c7	fixed a bug where the home index of piece was wrong	2024-12-08 21:18:34 +01:00
Fleischer Hanno	992efd403d	fixed waiting piece move bug	2024-12-08 21:14:20 +01:00
Cedric Beck	2d7fddf09a	fixed swap select	2024-12-08 21:13:44 +01:00
Felix Koppe	f7c886f084	333IQ	2024-12-08 21:12:09 +01:00
Fleischer Hanno	a1d85177c6	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-08 20:46:58 +01:00
Fleischer Hanno	e27d325faa	added serializable tag to choosepiecestatemessage	2024-12-08 20:45:53 +01:00
Cedric Beck	bd98f301c8	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-08 20:44:28 +01:00
Cedric Beck	a7850f7d43	fixed rotation	2024-12-08 20:42:57 +01:00
Fleischer Hanno	3040595193	minor fixes to initialize method in noPiece state of server	2024-12-08 20:28:09 +01:00
Fleischer Hanno	5d45cf2934	fixed an error in clientstates where a missing servermessage received istn overwritte	2024-12-08 20:24:05 +01:00
Fleischer Hanno	a5d949b7e5	added the functionality of multiple roll dice when all pieces in waiting	2024-12-08 20:17:53 +01:00
Cedric Beck	f4a224621e	deleted unwanted code (next Color)	2024-12-08 20:05:37 +01:00
Felix Koppe	876c238db3	Fix colorNext	2024-12-08 19:48:26 +01:00
Felix Koppe	b61b8214fe	Fix colorNext	2024-12-08 19:46:09 +01:00
Felix Koppe	5dc3124533	Fix colorNext	2024-12-08 19:40:10 +01:00
Fleischer Hanno	c25e17fd90	fixed waitingpiece move	2024-12-08 19:14:48 +01:00
Cedric Beck	5e27473875	fixed bugs in MoveMessage	2024-12-08 19:10:25 +01:00
Cedric Beck	1be2d6aa13	Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2	2024-12-08 18:06:10 +01:00
Felix Koppe	ab9de3acf8	Replace waitMoveNotification with moveNotification	2024-12-08 18:09:13 +01:00
Cedric Beck	2ab19d0fc8	200 iq move	2024-12-08 18:05:35 +01:00
Cedric Beck	f489357bbb	fixed calcTargetIndex	2024-12-08 17:24:36 +01:00
Felix Koppe	34cde15a0d	Fix error	2024-12-08 17:24:18 +01:00
Felix Koppe	1e52df2812	Fix error	2024-12-08 17:14:22 +01:00
Felix Koppe	884c5afc4e	Remove moveOccupant	2024-12-08 17:12:35 +01:00
Cedric Beck	d6e44c2d29	added logger	2024-12-08 16:44:28 +01:00
Felix Koppe	d593233fa3	Fix error	2024-12-08 15:29:23 +01:00
Felix Koppe	d1b4aa9dda	Fix error	2024-12-08 15:24:59 +01:00
Felix Koppe	25b6480c42	Fix error	2024-12-08 15:10:14 +01:00
Felix Koppe	3dd81ea02c	Add trace statement	2024-12-08 14:58:07 +01:00
Felix Koppe	e6dbedab0f	Try fix active player logic	2024-12-08 14:33:37 +01:00
Felix Koppe	f5b0481d3c	Adjust print statements	2024-12-08 14:25:38 +01:00
Felix Koppe	f9f381ac2d	Fix color.next	2024-12-08 14:16:14 +01:00
Felix Koppe	ee94d901f4	Adjust print statements	2024-12-08 13:54:39 +01:00
Felix Koppe	bca02bfe4b	Adjust print statements	2024-12-08 13:51:05 +01:00
Felix Koppe	acdf5ec6a9	Add missing registration of SelectPieceMessage	2024-12-08 13:29:44 +01:00
Cedric Beck	41d6f70d51	added logger	2024-12-08 12:50:58 +01:00
Felix Koppe	4c064cb615	Merge commit+	2024-12-08 12:45:36 +01:00
Felix Koppe	121f47d070	Fix selectPieceState and startPieceState logic	2024-12-08 12:45:08 +01:00
Cedric Beck	ae436589a2	edited MoveMessage in WaitingState	2024-12-08 12:38:59 +01:00
Cedric Beck	bc399b1bf9	edited String queals in Piece	2024-12-08 12:03:05 +01:00
Cedric Beck	98a6f2e689	added debug	2024-12-08 11:57:30 +01:00
Cedric Beck	9a07375fed	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-08 11:39:42 +01:00
Felix Koppe	498c2eb054	Merge remote-tracking branch 'origin/development' into development	2024-12-08 11:44:38 +01:00
Cedric Beck	ce55ca8bb5	added further node select implementation	2024-12-08 11:39:37 +01:00
Felix Koppe	9c729059bf	Merge branch 'refs/heads/dev/server_h' into development	2024-12-08 11:30:09 +01:00
Cedric Beck	3b7ef37364	added selectNode when right piece is selected	2024-12-08 11:27:56 +01:00
Fleischer Hanno	ec295c94f1	fixed the equals method in piece	2024-12-08 11:23:53 +01:00
Cedric Beck	adfe2b94b8	fixed cardLayer shutdown bug	2024-12-08 11:19:00 +01:00
Cedric Beck	69108063a0	fixed Notification bug	2024-12-08 10:33:56 +01:00
Hanno Fleischer	16e7488fae	Merge branch 'dev/server_h' into 'development' ... added more communication fixes, states now use correct messages See merge request progproj/gruppen-ht24/Gruppe-01!38	2024-12-08 09:13:47 +00:00
Hanno Fleischer	c9c99709ba	added more communication fixes, states now use correct messages	2024-12-08 09:52:23 +01:00
Felix Koppe	e069017375	Merge remote-tracking branch 'origin/dev/server_h' into development	2024-12-08 09:44:23 +01:00
Hanno Fleischer	8b27ccce22	adjusted stattransition methods to work correctly	2024-12-08 03:08:47 +01:00
Hanno Fleischer	8c22d935a9	implemented rest of the server logic in choosepiece substates, and began to fix bugs after testing	2024-12-08 01:59:29 +01:00
Cedric Beck	c8d7d91de0	added import in NotiSync	2024-12-07 21:57:41 +01:00
Cedric Beck	389d1b6056	merge development into dev/client_beck	2024-12-07 17:04:43 +01:00
Cedric Beck	4430b37581	fixed wrong dice rotation because of fps drop	2024-12-07 17:00:42 +01:00
Cedric Beck	e5abcbdc8c	added jet_noGear.j3o	2024-12-07 16:51:38 +01:00
Cedric Beck	e14b8cb510	added converted assets	2024-12-07 16:50:43 +01:00
Felix Koppe	bf84bfa0f9	Update animations and remove test setup	2024-12-07 16:40:45 +01:00
Hanno Fleischer	0c49d7ed1c	Merge branch 'dev/server_h' of https://athene1.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into dev/server_h	2024-12-07 15:37:02 +01:00
Hanno Fleischer	2ba6a22422	Merge branch 'development' into 'dev/server_h' ... Development See merge request progproj/gruppen-ht24/Gruppe-01!37	2024-12-07 14:36:25 +00:00
Hanno Fleischer	c37bac4614	replaced DicaAgain message with DicveNow	2024-12-07 15:34:34 +01:00
Felix Koppe	06b37584cb	Merge dev/client_beck into development	2024-12-07 15:05:03 +01:00
Felix Koppe	0c42a2df88	Merge branch 'dev/client_beck' into development ... # Conflicts: # Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java # Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java # Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/AcousticHandler.java # Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/MdgaSound.java # Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/SoundAsset.java # Projekte/mdga/client/src/main/java/pp/mdga/client/animation/JetAnimation.java # Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java # Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/GameStates.java	2024-12-07 15:00:27 +01:00
Felix Koppe	d75d704878	Add smoke effekt to missileAnimation	2024-12-07 14:55:08 +01:00
Cedric Beck	6d3c733f91	added effect for shell flying	2024-12-07 14:45:39 +01:00
Felix Koppe	f96da2c46c	Add notification delay	2024-12-07 14:37:19 +01:00
Cedric Beck	1a079dad44	added shell asset for ShellAnimation	2024-12-07 14:22:36 +01:00
Cedric Beck	32f49a6181	added shellAnimation without shell asset	2024-12-07 13:30:30 +01:00
Felix Koppe	525809899e	Minor improvements	2024-12-07 11:03:30 +01:00
Felix Koppe	fd9708752c	Merge dev/model into development	2024-12-06 18:49:15 +01:00
Hanno Fleischer	5a9f7a8118	added AnimationEndMessages to 'RollDiceState', 'MovePieceState' and 'PlayPowerCardState'	2024-12-06 18:45:14 +01:00
Felix Koppe	236d3db930	Add ambience	2024-12-06 18:10:09 +01:00
Cedric Beck	29c6b13300	added MatrixAnimation	2024-12-06 17:09:06 +01:00
Felix Koppe	6059e93276	Fix interruptDialog	2024-12-06 16:52:08 +01:00
Felix Koppe	f2eeb6dab4	Fix logic error regarding cardSelection	2024-12-06 16:27:01 +01:00
Hanno Fleischer	2e1fe3c050	fixed a missing method call ind TurnState and removed debug sout statements ind 'RollDiceMessage'	2024-12-06 15:19:04 +01:00
Cedric Beck	2ac2de645b	working on matrix-animation	2024-12-06 14:56:04 +01:00
Felix Koppe	d39f85fbe9	Add some javaDoc to client	2024-12-06 14:26:13 +01:00
Felix Koppe	960a57caba	Fix broken lose sound	2024-12-06 13:28:38 +01:00
Felix Koppe	36631df2e9	Fix broken jet-sound	2024-12-06 13:26:28 +01:00
Felix Koppe	df27c23cd5	Fix shadercode	2024-12-06 13:19:17 +01:00
Felix Koppe	acd64d1507	Fix shadercode	2024-12-06 13:14:54 +01:00
Felix Koppe	76f86c8a66	Improve audioSettings	2024-12-06 11:35:05 +01:00
Hanno Fleischer	308b592b65	Merge branch 'development' into 'dev/model' ... Development merge See merge request progproj/gruppen-ht24/Gruppe-01!36	2024-12-06 09:55:19 +00:00
Felix Koppe	c4e7fb1d41	Fix logic in modelSyncronizer	2024-12-06 10:54:02 +01:00
Felix Koppe	aacc0440b3	Update .gitignore	2024-12-06 10:33:13 +01:00
Hanno Fleischer	43c0e3bcc7	Merge branch 'development' into 'dev/model' ... Development See merge request progproj/gruppen-ht24/Gruppe-01!35	2024-12-06 09:09:29 +00:00
Felix Koppe	95635f5fb7	Fix ownColor in gameView	2024-12-06 09:59:28 +01:00
Felix Koppe	e337b1f888	Fix card select issue	2024-12-06 09:57:28 +01:00
Felix Koppe	0237bcc4be	Fix card select issue	2024-12-06 09:51:17 +01:00
Felix Koppe	26836d16cc	Fix card select issue	2024-12-06 09:48:24 +01:00
Felix Koppe	a6c8cc33f4	Make cardSelect trigger needCconfirm	2024-12-06 09:31:02 +01:00
Felix Koppe	7f5f4b8c68	Fix broken sound	2024-12-06 09:24:49 +01:00
Felix Koppe	7f3483aa6b	Add broken sound	2024-12-06 09:22:10 +01:00
Felix Koppe	8422b7be1e	Merge branch 'development' into dev/client_koppe2	2024-12-06 09:11:09 +01:00
Felix Koppe	f0b23ab9c2	Readd broken files	2024-12-06 09:10:47 +01:00
Felix Koppe	78f1dbb3d3	Remove broken files	2024-12-06 09:08:52 +01:00
Daniel Grigencha	4904b32ea3	Updated 'ChoosePieceState' class. ... Updated the 'ChoosePieceState' class by adding the 'RequestMoveMessage' handling to it.	2024-12-06 08:58:51 +01:00
Daniel Grigencha	b00219c4fb	Updated 'PlayPowerCardState' class. ... Updated the 'PlayPowerCardState' class by adding the 'AnimationEndMessage' handling to it.	2024-12-06 08:58:01 +01:00
Daniel Grigencha	12cf5f3e71	Updated 'PowerCardState' class. ... Updated the 'PowerCardState' class by adding the 'SelectedPiecesMessage' handling to it.	2024-12-06 08:57:08 +01:00
Daniel Grigencha	77b0207214	Updated 'TurnState' class. ... Updated the 'TurnState' class by adding the 'SelectedPiecesMessage', 'NoPowerCardMessage', 'RequestDieMessage' and 'ReuqestMoveMessage' handling to it.	2024-12-06 08:56:21 +01:00
Daniel Grigencha	a18165bc02	Updated 'Game' class. ... Updated the 'Game' class by commenting out the creation of turbo and shield cards. This is only for testing purposes.	2024-12-06 08:55:01 +01:00
Felix Koppe	9e758e4417	Merge branch 'dev/model' into dev/client_koppe2	2024-12-06 08:11:37 +01:00
Daniel Grigencha	62ceff822f	Updated 'DetermineStartPlayerState' class. ... Updated the 'DetermineStartPlayerState' class by adding logic for the roll again event to the 'RequestDieMessage' handling.	2024-12-06 04:54:14 +01:00
Hanno Fleischer	33afc4ab3b	added selectDice method in RollDiceState	2024-12-06 04:48:05 +01:00
Daniel Grigencha	322d539cfd	Merge branch 'dev/model' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into dev/model	2024-12-06 04:28:40 +01:00
Daniel Grigencha	9c4f2387ee	Updated 'FirstRollState', 'SecondRollState' and 'ThirdROllState' classes. ... Updated the 'FirstRollState', 'SecondRollState' and 'ThirdROllState' class by adding the 'received(RequestDieMessage msg, int from)' method to them.	2024-12-06 04:28:33 +01:00
Daniel Grigencha	9d1430e488	Updated 'AnimationState' class. ... Updated the 'AnimationState' class by setting the data type of 'messageReceived' from 'Map' to 'Set'.	2024-12-06 04:27:10 +01:00
Daniel Grigencha	dd2146d417	Updated 'DetermineStartPlayerState' class. ... Updated the 'DetermineStartPlayerState' class by setting the data type of 'messageReceived' from 'Map' to 'Set'.	2024-12-06 04:26:38 +01:00
Daniel Grigencha	d9ad0f0a4b	Updated 'LobbyState' class. ... Updated the 'LobbyState' class by setting the first waiting piece on the start node.	2024-12-06 04:25:45 +01:00
Hanno Fleischer	0368ec8541	implemented the correct transition, when the player can play no powercard	2024-12-06 04:18:58 +01:00
Daniel Grigencha	72f0bc5a2f	Updated 'RollDiceState' class. ... Updated the 'RollDiceState' class by adding the 'received(RequestDieMessage msg, int from)' method to it.	2024-12-06 04:17:29 +01:00
Daniel Grigencha	23ae4a3080	Updated 'DetermineStartPlayaerState' class. ... Updated the 'DetermineStartPlayerState' class by calling the right method of the 'entry' inside the 'RequestDieMessage' handling.	2024-12-06 04:14:42 +01:00
Daniel Grigencha	765b1884fe	Updated 'AnimationState' class. ... Updated the 'AnimationState' class by removing the unused 'DiceNowMessage' call from it.	2024-12-06 03:57:42 +01:00
Daniel Grigencha	e3febd6ba1	Updated 'DetermineStartPlayerState' class. ... Updated the 'DetermineStartPlayerState' class by removing the 'rolls' attribute and its usage from it.	2024-12-06 03:49:39 +01:00
Daniel Grigencha	1a562a8d38	Updated 'DeterminStartPlayerState' class. ... Updated the 'DetermineStartPlayerState' class by adding the multi roll support to it. In Addition, the server model will be updated correctly.	2024-12-06 03:29:11 +01:00
Daniel Grigencha	39ed4238b5	Updated 'AnimationState' class. ... Updated the 'AnimationState' class by adding a missing semicolon.	2024-12-06 03:27:55 +01:00
Daniel Grigencha	620063e894	Updated 'AnimationState' class. ... Updated the 'AnimationState' class by updating the 'messageReceived' attribute in it. In Addition, the 'AnimationEndMessage' handling was updated.	2024-12-06 03:22:25 +01:00
Daniel Grigencha	2d0788eb72	Updated 'TurnState' class. ... Updated the 'TurnState' class by updating the imports in it.	2024-12-06 03:20:28 +01:00
Daniel Grigencha	8470a96908	Updated 'DetermineStartPlayerState' class. ... Updated the 'DetermineStartPlayerState' class by updating the 'AnimationEndMessage' handling in it. In Addition, the 'RequestDieMessage' handling was updated as well.	2024-12-06 02:55:14 +01:00
Hanno Fleischer	a6205c982a	now sending AnimationEndMessage when in Waitranking State	2024-12-06 02:40:16 +01:00
Daniel Grigencha	58b9298c91	Merge branch 'dev/model' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into dev/model	2024-12-06 02:38:53 +01:00
Daniel Grigencha	1e6856744b	Updated 'DetermineStartPlayerState' class. ... Updated the 'DetermineStartPlayerState' class by adding the 'received(AnimationEndMessage msg, int from)' method to it.	2024-12-06 02:38:46 +01:00
Hanno Fleischer	f713e00c36	made all 'PowerCards' serializable	2024-12-06 02:30:13 +01:00
Daniel Grigencha	81ae896ae8	Updated 'TurnState' class. ... Updated the 'TurnState' class by removing the start state of this state machine of the constructor.	2024-12-06 02:22:46 +01:00
Daniel Grigencha	5b55d39c9a	Updated 'AnimationState' class. ... Updated the 'AnimationState' class by solving the transition error due to the separat state change.	2024-12-06 02:22:07 +01:00
Hanno Fleischer	f36e2ff7bb	adjusted the getter for the card in the intro to get BonusCards instead of PowerCards	2024-12-06 02:16:58 +01:00
Hanno Fleischer	16afe95aa6	Merge branch 'dev/model' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into dev/model	2024-12-06 02:13:08 +01:00
Hanno Fleischer	55d398b428	adjusted all useages of the SelectedPieces consturctor to transfer the right parameters	2024-12-06 02:12:59 +01:00
Daniel Grigencha	affa2ecd7e	Added 'ChoosePowerCardState', 'ShieldCardState', 'SwapCardState' and 'TurboCardState' classes. ... Updated the 'ChoosePowerCardState', 'ShieldCardState', 'SwapCardState' and 'TurboCardState' classes to this project. They will be used inside the power card state. In Addition, the abstract 'PowerCardAutomatonState' class was added.	2024-12-06 02:11:32 +01:00
Hanno Fleischer	0a1bd1f503	adjusted all State containing 'received(PlayCardMessage msg)' to work with the new message	2024-12-06 02:04:55 +01:00
Daniel Grigencha	a2867fc88a	Added 'ServerCardVisitor' class. ... Added the 'ServerCardVisitor' class to this project. It will be used as a visitor on the server to differentiate between all types of power cards.	2024-12-06 01:41:45 +01:00
Daniel Grigencha	c6761d91d1	Updated 'PowerCardState' class. ... Updated the 'PowerCardState' class by updating the content of the 'enter' in it.	2024-12-06 01:37:24 +01:00
Daniel Grigencha	5708ee6ffe	Updated 'PlayCardMessage' class. ... Updated the 'PlayCardMessage' class by removing the 'ownPieceID' and 'enemyPieceID' attributes and their getter methods from it. In Addition, the 'pieces' attribute and its getter method was added.	2024-12-06 01:28:44 +01:00
Hanno Fleischer	d61b68aa41	overrode hachCode and equals method of Piece	2024-12-06 01:15:06 +01:00
Daniel Grigencha	e98418b274	Merge branch 'dev/model' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into dev/model	2024-12-06 01:06:20 +01:00
Daniel Grigencha	66dc9c02ea	Updated 'PowerCardState' class. ... Updated the 'PowerCardState' class by adding the 'currentState', 'choosePowerCardState', 'shieldCardState', 'swapCardState' and 'turboCardState' attributes and its getter methods to it. In Addition, logic was written into the 'enter' method.	2024-12-06 00:53:11 +01:00
Daniel Grigencha	dd95356abd	Updated 'TurnState' class. ... Updated the 'TurnState' class by adding the 'player' attribute and its getter method to it.	2024-12-06 00:50:48 +01:00
Daniel Grigencha	84776c71b2	Updated 'SelectedPiecesMessage' class. ... Updated the 'SelectedPiecesMessage' class by removing 'pieceIdentifier' attribute and its getter method from it. In Addition, the 'pieces' attribute and its getter method was added.	2024-12-06 00:47:33 +01:00
Daniel Grigencha	d07eee6251	Updated 'Piece' class. ... Updated the 'Piece' class by overwriting the 'toString' method in it.	2024-12-06 00:45:56 +01:00
Hanno Fleischer	b601ff2cf7	renamed 'PossibleCardMEssage' to 'PossibleCardsMessage' and completed JavaDocs for method 'getPowerCardByType' in 'Player'	2024-12-06 00:36:06 +01:00
Hanno Fleischer	04119d2f3e	modified 'ChoosePowerCardState' to work with PowerCards as well as adjusted 'SelectcardMessage' to use 'PowerCards'	2024-12-06 00:31:12 +01:00
Hanno Fleischer	a92c06a70e	added a method in 'Player' to return the first 'PowerCard' of a specific Type	2024-12-06 00:30:08 +01:00
Daniel Grigencha	50f9c0ef0c	Updated 'PossibleCardMessage' class. ... Updated the 'PossibleCardMessage' class by replacing all 'BonusCard' with 'PowerCard' in it.	2024-12-06 00:19:11 +01:00
Daniel Grigencha	f7f246daaa	Merge branch 'dev/model' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into dev/model	2024-12-06 00:16:42 +01:00
Daniel Grigencha	8a738a3633	Updated 'Game' class. ... Updated the 'Game' class by replacing all 'BonusCard' with 'PowerCard' in it.	2024-12-06 00:16:38 +01:00
Daniel Grigencha	3a32a7ebf7	Updated 'Player' class. ... Updated the 'Player' class by replacing all 'BonusCard' with 'PowerCard' in it.	2024-12-06 00:11:50 +01:00
Daniel Grigencha	6894802c00	Added 'HiddenCard', 'ShieldCard', 'SwapCard' and 'TurboCard' classes. ... Updated the 'HiddenCard', 'ShieldCard', 'SwapCard' and 'TurboCard' classes to this project. They will be used to display different types of power cards.	2024-12-06 00:04:21 +01:00
Daniel Grigencha	a09211da5f	Updated abstract 'PowerCard' class. ... Updated the abstract 'PowerCard' class by setting the 'card' attribute to 'protected' in it.	2024-12-06 00:03:16 +01:00
Daniel Grigencha	c9c9c5dcf6	Added abstract 'PowerCard' class. ... Added the abstract 'PowerCard' class to this project. It will be used to display different types of hand cards.	2024-12-05 23:58:43 +01:00
Daniel Grigencha	1e46b1dc59	Added 'Visitor' interface. ... Added the 'Visitor' interface to this project. It will be used to handle all types of power cards.	2024-12-05 23:54:55 +01:00
Hanno Fleischer	6c74acc334	added a getter for the BonusCrad in PowerCard	2024-12-05 23:07:22 +01:00
Hanno Fleischer	421231aa12	made BonusCard Serializable and added the method calls to display handcards during the intro	2024-12-05 22:46:48 +01:00
Daniel Grigencha	d8bb458e9c	Updated 'LobbyState' class. ... Updated the 'LobbyState' class by updating the 'initializeGame' method in it.	2024-12-05 23:45:24 +01:00
Hanno Fleischer	f0080118d0	Changed and : ... removed the selectAnimationEnd Method from Waitranking and moved logic into the receivedActivePlayerMessage. Added in selectStart to always send a StartGameMessage in order to trigger incorrectRequestMEssage	2024-12-05 22:34:53 +01:00
Daniel Grigencha	8a438ab069	Updated 'DetermineStartPlayerState' class. ... Updated the 'DetermineStartPlayerState' class by updating the whole start player determination process in it.	2024-12-05 23:29:21 +01:00
Daniel Grigencha	0ce8184069	Updated 'Game' class. ... Updated the 'Game' class by adding the 'draw' method to it. In Addition, the 'initializeDrawPile' method was updated by shuffling the 'drawPile' attribute after filling it.	2024-12-05 23:27:06 +01:00
Felix Koppe	2c524477d7	Merge branch 'dev/model' into dev/client_koppe2	2024-12-05 22:18:00 +01:00
Felix Koppe	587af466e8	Merge branch 'development' into dev/client_koppe2 ... # Conflicts: # Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java	2024-12-05 22:17:53 +01:00
Felix Koppe	8d398450f1	Minor changes	2024-12-05 22:15:59 +01:00
Felix Koppe	0a96dd6f9f	Repair sounds	2024-12-05 22:07:36 +01:00
Felix Koppe	e8a556de27	Add missle	2024-12-05 22:02:02 +01:00
Hanno Fleischer	1214d3c87c	added an getter for the error id in the IncorrectrequestMessage and implemeted how to handle it in the client game logic.	2024-12-05 21:11:40 +01:00
Daniel Grigencha	f2c34aee2d	Updated 'DetermineStartPlayerState' class. ... Updated the 'DetermineStartPlayerState' class by updating the 'received(RequestDieMessage msg, int from)' method in it.	2024-12-05 22:03:48 +01:00
Daniel Grigencha	2da1fec7dd	Updated 'RankingResponseMessage' class. ... Updated the 'RankingResponseMessage' class by removing the 'startingPlayerId' attribute and its getter method from it. In Addition the 'rankingResults' attribute and its getter method were added.	2024-12-05 22:01:05 +01:00
Daniel Grigencha	5d76a89b95	Updated 'LobbyState' class. ... Updated the 'LobbyState' class by updating the 'JoinedLobbyMessage' and 'LobbyReadyMessage' handlings in it.	2024-12-05 21:58:20 +01:00
Daniel Grigencha	60ebef3518	Updated 'LobbyState' class. ... Updated the 'LobbyState' class by adding an 'IncorrectRequestMessage' to the start game handling.	2024-12-05 19:58:23 +01:00
Felix Koppe	a399b14291	Improve interrupt	2024-12-05 18:11:57 +01:00
Felix Koppe	9d21e2ce87	Merge commit	2024-12-05 18:00:27 +01:00
Felix Koppe	2255bfd648	Remove test binding	2024-12-05 18:00:04 +01:00
Hanno Fleischer	74194d8514	Merge branch 'development' into 'dev/model' ... Development See merge request progproj/gruppen-ht24/Gruppe-01!34	2024-12-05 16:58:50 +00:00
Fleischer Hanno	cabd98a24a	adjusted a broadcast in lobby state to a send to reduce traffic (original commit f1124f32) and removed souts as well as added comments back into the code	2024-12-05 17:51:18 +01:00
Cedric Beck	f3816cb2a5	added particle_cir.png	2024-12-05 17:49:56 +01:00
Cedric Beck	997c4c589e	removed setOwnColor	2024-12-05 17:23:15 +01:00
Cedric Beck	d14a0aef86	fixed ownColor sync problem	2024-12-05 17:22:37 +01:00
Felix Koppe	ac5d7ed74b	Add sounds	2024-12-05 17:11:07 +01:00
Felix Koppe	f1124f3245	Fix missing ready update from server on join of new player in LobbyState	2024-12-05 16:38:09 +01:00
Felix Koppe	fc4a357e9e	Merge branch 'dev/model' into dev/client_koppe2	2024-12-05 16:25:23 +01:00
Felix Koppe	a8b02faa96	Merge branch 'development' into dev/client_koppe2 ... # Conflicts: # Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java	2024-12-05 16:25:11 +01:00
Felix Koppe	4a7c23708c	Add jetAnimation	2024-12-05 16:21:13 +01:00
Hanno Fleischer	4478291852	added the movement of pieces in the intro state to be also done in the model	2024-12-05 15:22:38 +01:00
Hanno Fleischer	0622c35303	fixed state transitions and implemented the Intro state to move the pieces to the correct start setup ... added some logic so that the client only transitions to the intro state when the animation has finished at it received the new active Player, and after animating the setup it switches to the corresponding state baserd on the active player and displays the now new active player.	2024-12-05 14:02:02 +01:00
Daniel Grigencha	3b0cd9ebdb	Updated the JavaDocs in multiple classes, to improve readability.	2024-12-05 05:21:33 +01:00
Daniel Grigencha	e81aa67d36	Updated the JavaDocs in multiple classes, to improve readability.	2024-12-05 05:09:15 +01:00
Daniel Grigencha	4fb848420b	Updated the 'DisconnectedMessage' class. ... Updated the 'DisconnectedMessage' class by adding JavaDocs.	2024-12-05 05:03:39 +01:00
Daniel Grigencha	07a833afe7	Updated the 'ClientInterpreter' interface. ... Updated the 'ClientInterpreter' interface by adjusting the JavaDocs.	2024-12-05 05:00:29 +01:00
Daniel Grigencha	6576250113	Updated the 'Player' class. ... Updated the 'Player' class by adjusting the JavaDocs and writing the logic for the 'isFinished()' method.	2024-12-05 04:54:12 +01:00
Daniel Grigencha	154efccf31	Updated 'Game' class. ... Updated the 'Game' class by adjusting the JavaDocs and rewriting the constructor for maintainability and readability.	2024-12-05 04:52:59 +01:00
Daniel Grigencha	f90aed7bbb	Updated 'Color' enum. ... Updated the 'Color' enum by adjusting the JavaDocs and adding a new static method 'getColor(int)'	2024-12-05 04:51:55 +01:00
Daniel Grigencha	3a86837307	Updated the JavaDocs in multiple classes, to improve readability.	2024-12-05 04:50:34 +01:00
Daniel Grigencha	da0756452c	Updated the JavaDocs in multiple classes, to improve readability.	2024-12-05 04:49:49 +01:00
Daniel Grigencha	bfe8a20f92	Updated 'Board' class. ... Updated the 'Board' class by rewriting the constructor, to make it maintainable and scalable.	2024-12-05 04:46:01 +01:00
Felix Koppe	0e6a2499b7	Fix fullscreen issue	2024-12-04 18:38:35 +01:00
Hanno Fleischer	354cdc0a9c	added Intro state and its logic	2024-12-04 17:03:57 +01:00
Felix Koppe	00d86c5c10	Improve ceremonyView	2024-12-04 15:33:34 +01:00
Felix Koppe	990e476753	Add Q/E rotation	2024-12-04 15:27:33 +01:00
Felix Koppe	71fc08a05c	Add interrupt	2024-12-04 15:11:31 +01:00
Cedric Beck	9e1ca584c7	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-04 13:56:08 +01:00
Cedric Beck	9199fbffd8	removed tests, fixed null exception in CardLayer	2024-12-04 13:56:03 +01:00
Felix Koppe	5c71531277	Merge branch 'development' into dev/client_koppe2	2024-12-04 13:43:33 +01:00
Felix Koppe	6f7c5346d2	Merge commit	2024-12-04 13:34:14 +01:00
Felix Koppe	ef1ce63db6	Try to make server stop on leave	2024-12-04 13:33:39 +01:00
Hanno Fleischer	e8d1442e5b	made the model checkstyle compliant	2024-12-04 12:10:48 +01:00
Hanno Fleischer	bdacc4aad3	created the Intro state and renamed all packages to be checkstyle compliant	2024-12-04 12:08:38 +01:00
Cedric Beck	44ef21e6af	added handCard Num to playerName display + added remove card in guiHandler	2024-12-04 11:38:35 +01:00
Hanno Fleischer	8e8104b672	forgot to add StartGameMessage in previous commit	2024-12-04 11:10:26 +01:00
Hanno Fleischer	de899cef35	removed from every Message the getInfoTest method and only overrode the toString method in messages with content, in every other message it is handled through the parent class	2024-12-04 11:07:55 +01:00
Felix Koppe	11d6dd4500	Improve video dialog	2024-12-04 10:00:41 +01:00
Felix Koppe	d71f824ca6	Add fullscreen option	2024-12-04 09:41:08 +01:00
Felix Koppe	8e6cb27662	Fix lobbyView ready behavior on tskChange	2024-12-04 07:53:18 +01:00
Daniel Grigencha	29711d6210	Updated 'ClientStartGameMessage' class. ... Updated the 'ClientStartGameMesssage' class by preparing it for the correct BPMN diagram.	2024-12-04 02:46:07 +01:00
Daniel Grigencha	29d8e791f6	Updated 'Player' class. ... Updated the 'Player' class by adding the 'setPieceInHome' method to it.	2024-12-04 02:44:28 +01:00
Daniel Grigencha	4440341f79	Updated 'LobbyState' class. ... Updated the 'LobbyState' class by updating the creation of the 'ServerStartGameMessage' object. In Addition, the start process if all players are ready was removed.	2024-12-04 02:44:03 +01:00
Daniel Grigencha	de5c8bf44c	Updated 'Game' class. ... Updated the 'Game' class by adding the 'getPlayersAsList' method to it.	2024-12-04 02:43:29 +01:00
Daniel Grigencha	ab5cece1b3	Updated 'StartGameMessage' class. ... Updated the 'StartGameMessage' class by removing the unused 'forceStartGame' attribute from it.	2024-12-04 02:42:57 +01:00
Daniel Grigencha	b8ed5060d6	Updated 'Board' class. ... Updated the 'Board' class by removing the 'playerData' attribute and its getter method from it.	2024-12-04 02:42:16 +01:00
Daniel Grigencha	c0b72ae4da	Updated 'ServerStartGameMessage' class. ... Updated the 'ServerStartGameMessage' class by adding the 'players' attribute and its getter method to it.	2024-12-04 02:41:44 +01:00
Daniel Grigencha	c1b4caa82b	Updated 'LobbyState' class. ... Updated the 'LobbyState' class by updating the 'received(ServerStartGameMessage msg)' method in it after updating the 'ServerStartGameMessage' class.	2024-12-04 02:22:58 +01:00
Daniel Grigencha	a757158477	Updated 'MdgaServer' class. ... Updated the 'MdgaServer' class by removing the serializer registration in it.	2024-12-04 02:09:20 +01:00
Daniel Grigencha	964ff87b11	Updated client states. ... Updated the client states by removing all references to the 'PlayerData' class.	2024-12-04 01:47:31 +01:00
Hanno Fleischer	7053b163e5	adjusted LobbyState in the client to use the correct Data	2024-12-03 18:19:55 +01:00
Hanno Fleischer	81cb2f33ff	adjusted all constuctors of nodes so that if someone creates a node the piece will be null and the option for a constuctor without arguments is still given for serialization purposes	2024-12-03 17:56:39 +01:00
Hanno Fleischer	69865bb504	added the playeringamenotification to be created from the right dataset	2024-12-03 16:48:08 +01:00
Felix Koppe	db50986f3f	Fix serialisation issue	2024-12-03 15:38:13 +01:00
Felix Koppe	a0a088a0c4	Fix minor error in notification processing	2024-12-03 15:00:00 +01:00
Cedric Beck	c4d11ff961	added window title	2024-12-03 09:15:14 +01:00
Daniel Grigencha	bb51976127	Updated 'Node' class. ... Updated the 'Node' class by overload the 'isOccupied' method in it.	2024-12-03 04:57:30 +01:00
Daniel Grigencha	0db1f08f3c	Updated abstract 'GameAutomatonState' class. ... Updated the abstract 'GameAutomatonState' class by adding the 'getGameAutomaton' method to it.	2024-12-03 04:49:16 +01:00
Daniel Grigencha	336f1ec316	Updated 'Resources' class. ... Updated the 'Resources' class by adding the 'MAX_EYES' constant to it.	2024-12-03 04:29:16 +01:00
Daniel Grigencha	a1e687912a	Updated abstract 'TurnAutomatonState' class. ... Updated the abstract 'TurnAutomatonState' class by adding the 'getTurnAutomaton' method to it.	2024-12-03 04:09:35 +01:00
Daniel Grigencha	2248d044c1	Updated 'AnimationState' class. ... Updated the 'AnimationState' class by updating the content inside the 'received(AnimationEndMessage msg, int from) method in it.	2024-12-03 03:41:58 +01:00
Daniel Grigencha	79bf1c16e8	Updated 'Game' class. ... Updated the 'Game' class by adding the 'getActivePlayerId' method to it.	2024-12-03 03:40:24 +01:00
Daniel Grigencha	3353a890d3	Updated 'Game' class. ... Updated the 'Game' class by adding the 'getPlayerIdByColor' method to it.	2024-12-03 03:36:22 +01:00
Daniel Grigencha	a012402a85	Updated abstract 'TurnAutomatonState' class. ... Updated the abstract 'TurnAutomatonState' class by updating the JavaDoc text of the constructor.	2024-12-03 02:15:10 +01:00
Daniel Grigencha	5aaf8d4850	Updated 'TurnState' class. ... Updated the 'TurnState' class by setting the start state in it.	2024-12-03 01:31:22 +01:00
Daniel Grigencha	35ab777f04	Updated 'DetermineStartPlayerState' class. ... Updated the 'DetermineStartPlayerState' class by fixing the logic inside the received(RequestDieMessage msg, int from)' method in it.	2024-12-03 01:30:39 +01:00
Daniel Grigencha	c707abc465	Updated 'Die' class. ... Updated the 'Die' class by adding another constructor for test cases to it.	2024-12-03 01:04:02 +01:00
Daniel Grigencha	2a84e7cf65	Updated 'Player' class. ... Updated the 'Player' class by moving all content of 'PlayerData' class in 'Player' class.	2024-12-03 00:51:45 +01:00
Daniel Grigencha	3a02edb944	Updated 'PlayerData' class. ... Updated the 'PlayerData' class by updating the 'Piece' creation inside the constructor.	2024-12-03 00:50:53 +01:00
Daniel Grigencha	1870d4fe0e	Updated 'ShieldState' enumeration. ... Updated the 'ShieldState' enumeration by removing unused methods from it.	2024-12-03 00:49:09 +01:00
Daniel Grigencha	5cf9746931	Updated 'PieceState' enumeration. ... Updated the 'PieceState' enumeration by removing unused methods from it.	2024-12-03 00:48:39 +01:00
Daniel Grigencha	5b9bc7aa36	Updated 'Piece' class. ... Updated the 'Piece' class by removing the unused 'id' parameter from the constructor.	2024-12-03 00:38:24 +01:00
Daniel Grigencha	abe66aff5d	Updated 'LobbyState' class. ... Updated 'LobbyState' class by removed unused imports in it.	2024-12-03 00:37:24 +01:00
Fleischer Hanno	eea566cc8b	added the logic for server shutdown	2024-12-02 23:25:54 +01:00
Daniel Grigencha	bd07a44607	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-02 23:24:02 +01:00
Daniel Grigencha	1f64676d31	Updated 'MdgaServer' class. ... Updated the 'MdgaServer' class by adding the 'shutdown' message to it.	2024-12-02 23:23:56 +01:00
Daniel Grigencha	838f59b9aa	Updated 'ServerState' class. ... Updated the 'ServerState' class by filling the 'received(LeaveGameMessage msg, int from)' in it.	2024-12-02 23:22:45 +01:00
Daniel Grigencha	002a42be38	Updated 'LobbyState' class. ... Updated the 'LobbyState' class by removing the 'received(LeaveGameMessage msg, int from)' from it.	2024-12-02 23:21:42 +01:00
Daniel Grigencha	a1d10521ac	Updated 'ServerSener' interface. ... Updated the 'ServerSender' interface by adding the 'shutdown' method to it.	2024-12-02 23:14:29 +01:00
Fleischer Hanno	4e6a272e7a	added that when the client is in the game state and recieves the ceremony message it always changes to ceremony state	2024-12-02 23:08:56 +01:00
Daniel Grigencha	516848a67e	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-02 23:06:49 +01:00
Daniel Grigencha	659d69d3eb	Updated 'GameState' class. ... Updated the 'GameState' class by sending a broadcast message after a player left the game and only one player is remaining.	2024-12-02 23:06:44 +01:00
Daniel Grigencha	fb6cbeaaf5	Updated 'ServerStartGameMessage' class. ... Updated the 'ServerStartGameMessage' class by adding the 'board' attribute and its getter method to it.	2024-12-02 23:00:39 +01:00
Cedric Beck	25f750c8b6	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-02 22:58:58 +01:00
Cedric Beck	3f49b432c4	added SSAO and FXAA	2024-12-02 22:58:52 +01:00
Daniel Grigencha	252c37ae9a	Updated 'LobbyState' class. ... Updated the 'LobbyState' class by sending the 'ServerStartGameMessage' with a 'Board' object.	2024-12-02 22:58:46 +01:00
Fleischer Hanno	4566d4c9a8	Merge remote-tracking branch 'origin/development' into development	2024-12-02 22:46:12 +01:00
Fleischer Hanno	e9ba888651	changed the logic so that the isHost is not decided by the client and instead by the server	2024-12-02 22:45:44 +01:00
Cedric Beck	cbbb98037b	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-02 22:43:16 +01:00
Cedric Beck	aa651ec62f	added trees	2024-12-02 22:43:03 +01:00
Daniel Grigencha	e163b87cc4	Updated 'MdgaServer' class. ... Updated the 'MdgaServer' class by updating the logic inside the 'connectionAdded' method in it.	2024-12-02 22:41:17 +01:00
Daniel Grigencha	1eb24b7a66	Updated 'MdgaServer' class. ... Updated the 'MdgaServer' class by updating the logic inside the 'connectionAdded' method in it.	2024-12-02 22:37:46 +01:00
Daniel Grigencha	492f7422f5	Updated 'LobbyAcceptMessage' class. ... Updated the 'LobbyAcceptMessage' class by adding the 'host' attribute and its getter method to it.	2024-12-02 22:36:48 +01:00
Daniel Grigencha	27f8af70f5	Updated 'Game' class. ... Updated the 'Game' class by setting the default value of 'host' attribute. In Addition, the 'isHost' method was added.	2024-12-02 22:34:45 +01:00
Fleischer Hanno	5910fcc701	added the client logic to receive the LobbyAccept and LobbyDeny message	2024-12-02 21:52:07 +01:00
Felix Koppe	e94ed1e019	Fix syntax error	2024-12-02 21:51:09 +01:00
Felix Koppe	7d54a906dd	Add some more names	2024-12-02 21:48:23 +01:00
Felix Koppe	5ae65921bf	Add more random names	2024-12-02 21:42:12 +01:00
Daniel Grigencha	468e4005dc	Updated 'LobbyState' class. ... Updated the 'LobbyState' class by sending a broadcast update the new ready state of the client.	2024-12-02 21:23:53 +01:00
Daniel Grigencha	72321eab9a	Updated 'LobbyState' class. ... Updated the 'LobbyState' class by updating all received methods in it.	2024-12-02 21:22:49 +01:00
Daniel Grigencha	951c92d890	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-02 21:12:03 +01:00
Felix Koppe	e87eb569c2	Add showInfo to MdgaView	2024-12-02 21:16:50 +01:00
Felix Koppe	baa967ecfc	Merge commit	2024-12-02 21:12:56 +01:00
Felix Koppe	8d39d61c71	Add infoNotification	2024-12-02 21:12:43 +01:00
Daniel Grigencha	7fcee3cac0	Updated 'MdgaServer' class. ... Updated the 'MdgaServer' class by register the 'IncorrectRequestMessage' class to the serializer.	2024-12-02 21:11:59 +01:00
Daniel Grigencha	06d4b322e7	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-02 21:04:41 +01:00
Daniel Grigencha	1cf14f65bb	Updated 'MdgaServer' class. ... Updated the 'MdgaServer' class by updating the 'connectionAdded' method in it. In Addition, the JavaDoc text for this method was addded.	2024-12-02 21:04:36 +01:00
Fleischer Hanno	ebb9f839c7	added JavaDocs in Resources.java	2024-12-02 20:58:00 +01:00
Daniel Grigencha	3eef4b2a02	Updated 'PlayerData' class. ... Updated the 'PlayerData' class by replacing the magic constants with the 'Resources' class. In Addition, some JavaDoc texts were updated.	2024-12-02 20:56:59 +01:00
Daniel Grigencha	c1fa679261	Updated 'Resources' class. ... Updated the 'Resources' class by adding the 'MAX_PIECES' constant to it.	2024-12-02 20:45:07 +01:00
Daniel Grigencha	c48f924ead	Updated 'Resources' class. ... Updated the 'Resources' class by adding the 'MAX_PLAYERS' constant to it.	2024-12-02 20:43:47 +01:00
Fleischer Hanno	73859d8c81	added methods for getting Boolean, String, Double and int	2024-12-02 20:34:52 +01:00
Felix Koppe	1918aa80ff	Merge commit	2024-12-02 20:33:36 +01:00
Felix Koppe	d062b9dabc	Add forceStartGameButton to host in lobby	2024-12-02 20:32:46 +01:00
Fleischer Hanno	7ddcdc3f48	added the first error.messages and adjusted	2024-12-02 20:24:17 +01:00
Fleischer Hanno	2cefc2c293	Merge remote-tracking branch 'origin/development' into development	2024-12-02 20:19:44 +01:00
Daniel Grigencha	c4304ae99a	Updated 'Game' class. ... Updated the 'Game' class by removing the 'allReady' attribute in it. In Addtion, the 'areAllReady' method was added.	2024-12-02 20:19:13 +01:00
Fleischer Hanno	005df94114	added Resources calss to access teh properties	2024-12-02 19:55:18 +01:00
Daniel Grigencha	44f893ccef	Updated 'Game' class. ... Updated the 'Game' class by setting the 'die' attribute correctly inside the constructor.	2024-12-02 19:45:11 +01:00
Daniel Grigencha	0d9a922f55	Removed 'PlayerDataMessage' and 'StartBriefingMessage'.	2024-12-02 19:16:01 +01:00
Daniel Grigencha	289158cf35	Updated 'MdgaServer' class. ... Updated the 'MdgaServer' class by removing the 'PlayerDataMessage' and 'StartBriefingMessage' from the serializer.	2024-12-02 19:14:11 +01:00
Fleischer Hanno	0a0762b6c9	removed all instances of PlayerDataMEssage and StartBriefingMessage	2024-12-02 19:07:58 +01:00
Fleischer Hanno	90a21087df	added logic for incorrectRequest message and removed messages playerdata and startbriefing and created javadocs	2024-12-02 19:02:00 +01:00
Daniel Grigencha	294ecdc56f	Updated 'IncorrectRequestMessage' class. ... Updated the 'IncorrectRequestMessage' class by updating the content inside the 'accept' method in it.	2024-12-02 19:00:21 +01:00
Daniel Grigencha	347ed152b8	Added 'IncorrectRequestMessage' class. ... Added the 'IncorrectRequestMessage' class to this project. It will be used to send the client an incorrect request message to show they did something wrong.	2024-12-02 18:58:15 +01:00
Daniel Grigencha	3daafde9f1	Updated 'ServerInterpreter' class. ... Updated the 'ServerInterpreter' class by adding the 'received(IncorrectRequestMessage msg)' method to it.	2024-12-02 18:50:42 +01:00
Daniel Grigencha	09fda6b167	Updated 'Game' class. ... Updated the 'Game' class by adding the 'isColorTaken' method to it.	2024-12-02 18:18:04 +01:00
Cedric Beck	f21fd9b0a6	added setPauseOnLostFocus(false)	2024-12-02 17:28:37 +01:00
Cedric Beck	41e204b1f2	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-02 17:12:00 +01:00
Cedric Beck	208261c6bf	added clickDice Action + modelSync	2024-12-02 17:11:55 +01:00
Hanno Fleischer	0411f2ead4	fixed state transitions in gamestateclient automaton	2024-12-02 17:08:46 +01:00
Cedric Beck	eb819d4d5e	merge development	2024-12-02 16:49:37 +01:00
Cedric Beck	a2856bb157	added rollRankingResults	2024-12-02 16:47:28 +01:00
Daniel Grigencha	bcf17a0651	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-02 16:35:49 +01:00
Daniel Grigencha	eee6fccde5	Updated 'DetermineStartPlayerState' class. ... Updated the 'DetermineStartPlayerState' class by setting the start state correctly and enter it.	2024-12-02 16:35:40 +01:00
Felix Koppe	2118c72891	Adjust RollDiceNotification	2024-12-02 16:34:55 +01:00
Daniel Grigencha	cb362c4d0c	Used auto-reformate code.	2024-12-02 16:31:57 +01:00
Daniel Grigencha	1bcb73cff7	Updated 'PlayerData' class. ... Updated the 'PlayerData' class by adding the 'isFinished' method to it. In Addition, the empty constructor was optimized to initalize all class attributes for serializable cases.	2024-12-02 16:29:32 +01:00
Daniel Grigencha	167d898a3c	Updated 'StartNode' class. ... Updated the 'StartNode' class by reverting all enumerations to its origin types in it.	2024-12-02 16:25:33 +01:00
Daniel Grigencha	6c136b78b8	Updated 'Piece' class. ... Updated the 'Piece' class by reverting all enumeration to its orgin types.	2024-12-02 16:22:50 +01:00
Felix Koppe	82234a7ff9	Merge commit	2024-12-02 15:44:41 +01:00
Felix Koppe	92d2e74748	Fix error regarding color in lobbyState	2024-12-02 13:06:59 +01:00
Felix Koppe	4561a962d4	Fix lobby isSelf logic and no longer assign color on join	2024-12-02 12:52:07 +01:00
Hanno Fleischer	5db7b64cef	fixed bug with seriliazation of Board, now sending playerdata seperate from teh board	2024-12-02 12:16:53 +01:00
Felix Koppe	bb1b721e77	Fix lobby in serverAutomaton and adjust TskUpdateMessage	2024-12-02 11:48:54 +01:00
Cedric Beck	206cad2f79	removed test card	2024-12-02 11:01:02 +01:00
Cedric Beck	3717e7b794	added javadocs to board	2024-12-02 03:48:11 +01:00
Cedric Beck	a15d7932d4	fixed bug	2024-12-02 03:15:18 +01:00
Cedric Beck	d649e41e75	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-02 03:13:48 +01:00
Cedric Beck	6d0552f5a7	added javadocs to animation; moved outline package	2024-12-02 03:13:42 +01:00
Fleischer Hanno	47f9f46277	Merge remote-tracking branch 'origin/development' into development	2024-12-02 03:03:47 +01:00
Felix Koppe	b87f5de5fb	Fix error	2024-12-02 03:03:54 +01:00
Fleischer Hanno	c434bcb684	minor changes	2024-12-02 03:03:36 +01:00
Daniel Grigencha	b9617c0a14	Merge remote-tracking branch 'origin/development' into development	2024-12-02 02:53:05 +01:00
Daniel Grigencha	0aa73ca6ee	added the received method for a Shutdown Message	2024-12-02 02:52:48 +01:00
Cedric Beck	fbc7246037	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-02 02:52:41 +01:00
Cedric Beck	2703084df1	added move/swap/throw animation; reworked waitingNodes logic in BoardHandler	2024-12-02 02:51:52 +01:00
Daniel Grigencha	31b1d535ac	added a new 'ShutdownMessage' for the server	2024-12-02 02:32:50 +01:00
Daniel Grigencha	b3fb2f8fa4	added a new 'ShutdownMessage' for the server	2024-12-02 02:31:55 +01:00
Daniel Grigencha	8fcac9b809	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-02 02:15:29 +01:00
Daniel Grigencha	6985d988f4	Updated 'DetermineStartPlayerState' class. ... Updated the 'DetermineStartPlayerState' class by updating the logic inside the 'received(RequestDieMessage msg, int from)' method in it.	2024-12-02 02:15:22 +01:00
Fleischer Hanno	6c3103b2ed	fixing serialization error	2024-12-02 02:14:45 +01:00
Fleischer Hanno	3658c88d72	made all enums look like the color enum	2024-12-02 02:11:40 +01:00
Fleischer Hanno	bfc812b003	minas please help no serialization	2024-12-02 02:07:02 +01:00
Felix Koppe	413f35d7bf	Merge commit	2024-12-02 01:59:49 +01:00
Felix Koppe	c5cb3d4dd0	Add restart on resolution change	2024-12-02 01:59:37 +01:00
Daniel Grigencha	efb4439431	Updated 'Game' class. ... Updated the 'Game' class by adding the 'setDie' method to it.	2024-12-02 01:53:10 +01:00
Felix Koppe	601366f08d	Merge commit	2024-12-02 01:40:58 +01:00
Felix Koppe	918c1f2a8a	Add videoSettings	2024-12-02 01:40:45 +01:00
Daniel Grigencha	bf75b8afc9	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-02 01:39:07 +01:00
Daniel Grigencha	0b45727bd7	Updated 'Die' class. ... Updated the 'Die' class by adding a third constructor for test cases.	2024-12-02 01:39:01 +01:00
Daniel Grigencha	a19ac2fc51	Updated 'GameState' class. ... Updated the 'GameState' class by changing the data types of 'determineStartPlayerState, 'animationState' and 'turnState' attributes in it.	2024-12-02 01:27:21 +01:00
Daniel Grigencha	79f0e55c52	default value of playerData in 'Board'	2024-12-02 01:19:41 +01:00
Fleischer Hanno	44378486d4	Merge remote-tracking branch 'origin/development' into development	2024-12-02 01:17:14 +01:00
Fleischer Hanno	149931d2cb	fixed PlayerData mistake	2024-12-02 01:16:33 +01:00
Daniel Grigencha	1250500558	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-02 01:01:49 +01:00
Daniel Grigencha	177bfe3001	Updated 'DetermineStartPlayerState' class. ... Updated the 'DeterminStartPlayerState' class by removing the 'getDiceResults' method from it. In Addition, the logic inside the 'received(RequestDieMessage msg, int from)' was added.	2024-12-02 01:01:42 +01:00
Felix Koppe	138444439d	Merge remote-tracking branch 'origin/development' into development	2024-12-02 00:53:58 +01:00
Felix Koppe	702f96b8db	Add videoSettings	2024-12-02 00:53:11 +01:00
Fleischer Hanno	1b6407b75b	fixed bug	2024-12-02 00:52:28 +01:00
Fleischer Hanno	c649b8f3ae	creating MapCreation Notification	2024-12-02 00:44:11 +01:00
Daniel Grigencha	41a669d44d	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-02 00:42:17 +01:00
Daniel Grigencha	4b6b12c0ac	Updated 'Board' class. ... Updated the 'Board' class by adding the 'addPlayerData' method to it.	2024-12-02 00:42:07 +01:00
Daniel Grigencha	c1280ba089	Updated 'LobbyState' class. ... Updated the 'LobbyState' class by adding 'initializeGame' method to it.	2024-12-02 00:40:21 +01:00
Felix Koppe	02f285a258	Remove cheat button	2024-12-02 00:39:58 +01:00
Daniel Grigencha	bcb0ebc0f8	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-02 00:29:21 +01:00
Daniel Grigencha	a19902f819	Updated 'LobbyState' class. ... Updated the 'LobbyState' class by changing the method call 'isActive' to 'isReady'.	2024-12-02 00:28:59 +01:00
Fleischer Hanno	585687055c	Merge remote-tracking branch 'origin/development' into development	2024-12-02 00:28:41 +01:00
Fleischer Hanno	a86319082c	included the LobbyPlayerJoined MEssage parameter of isHost	2024-12-02 00:28:04 +01:00
Daniel Grigencha	7acc55fe25	Updated 'MdgaServer' class. ... Updated the 'MdgaServer' class by saving the host into the 'Game' class.	2024-12-02 00:28:01 +01:00
Daniel Grigencha	3e56de2a17	Updated 'LobbyState' class. ... Updated the 'LobbyState' class by changing the method call 'isActive' to 'isReady'.	2024-12-02 00:23:03 +01:00
Daniel Grigencha	468cd97374	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-02 00:20:41 +01:00
Daniel Grigencha	dee6bf9f9c	Updated 'Game' class. ... Updated the 'Game' class by adding the 'host' attribute and its getter method to it.	2024-12-02 00:19:46 +01:00
Daniel Grigencha	ea6431faa4	Updated 'LobbyPlayerJoinedMessage' class. ... Updated the 'LobbyPlayerJoinedMessage' class by adding the 'host' attribute and its getter method to.	2024-12-02 00:12:46 +01:00
Cedric Beck	f272fd6f08	fixed bug again	2024-12-02 00:10:58 +01:00
Cedric Beck	bfc74ee126	fixed bug	2024-12-02 00:04:48 +01:00
Cedric Beck	d890d11978	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-01 23:58:57 +01:00
Daniel Grigencha	9af20346f1	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-01 23:58:44 +01:00
Cedric Beck	f853b0b54f	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-01 23:57:59 +01:00
Cedric Beck	9dd2d3f58b	added finish text; edited Notifications	2024-12-01 23:57:53 +01:00
Daniel Grigencha	06e43903e6	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-01 23:57:39 +01:00
Fleischer Hanno	00a04c2403	fixed a bug	2024-12-01 23:57:39 +01:00
Daniel Grigencha	92cbd9202a	Updated 'LobbyState' class. ... Updated the 'LobbyState' class by fixing the error by sending the 'ServerStartGameMessage' after all players are ready.	2024-12-01 23:57:26 +01:00
Felix Koppe	9a06afe998	Merge commit	2024-12-01 23:56:33 +01:00
Felix Koppe	289390c528	Add comment	2024-12-01 23:56:24 +01:00
Fleischer Hanno	7712a23d00	added transition from Lobby to Game	2024-12-01 23:50:37 +01:00
Fleischer Hanno	8137a727f5	Merge remote-tracking branch 'origin/development' into development	2024-12-01 23:49:30 +01:00
Felix Koppe	d904a28ee0	Remove mock	2024-12-01 23:48:18 +01:00
Fleischer Hanno	2f2d9c7479	Merge remote-tracking branch 'origin/development' into development	2024-12-01 23:42:56 +01:00
Fleischer Hanno	c2b6e6e9e9	made all classes for ServerStartGameMEssage serializiable	2024-12-01 23:42:32 +01:00
Daniel Grigencha	697b974ce1	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-01 23:42:09 +01:00
Felix Koppe	f0cab64910	Minor change	2024-12-01 23:46:46 +01:00
Daniel Grigencha	adcf65d7aa	Updated 'LobbyState' class. ... Updated the 'LobbyState' class by sending a broadcast message after all players are ready. In Addition, the 'ServerStartGameMessage' getting the 'Board' object.	2024-12-01 23:41:10 +01:00
Daniel Grigencha	8f53b76a3e	Updated 'ServerStartGameMessage' class. ... Updated the 'ServerStartGameMessage' class by adding the 'board' attribute and its getter method to it.	2024-12-01 23:39:36 +01:00
Cedric Beck	eaef4b20ba	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-01 23:34:02 +01:00
Cedric Beck	d3fe2fec14	added show/hide functionality for select button	2024-12-01 23:33:28 +01:00
Daniel Grigencha	02d7ef1dd8	Updated 'ChoosePieceState' class. ... Updated the 'ChoosePieceState' to work correctly as a state automaton.	2024-12-01 23:28:50 +01:00
Daniel Grigencha	23aa2db714	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-01 23:27:50 +01:00
Daniel Grigencha	e68369074f	Updated 'RollDiceState' class. ... Updated the 'RollDiceState' class by removing a spelling mistake.	2024-12-01 23:27:45 +01:00
Daniel Grigencha	aafc804c3f	Updated 'ChoosePieceState' class. ... Updated the 'ChoosePieceState' to work correctly as a state automaton.	2024-12-01 23:26:53 +01:00
Felix Koppe	bec199036c	Minor change	2024-12-01 23:10:25 +01:00
Fleischer Hanno	a7e048d4b4	Merge remote-tracking branch 'origin/development' into development	2024-12-01 23:08:50 +01:00
Felix Koppe	bcd510804f	Merge commit	2024-12-01 23:12:46 +01:00
Felix Koppe	7319f7a62c	Process startMenuNotification in lobby	2024-12-01 23:12:36 +01:00
Fleischer Hanno	a1e51fb2f4	added logic to the leave game method	2024-12-01 23:08:25 +01:00
Daniel Grigencha	f15d0eb5d8	Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development	2024-12-01 23:06:31 +01:00
Daniel Grigencha	f484a4abc8	Updated server states. ... Updated server stats by adding the logger to all states. In Addition, new joined clients should be updated correctly.	2024-12-01 23:06:02 +01:00
Felix Koppe	5905a232a5	Adjust state	2024-12-01 23:03:26 +01:00
Cedric Beck	12cb87ef70	added outline package back	2024-12-01 22:56:09 +01:00
Cedric Beck	9cb7a156bb	Merge branch 'development' into dev/client_beck	2024-12-01 22:47:48 +01:00
Fleischer Hanno	76e2606847	reverted the client state machine	2024-12-01 22:47:13 +01:00
Cedric Beck	7762b97303	added init & taktical view by ownColor	2024-12-01 22:46:17 +01:00
Daniel Grigencha	eaf46f3e14	updated the project to pass the checkstyle	2024-12-01 22:37:49 +01:00
Fleischer Hanno	92be52b62a	fixed server join logic	2024-12-01 22:33:30 +01:00
Fleischer Hanno	7a0a3589a5	trying to fix server ip to use outward ip	2024-12-01 22:14:09 +01:00
Cedric Beck	661c28f096	merge to dev/client_beck from development	2024-12-01 22:06:30 +01:00
Cedric Beck	4a94e85aac	Merge branch 'dev/client' into dev/client_beck	2024-12-01 21:55:37 +01:00
Felix Koppe	799bd096a0	Merge development	2024-12-01 21:56:52 +01:00
Fleischer Hanno	5a68d3b146	fixed a method call for getMoveIndices	2024-12-01 21:52:28 +01:00
Cedric Beck	63fa692910	removed comments	2024-12-01 21:52:28 +01:00
Felix Koppe	638cb93d7b	Merge dev/client_beck	2024-12-01 21:51:01 +01:00
Fleischer Hanno	133f900ec7	added the server and network functionality for mdga and fixed the communication in the Lobby	2024-12-01 21:50:28 +01:00
Fleischer Hanno	33ddea4221	Merge remote-tracking branch 'origin/development' into development	2024-12-01 21:49:30 +01:00
Daniel Grigencha	977a7294ad	updated server state diagram and added missing classes	2024-12-01 21:49:11 +01:00
Cedric Beck	7db75a2ca1	added converted assets	2024-12-01 21:48:40 +01:00
Daniel Grigencha	71d5701cc7	added javadoc for the classes in the notification package	2024-12-01 21:44:35 +01:00
Fleischer Hanno	42feca466d	Merge remote-tracking branch 'origin/development' into development	2024-12-01 21:05:41 +01:00
Daniel Grigencha	95a1f8d858	removed all inheritance of the automaton for testing purposes	2024-12-01 21:05:22 +01:00
Fleischer Hanno	76757c19a9	Merge remote-tracking branch 'origin/development' into development	2024-12-01 21:02:11 +01:00
Daniel Grigencha	c3fdcf4dc7	added the states of the server automaton for testing purposes	2024-12-01 21:01:37 +01:00
Fleischer Hanno	8ffab12f49	Merge remote-tracking branch 'origin/development' into development	2024-12-01 20:57:57 +01:00
Cedric Beck	da2b1af698	fixed shutdown guiHandler bug	2024-12-01 20:45:24 +01:00
Daniel Grigencha	8369797120	added JavaDocs for the 'InterruptState' classe	2024-12-01 20:41:30 +01:00
Daniel Grigencha	ef450a23f5	added logger to server state chart	2024-12-01 20:35:40 +01:00
Cedric Beck	e5b007accd	debug commit	2024-12-01 20:24:26 +01:00
Daniel Grigencha	17f0aa0209	added the 'Die' class to the 'Game' class	2024-12-01 19:46:59 +01:00
Fleischer Hanno	1d8eff8ea9	Merge remote-tracking branch 'origin/development' into development	2024-12-01 19:45:06 +01:00
Daniel Grigencha	ff31335a98	added a new class 'Die' to handle the dice. added this class to the class 'Game'	2024-12-01 19:38:26 +01:00
Daniel Grigencha	3467dd2f04	added a new method getColorByIndex(int) and next() method to the enum 'Color'	2024-12-01 19:37:40 +01:00
Daniel Grigencha	fb6cfaa518	added JavaDocs for the classes in the package 'game'	2024-12-01 19:36:58 +01:00
Cedric Beck	c08c81ea46	edited map	2024-12-01 18:42:57 +01:00
Fleischer Hanno	e9d45f241f	Merge remote-tracking branch 'origin/development' into development	2024-12-01 18:22:29 +01:00
Daniel Grigencha	bf38a7e00c	added a new method 'disconnectClient' in 'ServerSender' interface	2024-12-01 18:21:54 +01:00
Fleischer Hanno	5d638a1da7	Merge remote-tracking branch 'origin/development' into development	2024-12-01 18:20:16 +01:00
Fleischer Hanno	b83279e835	Merge remote-tracking branch 'origin/development' into development	2024-12-01 18:16:05 +01:00
Daniel Grigencha	eb54cfbc80	adjusted constructor for mdga server	2024-12-01 18:15:56 +01:00
Cedric Beck	453aacfe1a	fixed missing messages	2024-12-01 18:12:31 +01:00
Daniel Grigencha	1513576291	added javadocs to the 'ServerState' class	2024-12-01 18:03:46 +01:00
Cedric Beck	2732a89da6	fixed error with SelectObjectOutliner	2024-12-01 17:47:04 +01:00
Felix Koppe	5b8032bed9	Prepare for model	2024-12-01 17:44:37 +01:00
Felix Koppe	21f98de3e6	Minor adjustment	2024-12-01 17:32:05 +01:00
Cedric Beck	b099972656	merge from dev/client_beck	2024-12-01 17:10:04 +01:00
Fleischer Hanno	5206b03966	added java docs	2024-12-01 17:03:56 +01:00
Cedric Beck	eb703cbd2c	fixed bad performancegit status!; edited GameNotification; fixed error because of changed 'Color' enum	2024-12-01 17:03:09 +01:00
Daniel Grigencha	8c03b282b3	deleted the color attribute and their usages	2024-12-01 16:58:37 +01:00
Daniel Grigencha	a29e942191	added logic to the 'MdgaServer' class	2024-12-01 16:57:48 +01:00
Daniel Grigencha	efc7a2f09d	added logic to the 'LobbyState' class ... - for leaving the lobby	2024-12-01 16:49:05 +01:00
Daniel Grigencha	121d668bf2	added logic to the 'LobbyState' class	2024-12-01 16:08:14 +01:00
Fleischer Hanno	ba5b9dc4b4	added the getter for the forcestartGame value in teh corresponding message	2024-12-01 16:04:55 +01:00
Daniel Grigencha	772c7a51e0	updated enum 'Color'	2024-12-01 15:54:06 +01:00
Fleischer Hanno	ed04bc1119	changed all messages to work with a UUID of a piece instead of a string identifier	2024-12-01 15:45:30 +01:00
Fleischer Hanno	7712ee2e7c	renamed JoinServerMessage to JoinedLobbyMessage and wrote a getter for the name in the message	2024-12-01 15:14:42 +01:00
Fleischer Hanno	1d5733a4b9	added a method for getting a piece through a uuid	2024-12-01 15:05:26 +01:00
Fleischer Hanno	dfea7e8736	added java docs for choosepowercard	2024-12-01 14:37:04 +01:00
Felix Koppe	2c81665f80	Update startmenu.png	2024-12-01 14:22:18 +01:00
Felix Koppe	150e4e4c22	Merge development	2024-12-01 14:18:44 +01:00
Felix Koppe	4ff84e64ed	Merge development	2024-12-01 14:11:10 +01:00
Felix Koppe	e6fb78507c	Remove garbarge files	2024-12-01 14:10:04 +01:00
Felix Koppe	9067a9b04c	Add javadoc	2024-12-01 14:08:33 +01:00
Felix Koppe	6758abd60e	Add javadoc to buttons	2024-12-01 13:56:45 +01:00
Fleischer Hanno	e70331d85d	changed parameter of DieMessage and included the force resumgame logic in intterrupt	2024-12-01 13:56:31 +01:00
Felix Koppe	c3ad8fe79a	Gerneral improvements	2024-12-01 13:35:14 +01:00
Fleischer Hanno	26d2d0587d	added the remaining logic for GameState and its substatemachines	2024-12-01 12:36:44 +01:00
Fleischer Hanno	00b3ef1d80	added selectNext in CLG	2024-12-01 12:12:37 +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
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
Felix Koppe	a630ade2e1	Fix lobbyView leave	2024-11-30 14:21:45 +01:00
Felix Koppe	b197d70d44	Fix errors	2024-11-30 14:18:00 +01:00
Felix Koppe	67d120c278	Fix error	2024-11-30 14:10:42 +01:00
Felix Koppe	d53067f21a	Merge dev/client	2024-11-30 14:03:54 +01:00
Felix Koppe	4313468a0c	Finish merge	2024-11-30 14:00:42 +01:00
Felix Koppe	0393e9b534	Fixing errors	2024-11-30 13:47:34 +01:00
Felix Koppe	f3bc6bc2f0	Fixing errors	2024-11-30 13:38:08 +01:00
Felix Koppe	12abe081c9	Minor changes	2024-11-30 13:21:31 +01:00
Felix Koppe	02b536aa82	102IQ	2024-11-30 13:17:53 +01:00
Felix Koppe	99ffee749e	101IQ	2024-11-30 13:14:41 +01:00
Felix Koppe	6f71a8b16d	Work#	2024-11-30 13:12:51 +01:00
Felix Koppe	a78b3acacd	100IQ	2024-11-30 13:10:46 +01:00
Fleischer Hanno	0487ff0238	modified messages to work with piece uuid instead of an identifier.	2024-11-30 13:02:23 +01:00
Felix Koppe	6a85aca970	Readd .run after some fool deleted it	2024-11-30 12:56:12 +01:00
Felix Koppe	c2cfd8c175	Merge remote-tracking branch 'origin/dev/client_beck' into dev/client_beck ... # Conflicts: # Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java # Projekte/mdga/model/src/main/java/pp.mdga/server/Lobby.java	2024-11-30 12:48:49 +01:00
Felix Koppe	af5d4a95cd	Remove notifications	2024-11-30 12:45:08 +01:00
Felix Koppe	129ce54dd8	Merge branch 'refs/heads/development' into dev/client_beck ... # Conflicts: # Projekte/mdga/model/src/main/java/pp.mdga/server/DetermineStartPlayer.java # Projekte/mdga/model/src/main/java/pp.mdga/server/Lobby.java # Projekte/mdga/model/src/main/java/pp.mdga/server/Turn.java # Projekte/mdga/model/src/main/java/pp/mdga/notification/SelectableMoveNotification.java # Projekte/mdga/model/src/main/java/pp/mdga/notification/SelectablePiecesNotification.java # Projekte/mdga/model/src/main/java/pp/mdga/notification/SelectableSwapNotification.java	2024-11-30 12:44:04 +01:00
Felix Koppe	8c8bd4db0d	Add sounds	2024-11-30 12:37:18 +01:00
Cedric Beck	1c222ce0e0	tried mergee with development	2024-11-30 12:36:09 +01:00
Cedric Beck	f7a34d0d59	tried merge with dev/client	2024-11-30 12:34:39 +01:00
Cedric Beck	cbb21e92f8	added init/shutdown	2024-11-30 12:07:42 +01:00
Fleischer Hanno	4d6cd63a3d	made all notifications constructors public	2024-11-30 11:24:46 +01:00
Felix Koppe	36d31e99e9	Fix error	2024-11-30 11:19:54 +01:00
Felix Koppe	28a2c9a448	Add confirm button	2024-11-30 11:17:42 +01:00
Felix Koppe	dd8b16f1ac	Merge commit	2024-11-30 10:52:44 +01:00
Felix Koppe	be15b3bd63	Minor changes	2024-11-30 10:51:35 +01:00
Cedric Beck	07f0f55192	added further notification implemenation	2024-11-30 00:33:10 +01:00
Cedric Beck	13690cf73d	added skybox; reworked guiHandler	2024-11-29 21:28:50 +01:00
Cedric Beck	220d8ff47e	added activePlayer+diceNum text display	2024-11-29 17:26:04 +01:00
Cedric Beck	67bb30d124	added new notifications for client-view communication	2024-11-29 15:23:34 +01:00
Felix Koppe	184410ba31	Merge commit	2024-11-29 14:38:23 +01:00
Felix Koppe	3147f5b7a3	Fix some errors	2024-11-29 14:37:46 +01:00
Felix Koppe	0e79f35cb0	Merge dev/client_koppe2	2024-11-29 14:02:59 +01:00
Felix Koppe	f024ba4866	Add preferences and sounds	2024-11-29 14:01:18 +01:00
Felix Koppe	35270cce7b	Fix ceremony statistics error	2024-11-29 12:49:07 +01:00
Felix Koppe	b0761082ce	Fix error after merge	2024-11-29 12:42:03 +01:00
Felix Koppe	46182b33a8	Merge dev/client_koppe2 and development	2024-11-29 12:36:07 +01:00
Felix Koppe	457023ad93	Work	2024-11-29 12:30:59 +01:00
Felix Koppe	c3055a0646	Work	2024-11-29 12:29:20 +01:00
Felix Koppe	ae1ec74056	Merge dev/client_beck	2024-11-29 10:48:05 +01:00
Felix Koppe	24cc81d9d4	Merge remote-tracking branch 'origin/dev/client_beck' into dev/client_koppe2 ... # Conflicts: # Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java # Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java # Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java	2024-11-29 10:13:15 +01:00
Felix Koppe	c25c12d0d6	Work on ceremony2	2024-11-29 09:45:36 +01:00
Felix Koppe	7b689d6bf6	Work on ceremony	2024-11-28 21:39:08 +01:00
Cedric Beck	2099e02567	added board dice; edited DiceControl; added high-res font; working on ActionTextHandler	2024-11-28 20:07:15 +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
Cedric Beck	3dcdbdf489	added display of 'colorÃ' to playerName	2024-11-28 17:29:59 +01:00
Felix Koppe	88cb87d4cd	Merge commit	2024-11-28 16:25:57 +01:00
Felix Koppe	827e7aac86	Add stuff	2024-11-28 16:25:13 +01:00
Felix Koppe	eec68188ee	Make use of parallelProjection	2024-11-28 16:08:33 +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
Felix Koppe	3235a46788	Rewrite gui	2024-11-28 15:00:53 +01:00
Cedric Beck	7da388af37	added improved pieces model; added functionality to notifications + todos	2024-11-28 02:08:51 +01:00
Cedric Beck	304acf17a3	added full highlight functionality for bonuscards; added bonus Symbols display	2024-11-28 01:21:15 +01:00
Cedric Beck	9736dc828b	added highlight to bonuscards	2024-11-27 19:50:29 +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
Cedric Beck	0b9fc90274	added dice, started adding notification implementation, added hover, highlight and select functionality for pieces	2024-11-27 03:05:35 +01: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
Cedric Beck	6528e5c2b6	started adding notifications	2024-11-26 20:53:29 +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
Cedric Beck	c204a3a4cb	change shader folder structure	2024-11-26 17:05:38 +01:00
Cedric Beck	d794ba9d03	added smooth outline	2024-11-26 16:54:40 +01:00
Cedric Beck	e97147d0e9	merge from koppe	2024-11-26 16:47:24 +01:00
Cedric Beck	1b151aabdd	added select nodes, cards & pieces	2024-11-26 16:45:13 +01:00
Felix	3e7d3dbc1b	Fix	2024-11-26 16:18:33 +01:00
Cedric Beck	7a482b74ab	fixed shaders in/out	2024-11-26 13:29:40 +01:00
Cedric Beck	5cc1888794	merge dev/client_koppe into dev/client_beck for camera movement	2024-11-26 13:13:32 +01:00
Cedric Beck	9dd70a96a0	added outline for bonuscards	2024-11-26 12:56:26 +01:00
Cedric Beck	80f5c4ce90	tried adding shield outline, but there is a bug -> black screen	2024-11-26 07:40:41 +01:00
Fleischer Hanno	7eafa3da39	refactored the whole client package structure	2024-11-25 17:43:29 +01: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
Cedric Beck	b9986ded87	try push	2024-11-24 22:41:17 +01:00
Cedric Beck	fd09460d61	try push	2024-11-24 22:40:50 +01:00
Cedric Beck	e5dca013d1	try push	2024-11-24 22:38:23 +01:00
Cedric Beck	7bfc6e7c3e	try push	2024-11-24 22:37:37 +01:00
Benjamin Feyer	1821a222e9	minor changes	2024-11-24 22:24:39 +01:00
Benjamin Feyer	2e302ddc75	Merge branch 'development' into 'dev/test' ... merge changes into the testbranch See merge request progproj/gruppen-ht24/Gruppe-01!14	2024-11-24 21:23:23 +00:00
Fleischer Hanno	ed47883281	refactored ceremony message	2024-11-24 22:20:04 +01:00
Fleischer Hanno	599b3e8f47	corrected refactoring mistake, ich which RankingResponce was renamed to RankingResponse	2024-11-24 22:18:48 +01:00
Fleischer Hanno	040b8830ab	added getter for dialogstatemachine in dialogs	2024-11-24 22:03:19 +01:00
Benjamin Feyer	6fa3e8c00d	Merge branch 'development' into 'dev/test' ... Development See merge request progproj/gruppen-ht24/Gruppe-01!13	2024-11-24 20:58:39 +00:00
Fleischer Hanno	83c79af31a	made all con structors of clients states public	2024-11-24 21:56:32 +01:00
Daniel Grigencha	653c3fb962	added javadocs to all server messages	2024-11-24 20:51:03 +01:00
Daniel Grigencha	8932c8a8cd	added javadocs to all client messages	2024-11-24 19:56:51 +01:00
Cedric Beck	10428deedd	added resource restructuring	2024-11-24 19:54:29 +01:00
Cedric Beck	a196d3d7f2	added basic player name display	2024-11-24 19:49:54 +01:00
Benjamin Feyer	4c078ab0e2	added some testmethods and corrected other in the clientStatemachineTests	2024-11-24 19:37:03 +01:00
Benjamin Feyer	2a97ede985	added some testmethods for the client testing the statechanges in the dialogs	2024-11-24 19:03:19 +01:00
Benjamin Feyer	56492cdda6	added some mor testcases for the clientstatemachine	2024-11-24 18:40:10 +01:00
Benjamin Feyer	a71619612a	added the empty testmethods in serverstateTest and edited the testmethods for substates of choocePiece in Client into MovePiece	2024-11-24 18:21:26 +01:00
Benjamin Feyer	f18a62b089	Merge branch 'development' into 'dev/test' ... Testmerge See merge request progproj/gruppen-ht24/Gruppe-01!12	2024-11-24 15:09:07 +00:00
Benjamin Feyer	c204984a74	edited a test in the clientStateTest	2024-11-24 16:03:12 +01:00
Fleischer Hanno	1d4048cf16	added the constructors for all client states and their statemachines	2024-11-24 16:02:04 +01:00
Benjamin Feyer	2095ea5866	editet tests for the server and client statemachines	2024-11-24 15:49:01 +01:00
Daniel Grigencha	f425eff26b	added more logic for the server state diagram	2024-11-24 15:27:10 +01:00
Hanno Fleischer	cd22ece485	Merge branch 'dev/client' into 'development' ... Merge results from dev/client into development See merge request progproj/gruppen-ht24/Gruppe-01!11	2024-11-24 09:45:30 +00:00
Cedric Beck	16dc28013e	merge development into dev/client	2024-11-24 10:39:28 +01:00
Cedric Beck	9ab71bfaf6	merge dev/client_koppe into dev/client	2024-11-24 10:34:48 +01:00
Cedric Beck	ccad47f95a	Merge branch 'dev/client' into dev/client_koppe	2024-11-24 10:32:00 +01:00
Cedric Beck	f830aec8ce	Merge branch 'dev/client_beck' into 'dev/client' ... Added basic display of bonusCards for presentation on Monday See merge request progproj/gruppen-ht24/Gruppe-01!10	2024-11-24 09:31:33 +00:00
Cedric Beck	c8c0188452	merge dev/client into dev/client_koppe	2024-11-24 10:30:37 +01:00
Cedric Beck	a5b7488e92	Merge branch 'dev/client' into dev/client_beck	2024-11-24 09:23:57 +01:00
Cedric Beck	11794b6ac7	added GuiHandler and showing bonuscards	2024-11-24 09:21:44 +01:00
Cedric Beck	a8d80fd3f4	Merge branch 'dev/client_beck' into 'dev/client' ... Added all basic functionalitites to BoardHandler See merge request progproj/gruppen-ht24/Gruppe-01!9	2024-11-23 21:12:14 +00:00
Fleischer Hanno	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.	2024-11-23 12:26:20 +01:00
Cedric Beck	7368014b10	merge dev/client into dev/client_beck	2024-11-22 20:38:00 +01:00
Cedric Beck	ebdedc6494	added working piece outline; added final tweaks for boardHandler	2024-11-22 19:53:32 +01:00
Benjamin Feyer	df2a7151f0	Merge branch 'development' into 'dev/test' ... Merge Test to Development See merge request progproj/gruppen-ht24/Gruppe-01!8	2024-11-22 12:56:51 +00:00
Cedric Beck	00014eeb09	tried fixing outline problem	2024-11-22 13:56:43 +01:00
Daniel Grigencha	89232901a7	added more logic for the server state diagram	2024-11-22 09:37:49 +01:00
Felix	a79a315f83	Minor work	2024-11-21 16:44:28 +01:00
Felix	c470c205e4	Add host&join menu and work on modelSyncronizer	2024-11-21 16:16:19 +01:00
Felix	982ca00b55	Make lobby buttons colored	2024-11-21 16:16:19 +01:00
Felix	c1f4ea480c	Add host&join menu and work on modelSyncronizer	2024-11-21 16:14:06 +01:00
Cedric Beck	a8a725611f	added highlighting -> bug all assets are transparent	2024-11-21 09:56:40 +01:00
Felix	02ce0df614	Make lobby buttons colored	2024-11-20 15:21:07 +01:00
Felix Koppe	6e57e309cc	Merge branch 'dev/client_koppe' into 'dev/client' ... Merge work See merge request progproj/gruppen-ht24/Gruppe-01!7	2024-11-20 12:50:00 +00:00
Felix	d87acd46cc	Fix camera init/shutdown	2024-11-20 13:48:59 +01:00
Felix	58395fe3cb	Merge dev/client_beck	2024-11-20 13:42:10 +01:00
Felix	5f54eff038	Add inputHandler	2024-11-20 13:32:50 +01:00
Felix	184b565526	Add volume controll	2024-11-20 12:40:51 +01:00
Felix	176efc2aca	Add settings menus	2024-11-20 09:24:01 +01:00
Felix	bb491a2682	Make button size dynamic	2024-11-19 19:27:04 +01:00
Felix	51e83c5ae4	Implement notificationSyncronizer	2024-11-19 19:01:52 +01:00
Felix	47f0e44d0a	Merge development	2024-11-19 18:40:08 +01:00
Felix	80fab1ffdc	Begin work on actionHandler	2024-11-19 18:36:49 +01:00
Felix	03eef66332	Finish buttons	2024-11-19 18:28:37 +01:00
Felix	34415bc9f2	Add left/right buttons	2024-11-19 14:16:01 +01:00
Felix	030842d251	Some work	2024-11-19 12:52:43 +01:00
Hanno Fleischer	a3a9f0d88d	Merge branch 'development' into 'dev/test' ... TestMerge 3 See merge request progproj/gruppen-ht24/Gruppe-01!6	2024-11-19 11:48:06 +00:00
Benjamin Feyer	6790be782e	added empty serverstatetests	2024-11-19 12:42:11 +01:00
Cedric Beck	56256fb9c0	fixed rotation and added functionality für BoardHandler; added shiel visual	2024-11-18 21:30:30 +01:00
Felix	c6438d75cc	Fix acousticHandler error	2024-11-18 16:40:01 +01:00
Felix	728530a8f2	Finish loop	2024-11-18 16:16:56 +01:00
Felix	7c09107d28	Work on Dialogs	2024-11-18 15:58:30 +01:00
Cedric Beck	2399bf2678	added world and trees for tree positioning	2024-11-18 12:40:40 +01:00
Cedric Beck	06d795b3e6	working on asset simplification	2024-11-18 12:03:42 +01:00
Cedric Beck	8d9a923970	added rotation for move piece, fixed problems because rotation on the z axis is reversed	2024-11-18 01:58:24 +01:00
Cedric Beck	c95beaeb14	working on pieceMovement	2024-11-17 23:57:36 +01:00
Daniel Grigencha	04501de11c	Merge remote-tracking branch 'origin/development' into development	2024-11-17 21:18:38 +01:00
Fleischer Hanno	9cd9cc871c	fixed a bug with use of addLast method for ArrayList which doesnot exist in Java 20	2024-11-17 21:18:19 +01:00
Fleischer Hanno	f69a2a9fda	added a method to check if a player has pieces in his waiting area	2024-11-17 21:04:13 +01:00
Daniel Grigencha	e83ed1c835	Merge remote-tracking branch 'origin/development' into development	2024-11-17 20:17:29 +01:00
Daniel Grigencha	f379a6b638	added more logic for the server state diagram	2024-11-17 20:17:19 +01:00
Hanno Fleischer	90fb6e4133	added the method tryMove and the methods used by it into serverstate	2024-11-17 17:52:25 +01:00
Hanno Fleischer	9662e1f684	fixed a Bug where the import statement thought a package was a class because they where written the same	2024-11-17 15:34:39 +01:00
Daniel Grigencha	aae7ed9a87	added classes for client and server state machine ... - a client state machine consits out of a 'ClientState' (every state of the machine) and a 'ClientStateMachine' (every state, which consists out of states), the machine starts with the ClientAutomaton - analog for server - started to implement logic for the server, transition from 'Lobby' to 'GameState'	2024-11-17 15:27:09 +01:00
Hanno Fleischer	07bd7dfa3d	Merge branch 'development' into 'dev/test' ... Testmerge See merge request progproj/gruppen-ht24/Gruppe-01!5	2024-11-17 14:20:53 +00:00
Felix	b15dd96a86	Improve music fade and mock	2024-11-17 14:28:48 +01:00
Felix	ada90e787d	Improve mock	2024-11-17 13:03:54 +01:00
Felix	cbeb296a44	Mock differen Views	2024-11-17 12:42:20 +01:00
Hanno Fleischer	a9fd13caab	Merge branch 'dev/client' into 'development' ... Client work of the Week See merge request progproj/gruppen-ht24/Gruppe-01!4	2024-11-17 11:24:45 +00:00
Hanno Fleischer	a926554709	adjusted for check style	2024-11-17 12:01:00 +01:00
Cedric Beck	bbd84dd961	added code + checkstyle	2024-11-17 11:26:45 +01:00
Cedric Beck	e22f675f8b	fixed merge conflict	2024-11-17 11:07:53 +01:00
Cedric Beck	956e9dd2fd	merge from dev/client	2024-11-17 10:57:05 +01:00
Hanno Fleischer	020aa92cab	added 4 more Notifications for Model -> View interaction	2024-11-17 10:39:36 +01:00
Felix Koppe	bb55ba7273	Merge branch 'dev/client_koppe' into 'dev/client' ... Work of the week See merge request progproj/gruppen-ht24/Gruppe-01!3	2024-11-17 09:09:13 +00:00
Cedric Beck	a2c7b9e299	added all assets; added node array; added node/piece_control saving	2024-11-16 23:05:30 +01:00
Hanno Fleischer	0845aa80f9	adjusted the model infield creation to represent the current view postion regarding the placement of the teams on the board	2024-11-16 22:31:11 +01:00
Hanno Fleischer	44b623f9fd	added all Notifications for the model view communication ... added all required notifications with their content and getter methods.	2024-11-16 18:58:33 +01:00
Felix	bf678000b8	Minor changes	2024-11-16 18:21:02 +01:00
Felix	e128d9e4cc	Add docs to Acoustic	2024-11-16 16:33:21 +01:00
Felix	8c10e69eff	General improvements	2024-11-16 16:15:08 +01:00
Hanno Fleischer	6b2d775534	added 2 methods for Test usage in Board and PlayerData	2024-11-16 13:31:56 +01:00
Felix	b509ab772d	Add subVolume and delay	2024-11-16 13:07:39 +01:00
Cedric Beck	d0be65323e	added rotation compability to map.mdga	2024-11-15 22:47:23 +01:00
Cedric Beck	81facb869f	added playerMap for location playerAssets	2024-11-15 21:26:23 +01:00
Felix	b317bb957a	Add sound	2024-11-15 16:52:40 +01:00
Felix	202cd7c0e6	Add music credits	2024-11-15 14:57:36 +01:00
Felix	e345edc38e	Add game_3 music	2024-11-15 14:42:52 +01:00
Felix	133bffbd6b	Add game_6 music	2024-11-15 14:42:41 +01:00
Felix	2287fdc88f	Add game_5 music	2024-11-15 14:42:27 +01:00
Felix	976002ddd0	Add game_2 music	2024-11-15 14:42:10 +01:00
Felix	205cb654c7	Add game_1 music	2024-11-15 14:41:52 +01:00
Felix	d8544cc042	Add game_4 music	2024-11-15 14:41:29 +01:00
Felix	0aa7e83d62	Add main menu music	2024-11-15 14:40:59 +01:00
Felix	289c285adf	Add lobby music	2024-11-15 14:40:34 +01:00
Felix	a4ac52b591	Add ceremony music	2024-11-15 14:40:09 +01:00
Felix	0bb4706fda	Add GameMusic	2024-11-15 14:39:10 +01:00
Felix	a3c5af58d7	Remove grid extend limits	2024-11-14 23:24:12 +01:00
Felix	28960e8961	Activate assertions	2024-11-14 23:10:36 +01:00
Felix	bb7baf44bd	Add circle_map.mdga	2024-11-14 22:47:22 +01:00
Felix	206c0d543e	Merge commit	2024-11-14 22:14:19 +01:00
Felix	a68ad80402	Remove state classes	2024-11-14 22:13:57 +01:00
Cedric Beck	1cca5a9c6b	added MapLoader and map for map view	2024-11-14 21:21:01 +01:00
Hanno Fleischer	ee59807395	Replaced in the notifications Card with BonusCard	2024-11-14 19:58:26 +01:00
Hanno Fleischer	37511d6334	Merge branch 'dev/client_koppe' into 'development' ... Dev/client_koppe See merge request progproj/gruppen-ht24/Gruppe-01!1	2024-11-14 18:45:24 +00:00
Felix	c83baac763	Fix error	2024-11-14 19:36:53 +01:00
Felix	6c7b58b415	Add notification constructors	2024-11-14 19:33:03 +01:00
Benjamin Feyer	33dbbdbe5c	initial test commit, ... added all testclasses except Playertest, Viewtest, Cameratest, SettingsTest, SoundTest, ReactionTest and ClientStateTest. And filled all created testclasses with empty testmethods, except ServerStateTest.	2024-11-14 18:07:36 +01:00
Felix Koppe	5693817f9b	Add notifications	2024-11-14 17:56:43 +01:00
Felix Koppe	94ee786dc8	Minor work	2024-11-14 17:13:56 +01:00
Felix Koppe	92941f903c	Merge commit	2024-11-14 16:51:22 +01:00
Cedric Beck	499da6a7ad	added new jmonkey version	2024-11-14 16:25:14 +01:00
Hanno Fleischer	9bafd749b6	removed card and fixed codes style ... removed card because it was unnecessary and reworked all classes containing it to implement the change	2024-11-14 15:49:22 +01:00
Cedric Beck	b71449b7b4	Merge branch 'view_assets' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into view_assets	2024-11-14 15:44:31 +01:00
Cedric Beck	dfcfe3351e	asset	2024-11-14 15:37:25 +01:00
Hanno Fleischer	c7b65d949a	added java docs to model/game and wrote the remaining getter and setter	2024-11-14 15:32:27 +01:00
Felix	921933722a	Minor work	2024-11-14 15:23:59 +01:00
Felix	7fa45f39c6	Merge remote-tracking branch 'origin/dev_client' into dev_client ... # Conflicts: # Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/Animation.java # Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/AnimationHandler.java	2024-11-14 15:04:41 +01:00
Felix	6849a0a023	Minor work on animation	2024-11-14 14:58:54 +01:00
Daniel Grigencha	e96cd40302	improved code style	2024-11-14 14:51:29 +01:00
Felix	d9a827697d	First steps	2024-11-13 19:52:29 +01:00
Felix	0f39ea0dcc	Add files	2024-11-13 17:57:14 +01:00
Felix	6e844287dd	Delete garbarge	2024-11-13 17:23:07 +01:00
Felix	3465cdaa19	Merge branch 'view_assets' into dev_client ... # Conflicts: # Projekte/mdga/client/build.gradle	2024-11-13 17:21:24 +01:00
Felix	60adc39c8b	Add run config	2024-11-13 17:12:02 +01:00
Felix	8502b97a95	Merge main	2024-11-13 17:10:14 +01:00
Felix	f3f63a3e2c	Merge main	2024-11-13 17:02:38 +01:00
Cedric Beck	8d02a144eb	added screenshot and resources	2024-11-13 14:55:05 +01:00
Felix Koppe	d1a343aaa9	Add MdgaApp.java and run config	2024-11-13 11:55:09 +01:00
Cedric Beck	80d70e9a45	added structure for client View	2024-11-12 17:52:39 +01:00