Commit Graph

957 Commits

Author SHA1 Message Date
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
Daniel Grigencha
aae7ed9a87 added classes for client and server state machine
- a client state machine consits out of a 'ClientState' (every state of the machine) and a 'ClientStateMachine' (every state, which consists out of states), the machine starts with the ClientAutomaton
- analog for server
- started to implement logic for the server, transition from 'Lobby' to 'GameState'
2024-11-17 15:27:09 +01:00
Hanno Fleischer
07bd7dfa3d Merge branch 'development' into 'dev/test'
Testmerge

See merge request progproj/gruppen-ht24/Gruppe-01!5
2024-11-17 14:20:53 +00:00
Felix
b15dd96a86 Improve music fade and mock 2024-11-17 14:28:48 +01:00
Felix
ada90e787d Improve mock 2024-11-17 13:03:54 +01:00
Felix
cbeb296a44 Mock differen Views 2024-11-17 12:42:20 +01:00
Hanno Fleischer
a9fd13caab Merge branch 'dev/client' into 'development'
Client work of the Week

See merge request progproj/gruppen-ht24/Gruppe-01!4
2024-11-17 11:24:45 +00:00
Hanno Fleischer
a926554709 adjusted for check style 2024-11-17 12:01:00 +01:00
Cedric Beck
bbd84dd961 added code + checkstyle 2024-11-17 11:26:45 +01:00
Cedric Beck
e22f675f8b fixed merge conflict 2024-11-17 11:07:53 +01:00
Cedric Beck
956e9dd2fd merge from dev/client 2024-11-17 10:57:05 +01:00
Hanno Fleischer
020aa92cab added 4 more Notifications for Model -> View interaction 2024-11-17 10:39:36 +01:00
Felix Koppe
bb55ba7273 Merge branch 'dev/client_koppe' into 'dev/client'
Work of the week

See merge request progproj/gruppen-ht24/Gruppe-01!3
2024-11-17 09:09:13 +00:00
Cedric Beck
a2c7b9e299 added all assets; added node array; added node/piece_control saving 2024-11-16 23:05:30 +01:00
Hanno Fleischer
0845aa80f9 adjusted the model infield creation to represent the current view postion regarding the placement of the teams on the board 2024-11-16 22:31:11 +01:00
Hanno Fleischer
44b623f9fd added all Notifications for the model view communication
added all required notifications with their content and getter methods.
2024-11-16 18:58:33 +01:00
Felix
bf678000b8 Minor changes 2024-11-16 18:21:02 +01:00
Felix
e128d9e4cc Add docs to Acoustic 2024-11-16 16:33:21 +01:00
Felix
8c10e69eff General improvements 2024-11-16 16:15:08 +01:00