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
