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
|
15b7aa9e8c
|
fixed 2 dicenow notification
|
2024-12-09 04:34:47 +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 |
|
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 |
|
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 |
|
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
|
e457fe23d4
|
added a reset for the dice modifier in the server
|
2024-12-09 02:03:57 +01:00 |
|
Cedric Beck
|
d38690ea48
|
merge
|
2024-12-09 01:43:25 +01:00 |
|
Felix Koppe
|
6487bafed1
|
Merge commit
|
2024-12-09 01:47:47 +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
|
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 |
|
Felix Koppe
|
1646526ce1
|
Try fix error
|
2024-12-09 00:36:38 +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 |
|
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 |
|