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 |
|