Commit Graph

120 Commits

Author SHA1 Message Date
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
Hanno Fleischer
6b2d775534 added 2 methods for Test usage in Board and PlayerData 2024-11-16 13:31:56 +01:00
Felix
b509ab772d Add subVolume and delay 2024-11-16 13:07:39 +01:00
Cedric Beck
d0be65323e added rotation compability to map.mdga 2024-11-15 22:47:23 +01:00
Cedric Beck
81facb869f added playerMap for location playerAssets 2024-11-15 21:26:23 +01:00
Felix
b317bb957a Add sound 2024-11-15 16:52:40 +01:00
Felix
202cd7c0e6 Add music credits 2024-11-15 14:57:36 +01:00
Felix
e345edc38e Add game_3 music 2024-11-15 14:42:52 +01:00
Felix
133bffbd6b Add game_6 music 2024-11-15 14:42:41 +01:00
Felix
2287fdc88f Add game_5 music 2024-11-15 14:42:27 +01:00
Felix
976002ddd0 Add game_2 music 2024-11-15 14:42:10 +01:00
Felix
205cb654c7 Add game_1 music 2024-11-15 14:41:52 +01:00
Felix
d8544cc042 Add game_4 music 2024-11-15 14:41:29 +01:00
Felix
0aa7e83d62 Add main menu music 2024-11-15 14:40:59 +01:00
Felix
289c285adf Add lobby music 2024-11-15 14:40:34 +01:00
Felix
a4ac52b591 Add ceremony music 2024-11-15 14:40:09 +01:00
Felix
0bb4706fda Add GameMusic 2024-11-15 14:39:10 +01:00
Felix
a3c5af58d7 Remove grid extend limits 2024-11-14 23:24:12 +01:00
Felix
28960e8961 Activate assertions 2024-11-14 23:10:36 +01:00
Felix
bb7baf44bd Add circle_map.mdga 2024-11-14 22:47:22 +01:00
Felix
206c0d543e Merge commit 2024-11-14 22:14:19 +01:00
Felix
a68ad80402 Remove state classes 2024-11-14 22:13:57 +01:00
Cedric Beck
1cca5a9c6b added MapLoader and map for map view 2024-11-14 21:21:01 +01:00
Hanno Fleischer
ee59807395 Replaced in the notifications Card with BonusCard 2024-11-14 19:58:26 +01:00
Hanno Fleischer
37511d6334 Merge branch 'dev/client_koppe' into 'development'
Dev/client_koppe

See merge request progproj/gruppen-ht24/Gruppe-01!1
2024-11-14 18:45:24 +00:00
Felix
c83baac763 Fix error 2024-11-14 19:36:53 +01:00
Felix
6c7b58b415 Add notification constructors 2024-11-14 19:33:03 +01:00
Felix Koppe
5693817f9b Add notifications 2024-11-14 17:56:43 +01:00
Felix Koppe
94ee786dc8 Minor work 2024-11-14 17:13:56 +01:00
Felix Koppe
92941f903c Merge commit 2024-11-14 16:51:22 +01:00
Cedric Beck
499da6a7ad added new jmonkey version 2024-11-14 16:25:14 +01:00
Hanno Fleischer
9bafd749b6 removed card and fixed codes style
removed card because it was unnecessary and reworked all classes containing it to implement the change
2024-11-14 15:49:22 +01:00
Cedric Beck
b71449b7b4 Merge branch 'view_assets' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into view_assets 2024-11-14 15:44:31 +01:00
Cedric Beck
dfcfe3351e asset 2024-11-14 15:37:25 +01:00
Hanno Fleischer
c7b65d949a added java docs to model/game and wrote the remaining getter and setter 2024-11-14 15:32:27 +01:00
Felix
921933722a Minor work 2024-11-14 15:23:59 +01:00
Felix
7fa45f39c6 Merge remote-tracking branch 'origin/dev_client' into dev_client
# Conflicts:
#	Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/Animation.java
#	Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/AnimationHandler.java
2024-11-14 15:04:41 +01:00