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
Felix Koppe
82234a7ff9
Merge commit
2024-12-02 15:44:41 +01:00
Felix Koppe
5b8032bed9
Prepare for model
2024-12-01 17:44:37 +01:00
