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