peet/Gruppe-02-clone
1
0
Fork 0
mirror of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git synced 2025-08-03 18:54:24 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: peet:a686671c150d213b5ebb278e72067f1d12cefb2d
Branches Tags
peet:main peet:gui peet:demo peet:reworkedGui peet:Testhandbuch peet:logic peet:connect peet:client_logic peet:b_szepielewicz_filip peet:b_puderbach_luca peet:b_wilkening_simon peet:b_schmidt_yvonne peet:b_schmelz_johannes peet:revert-f248a77c peet:b_Mueller_Tamino peet:b_malkmus_dennis peet:revert-71a4ac8d peet:b_Schmelz_Johannes
..
compare: peet:reworkedGui
Branches Tags
peet:main peet:gui peet:demo peet:reworkedGui peet:Testhandbuch peet:logic peet:connect peet:client_logic peet:b_szepielewicz_filip peet:b_puderbach_luca peet:b_wilkening_simon peet:b_schmidt_yvonne peet:b_schmelz_johannes peet:revert-f248a77c peet:b_Mueller_Tamino peet:b_malkmus_dennis peet:revert-71a4ac8d peet:b_Schmelz_Johannes

418 Commits
a686671c15 ... reworkedGu

Author SHA1 Message Date
Johannes Schmelz
159927e52c now able to add all nessecary models 2024-12-08 02:16:40 +01:00
Johannes Schmelz
8614faf940 show popups 2024-12-07 22:11:31 +01:00
Johannes Schmelz
4ba43602fa player now moves without animation 2024-12-07 21:58:26 +01:00
Johannes Schmelz
b4e2beca3a frist working version, TODO: trigger the render events 2024-12-07 01:13:17 +01:00
Simon Wilkening
5f4c6be7b8 adjusted test in ReceivedRent 2024-12-06 17:04:00 +01:00
Johannes Schmelz
aca92cd7f1 clean up 2024-12-06 16:21:12 +01:00
Johannes Schmelz
b50b5e64d1 can only trade fields without buildings 2024-12-06 16:06:40 +01:00
Johannes Schmelz
551786bf30 fixed enabled pref in GameMusic 2024-12-06 15:56:42 +01:00
Simon Wilkening
2aca94100e adjusted test in ReceivedRent 2024-12-06 13:20:40 +01:00
Simon Wilkening
9e81fb8549 TopDialog in Propertyoverview eingefügt 2024-12-06 13:17:57 +01:00
Simon Wilkening
3c6e519e77 Rent/ReceivedRent text changed 2024-12-06 13:12:56 +01:00
Simon Wilkening
9be00ab848 renamed IgfPadubrin and Rent/ReceivedRent 2024-12-06 12:35:57 +01:00
Simon Wilkening
c2c22f9ae5 NoMoneywarning and TimeOut use Dialogmanager now 2024-12-06 11:57:20 +01:00
Johannes Schmelz
e65c2661f7 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-05 02:48:00 +01:00
Johannes Schmelz
88db193b5e choose your charakter 2024-12-05 02:47:55 +01:00
Yvonne Schmidt
38824895bb set new toolbar background 2024-12-05 02:05:47 +01:00
Johannes Schmelz
a78261594d ImageButton for new Button design 2024-12-05 01:43:01 +01:00
Yvonne Schmidt
646d301554 added toolbar icons 2024-12-05 01:16:06 +01:00
Johannes Schmelz
e49b22c022 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-04 18:51:19 +01:00
Luca Puderbach
8821602728 kamera 2024-12-04 16:44:26 +01:00
Luca Puderbach
eb19e290bb Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-04 16:39:37 +01:00
Luca Puderbach
b477077b9b Kamera Teil1 2024-12-04 16:39:32 +01:00
Yvonne Schmidt
02cfc1d21a fixed formating errors 2024-12-04 16:00:24 +01:00
Yvonne Schmidt
4c40b447a5 fixed formating errors 2024-12-04 12:16:04 +01:00
Yvonne Schmidt
eaff7b6c5d fixed formating error in RejectTrade 2024-12-04 01:52:30 +01:00
Yvonne Schmidt
9ee1b5b81b simplified representation of trade 2024-12-04 01:48:18 +01:00
Yvonne Schmidt
49b9972ade replaced textinput with dynamic label 2024-12-04 01:10:12 +01:00
Johannes Schmelz
aae003823d trigger money sounds 2024-12-03 12:34:56 +01:00
Johannes Schmelz
1369de865a can no longer build if already has hotel 2024-12-03 12:30:34 +01:00
Johannes Schmelz
8e3cf9c31e now allowed to roll dice after getting out of jail 2024-12-03 12:24:55 +01:00
Johannes Schmelz
bc31c61fb3 bigger hack 2024-12-03 12:24:25 +01:00
Johannes Schmelz
975e4a2737 gym card text 2024-12-03 12:16:03 +01:00
Johannes Schmelz
8d638158e4 fixed Miete popup 2024-12-03 12:15:00 +01:00
Johannes Schmelz
1f37eb9962 refactor PlayerColor 
fixed default playermodel selection
 2024-12-03 12:07:09 +01:00
Johannes Schmelz
09ea8a046e mortage house interaction 2024-12-03 11:37:36 +01:00
Johannes Schmelz
0acb23ab8b price settings 2024-12-03 01:09:00 +01:00
Johannes Schmelz
831974cb63 miete erhalten popup 2024-12-03 00:58:01 +01:00
Johannes Schmelz
031ac52670 foodfield rent calc 2024-12-03 00:40:43 +01:00
Johannes Schmelz
14ceb9dc67 fixed GateField rent 2024-12-03 00:39:36 +01:00
Johannes Schmelz
aa86c25e7c fixed sell house payment 2024-12-03 00:30:54 +01:00
Johannes Schmelz
cb0788e44c lock endTurnButton when player needs to roll dice 2024-12-03 00:29:27 +01:00
Johannes Schmelz
9e88353bd5 show bankrupt popup once 2024-12-03 00:17:23 +01:00
Johannes Schmelz
6db96f0a1d trigger demo mode 2024-12-03 00:12:22 +01:00
Johannes Schmelz
b01bb3cf7b update for jar export 2024-12-02 16:29:57 +01:00
Johannes Schmelz
95b9da9377 server doc 2024-12-02 09:06:00 +01:00
Luca Puderbach
30822e3f4d Java Docs 2024-12-02 09:02:41 +01:00
Yvonne Schmidt
957bf8ffcc Merge remote-tracking branch 'origin/gui' into gui 2024-12-02 09:00:57 +01:00
Yvonne Schmidt
446ecfd4b5 added documentation for NoMoneyWarning 2024-12-02 09:00:43 +01:00
Yvonne Schmidt
821c9ec3fb added documentation for SellHouse 2024-12-02 08:58:41 +01:00
Yvonne Schmidt
531a3e263c added documentation for TakeMortage 2024-12-02 08:54:49 +01:00
Yvonne Schmidt
4917208818 added documentation for TimeOut 2024-12-02 08:51:22 +01:00
Yvonne Schmidt
e81cdf3b40 added documentation for WinnerPopUp 2024-12-02 08:49:26 +01:00
Yvonne Schmidt
bffe614b54 added documentation for LooserPopUp 2024-12-02 08:47:36 +01:00
Yvonne Schmidt
69ad19757d added documentation for GulagInfo 2024-12-02 08:44:23 +01:00
Yvonne Schmidt
a4c0afe277 added documentation for Gulag 2024-12-02 08:42:08 +01:00
Yvonne Schmidt
cc157a3cf3 added documentation for Rent 2024-12-02 08:40:02 +01:00
Johannes Schmelz
ff2b64d476 removed errors in java doc 2024-12-02 08:39:47 +01:00
Yvonne Schmidt
459a54ac5d added documentation for Rent 2024-12-02 08:36:54 +01:00
Yvonne Schmidt
a50821f2e6 added documentation for RejectTrade 2024-12-02 08:34:53 +01:00
Yvonne Schmidt
72e0fc7cbd added documentation for GateFieldCard 2024-12-02 08:31:14 +01:00
Johannes Schmelz
3260d06bc8 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-02 08:28:09 +01:00
Johannes Schmelz
e07db0129f completed tests 2024-12-02 08:28:05 +01:00
Yvonne Schmidt
3bfa7ff69f added documentation for FoodFieldCard 2024-12-02 08:26:08 +01:00
Yvonne Schmidt
160fff88ea added documentation for EventCardPopup 2024-12-02 08:23:13 +01:00
Yvonne Schmidt
7a658cb3d6 added documentation for EventCardPopup 2024-12-02 08:15:54 +01:00
Yvonne Schmidt
25361933d7 added documentation for ConfirmTrade 2024-12-02 08:13:06 +01:00
Yvonne Schmidt
4ac02a1a7b added documentation for BuyHouse 2024-12-02 08:10:08 +01:00
Yvonne Schmidt
6f15f12b49 added documentation for BuildingPropertyCard 2024-12-02 08:05:00 +01:00
Yvonne Schmidt
9e50c1afe2 added documentation for Bankrupt 2024-12-02 07:59:24 +01:00
Yvonne Schmidt
3a43ea10d9 added documentation for AcceptTrade 2024-12-02 07:55:07 +01:00
Yvonne Schmidt
3539b1cf23 added documentation for BuildingAdminMenu 2024-12-02 07:48:57 +01:00
Yvonne Schmidt
d0ba0d011f added documentation for CameraController 2024-12-02 07:45:37 +01:00
Yvonne Schmidt
1f07affbef added documentation for GameBoardSynchronizer 2024-12-02 07:40:45 +01:00
Yvonne Schmidt
c83f7de30c added documentation for LobbyMenu 2024-12-02 07:23:25 +01:00
Yvonne Schmidt
acb5c75379 added documentation for TradeMenu 2024-12-02 07:07:19 +01:00
Johannes Schmelz
a73384c436 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-02 06:53:35 +01:00
Johannes Schmelz
96542fa42b fixed numberformat 2024-12-02 06:53:18 +01:00
Johannes Schmelz
0d885203a7 max 10 long name 2024-12-02 05:58:56 +01:00
Yvonne Schmidt
e08654bb20 Merge remote-tracking branch 'origin/gui' into gui 2024-12-02 05:54:29 +01:00
Johannes Schmelz
486c0a9810 TopDialog 2024-12-02 05:54:15 +01:00
Yvonne Schmidt
0b71c2cb96 added documentation 2024-12-02 05:53:52 +01:00
Johannes Schmelz
737576e0ca Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-02 05:43:53 +01:00
Johannes Schmelz
db7a99dc59 fixed Top Dialog 2024-12-02 05:43:49 +01:00
Luca Puderbach
4b48229329 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-02 05:43:24 +01:00
Luca Puderbach
1a41b548c4 Figuren Drehung 2024-12-02 05:43:20 +01:00
Yvonne Schmidt
7f58558da4 Merge remote-tracking branch 'origin/gui' into gui 2024-12-02 05:25:24 +01:00
Johannes Schmelz
1503e18585 limit name length 2024-12-02 05:24:53 +01:00
Yvonne Schmidt
94155d2816 Merge remote-tracking branch 'origin/gui' into gui 2024-12-02 05:16:12 +01:00
Luca Puderbach
ec42cc2c07 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-02 05:15:53 +01:00
Luca Puderbach
af79e39492 figuren drehen 2024-12-02 05:15:47 +01:00
Yvonne Schmidt
0698c29410 Merge remote-tracking branch 'origin/gui' into gui 2024-12-02 05:13:08 +01:00
Johannes Schmelz
08c1854885 fixed jail card trade 2024-12-02 05:10:45 +01:00
Johannes Schmelz
ff39402d82 fixed event card position 2024-12-02 05:09:31 +01:00
Johannes Schmelz
4e375131d1 change property side 2024-12-02 05:06:58 +01:00
Yvonne Schmidt
ac9ced2cf4 Merge remote-tracking branch 'origin/gui' into gui 2024-12-02 04:39:50 +01:00
Johannes Schmelz
e93791e6e8 remove testing 2024-12-02 04:39:30 +01:00
Yvonne Schmidt
fa554cbffc Merge remote-tracking branch 'origin/gui' into gui 2024-12-02 04:37:49 +01:00
Luca Puderbach
f317d7723e Lets GO 2024-12-02 04:35:55 +01:00
Luca Puderbach
07fd92c9b2 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-02 04:20:14 +01:00
Luca Puderbach
91fea83f26 Modelle Fixes 2024-12-02 04:19:56 +01:00
Johannes Schmelz
471f703634 updated models 2024-12-02 04:16:49 +01:00
Yvonne Schmidt
065049f663 added documentation in client package 2024-12-02 04:08:54 +01:00
Yvonne Schmidt
580d81a621 Merge remote-tracking branch 'origin/gui' into gui 2024-12-02 03:44:42 +01:00
Yvonne Schmidt
7acf448c0c added documentation for MonopolyApp 2024-12-02 03:44:33 +01:00
Johannes Schmelz
bcf4956d2d TradeReplay popup 2024-12-02 03:16:50 +01:00
Johannes Schmelz
13754c843a clean up 2024-12-02 03:03:42 +01:00
Johannes Schmelz
4743a6882c fixed testing env 2024-12-02 03:02:05 +01:00
Johannes Schmelz
2dbc727728 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-02 03:00:28 +01:00
Johannes Schmelz
560bedc80b mortage 2024-12-02 03:00:22 +01:00
Johannes Schmelz
7ace959f1f sellHouse 2024-12-02 02:48:06 +01:00
Yvonne Schmidt
95dc7b07e2 fixed typos 2024-12-02 02:40:53 +01:00
Yvonne Schmidt
fa20a6cb2a Merge remote-tracking branch 'origin/gui' into gui 2024-12-02 01:50:20 +01:00
Yvonne Schmidt
36b308e616 fixed TradeMenu formating 2024-12-02 01:49:56 +01:00
Johannes Schmelz
b912835edb Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-02 01:37:37 +01:00
Johannes Schmelz
add5dab611 buyHouse complete 2024-12-02 01:37:32 +01:00
Johannes Schmelz
5172766216 cleanup 2024-12-02 01:34:43 +01:00
Yvonne Schmidt
fcb55e52fc fixed esc in BuildingAdminMenu 2024-12-02 01:11:38 +01:00
Yvonne Schmidt
411f7ea25b added selector and selection display to RepayMortage 2024-12-02 01:06:58 +01:00
Yvonne Schmidt
e05ad71fff added selector and selection display to TakeMortage 2024-12-02 01:03:55 +01:00
Yvonne Schmidt
d08a172227 added selector and selection display to SellHouse 2024-12-02 00:59:10 +01:00
Johannes Schmelz
4fff8394d9 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-02 00:48:53 +01:00
Johannes Schmelz
5bb438c221 working selector 2024-12-02 00:47:06 +01:00
Simon Wilkening
a753017fcd Rent relabeled 2024-12-01 23:52:25 +01:00
Yvonne Schmidt
5522be228b added selection display 2024-12-01 23:22:19 +01:00
Johannes Schmelz
3b729c9a04 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-01 23:12:51 +01:00
Johannes Schmelz
eda2fcd327 jail logic complete 2024-12-01 23:11:02 +01:00
Simon Wilkening
09e12fc610 GulagInfo renamed 2024-12-01 22:08:28 +01:00
Johannes Schmelz
93152f4073 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-01 21:55:10 +01:00
Johannes Schmelz
17a1d3fbbb fixed rent 2024-12-01 21:55:06 +01:00
Yvonne Schmidt
a0e2b6e8e2 Merge remote-tracking branch 'origin/gui' into gui 2024-12-01 21:54:30 +01:00
Yvonne Schmidt
79a08a0c9e replaced listbox in sellHouse with a selector 2024-12-01 21:53:53 +01:00
Simon Wilkening
a24d6fd4b6 BuildingFields corrected 2024-12-01 21:44:14 +01:00
Johannes Schmelz
f220aeb78c resolve merge 2024-12-01 21:42:05 +01:00
Luca Puderbach
85e0c68a36 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-01 21:33:18 +01:00
Luca Puderbach
113e1b7aa5 Spieler Bewegungs hochdatum 2024-12-01 21:33:07 +01:00
Johannes Schmelz
cfcc232432 trigger Bankrupt PopUp 2024-12-01 21:30:55 +01:00
Johannes Schmelz
29e9b54cc4 trigger NoMoneyPopUp 2024-12-01 21:24:33 +01:00
Yvonne Schmidt
0c90d1f185 Merge remote-tracking branch 'origin/gui' into gui 2024-12-01 21:19:20 +01:00
Yvonne Schmidt
b5090ea179 fixed overlapping with propertycard 2024-12-01 21:18:57 +01:00
Johannes Schmelz
cfbf20f745 payBail 2024-12-01 20:55:58 +01:00
Johannes Schmelz
dd002746aa trigger winner and looser popup 2024-12-01 20:52:29 +01:00
Johannes Schmelz
11f4560745 du kommst ins Gulag Popup 2024-12-01 20:31:29 +01:00
Johannes Schmelz
b702e3a14d first tests 2024-12-01 20:12:36 +01:00
Johannes Schmelz
3b2cfad774 fixed TradeConfrim 2024-12-01 19:20:34 +01:00
Johannes Schmelz
9164dc6893 formatting 2024-12-01 18:37:53 +01:00
Simon Wilkening
d3cf36ecb1 BuildingFields corrected 2024-12-01 18:23:20 +01:00
Johannes Schmelz
7d0a0123e0 server side logic for propertyAdmin 2024-12-01 18:17:46 +01:00
Johannes Schmelz
2f025e2e1a sort according to id 2024-12-01 17:51:24 +01:00
Luca Puderbach
9bf9e8406b model pfad gefixt 2024-12-01 16:29:25 +01:00
Johannes Schmelz
6bd1ed6e3a earnMoney with event card movement 2024-12-01 16:05:57 +01:00
Johannes Schmelz
0f6205fbc7 fixed topDialog 2024-12-01 15:57:33 +01:00
Johannes Schmelz
f2a6888fb2 fixed JailState 2024-12-01 15:50:09 +01:00
Johannes Schmelz
5143e21ba6 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-01 13:53:55 +01:00
Johannes Schmelz
26dc24a1f4 fixed verhandeln 2024-12-01 13:53:50 +01:00
Luca Puderbach
350c157493 Figuren Animationen 2024-12-01 05:38:27 +01:00
Luca Puderbach
51b879a7c8 Figuren Bewegung eingefügt 2024-12-01 05:05:11 +01:00
Luca Puderbach
528126aa29 Kleines Ereigniskarten update 2024-12-01 05:04:27 +01:00
Luca Puderbach
73bfafa7f7 Anpassungen Ereigniskarten 2024-12-01 03:00:30 +01:00
Luca Puderbach
686a12e465 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-01 02:47:34 +01:00
Luca Puderbach
358beacc65 Mozzarella Update 2024-12-01 02:47:30 +01:00
Johannes Schmelz
69db0aa29b Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-01 02:47:12 +01:00
Johannes Schmelz
20f44ad2d4 fixed San cost 2024-12-01 02:40:12 +01:00
Simon Wilkening
d73c5e0904 Farben angepasst 2024-12-01 02:23:50 +01:00
Johannes Schmelz
f322e9bd8f Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-01 02:14:13 +01:00
Johannes Schmelz
b8e1645eb8 fixed player movement and go money 2024-12-01 02:14:09 +01:00
Simon Wilkening
73a908cd71 PorpertyOverwiev gerettet 2024-12-01 02:10:10 +01:00
Johannes Schmelz
a6b7ea4ce8 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-01 02:08:20 +01:00
Johannes Schmelz
4af08ffffd fix trade reject 2024-12-01 02:07:39 +01:00
Yvonne Schmidt
dc66fd7384 changed font colors and sizes 2024-12-01 01:48:09 +01:00
Simon Wilkening
16ff61264b BuyHouse etc. aktualisiert 2024-12-01 00:47:12 +01:00
Luca Puderbach
f3ec17b0b1 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-01 00:39:05 +01:00
Luca Puderbach
1c31915627 Werkzeugbank Rand 2024-12-01 00:39:00 +01:00
Yvonne Schmidt
79c96677bd Merge remote-tracking branch 'origin/gui' into gui 2024-12-01 00:35:27 +01:00
Yvonne Schmidt
54118071cb fixed popup overlap 2024-12-01 00:34:57 +01:00
Johannes Schmelz
2e28b54936 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-01 00:30:55 +01:00
Johannes Schmelz
f333e2d2c0 button function 2024-12-01 00:30:50 +01:00
Yvonne Schmidt
b89d40b39f fixed nullPointer 2024-12-01 00:14:04 +01:00
Yvonne Schmidt
488ae154cf fixed overlapping popups 2024-11-30 23:26:37 +01:00
Johannes Schmelz
c1e501c271 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-30 22:39:12 +01:00
Johannes Schmelz
89d5185c91 rent popup fixed 2024-11-30 22:39:08 +01:00
Simon Wilkening
f4bf38bca1 AcceptTrade, RejectTrade und NoMoneyWarning hinzugefügt 2024-11-30 22:01:35 +01:00
Johannes Schmelz
b87b3f054b trigger rent popup 2024-11-30 21:49:16 +01:00
Johannes Schmelz
f6137b8b68 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-30 20:50:40 +01:00
Johannes Schmelz
87309235bd trade logic complete 2024-11-30 20:50:36 +01:00
Simon Wilkening
d37017bfa0 Winner and Looser Popup close the game again 2024-11-30 20:33:08 +01:00
Simon Wilkening
5d6440bd50 Eventcards korrigiert 2024-11-30 20:20:43 +01:00
Johannes Schmelz
a70295f1ff Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-30 15:15:35 +01:00
Johannes Schmelz
b681b13468 send Trades 2024-11-30 15:15:30 +01:00
Johannes Schmelz
2c536f32cf fixed close on FoodField 2024-11-30 15:14:58 +01:00
Yvonne Schmidt
991fe5280f centered account values 2024-11-30 01:03:11 +01:00
Yvonne Schmidt
174fe5cfb3 resized LooserPopUp 2024-11-30 00:58:24 +01:00
Yvonne Schmidt
119284f256 resized WinnerPopUp 2024-11-30 00:40:58 +01:00
Yvonne Schmidt
05680af726 fixed BuildingAdminMenu 2024-11-29 23:07:58 +01:00
Johannes Schmelz
fba82f670b fixed jailState 2024-11-29 19:21:27 +01:00
Johannes Schmelz
afa2ebd004 set correct translation 2024-11-29 19:04:00 +01:00
Johannes Schmelz
f0eeff3493 update view 2024-11-29 18:27:25 +01:00
Johannes Schmelz
44d64c4e0f trigger timeoutPopup 2024-11-29 17:42:10 +01:00
Johannes Schmelz
86ece3b70d fixed move logic 2024-11-29 16:44:28 +01:00
Simon Wilkening
6cdad71693 Gulag und Rent erstellt 2024-11-29 08:57:11 +01:00
Simon Wilkening
cf6d5ea22e BuyHouse, RepayMortage und TakeMortage erstellt 2024-11-29 08:27:51 +01:00
Yvonne Schmidt
ecf227daa6 added colored strip to toolbar 2024-11-29 07:42:59 +01:00
Luca Puderbach
4b5a156865 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-29 07:22:51 +01:00
Luca Puderbach
cfae369fd3 Anzeige Spielerfarbe + Figur Pos 2024-11-29 07:22:46 +01:00
Simon Wilkening
b05eabbbf8 Verschiedene Popups kommentiert und richtig benannt 2024-11-29 07:21:28 +01:00
Simon Wilkening
fd178eee43 Merge remote-tracking branch 'origin/gui' into gui 
# Conflicts:
#	Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/ConfirmTrade.java
 2024-11-29 07:16:21 +01:00
Simon Wilkening
aef2ef34fb Verschiedene Popups kommentiert und richtig benannt 2024-11-29 07:14:44 +01:00
Johannes Schmelz
fcbffa1189 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-29 07:11:24 +01:00
Johannes Schmelz
0d8240381e fixed some mistakes 2024-11-29 07:11:20 +01:00
Yvonne Schmidt
77da6679ef added another label styling 2024-11-29 06:55:59 +01:00
Yvonne Schmidt
5845254caa added new label styling 2024-11-29 06:47:26 +01:00
Yvonne Schmidt
5d92d7cfcc Merge remote-tracking branch 'origin/gui' into gui 2024-11-29 06:42:56 +01:00
Yvonne Schmidt
67f6649242 added selector with no integration 2024-11-29 06:34:42 +01:00
Johannes Schmelz
1438ae5e4f improve position calc 2024-11-29 06:26:09 +01:00
Johannes Schmelz
01c351e64b Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-29 06:23:12 +01:00
Johannes Schmelz
b0c21dfcb8 added trigger for winner looser popup 2024-11-29 06:23:08 +01:00
Simon Wilkening
f4cddbc87f Bankrott-Warnung und Timeout-Warning kommentiert und richtig benannt 2024-11-29 06:20:23 +01:00
Luca Puderbach
cfce176c82 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-29 06:20:03 +01:00
Luca Puderbach
782b1a10c3 Kleine model Changes 2024-11-29 06:19:58 +01:00
Johannes Schmelz
2d9cd0e4e1 resolve merge conflict 2024-11-29 06:17:57 +01:00
Johannes Schmelz
908ba09e2a more models 2024-11-29 05:58:28 +01:00
Johannes Schmelz
4a84ef4b3c more models 2024-11-29 05:58:15 +01:00
Johannes Schmelz
f3353327dd added first models 2024-11-29 05:56:39 +01:00
Johannes Schmelz
316433f592 resolve merge conflicts 2024-11-29 05:33:03 +01:00
Yvonne Schmidt
1ccdea0c87 Merge remote-tracking branch 'origin/gui' into gui 2024-11-29 05:16:44 +01:00
Yvonne Schmidt
7d9af0c4c7 added selector to SellHouse 2024-11-29 05:16:33 +01:00
Simon Wilkening
a1247cdae5 Bankrott-Warnung und Timeout-Warning erstellt erstellt 2024-11-29 05:11:24 +01:00
Luca Puderbach
5696192cce Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-29 04:41:14 +01:00
Luca Puderbach
91826b730f Lade Figuren auf Spielbrett 2024-11-29 04:35:16 +01:00
Johannes Schmelz
48b1cf817a refactor 2024-11-29 04:32:57 +01:00
Johannes Schmelz
94ba9f0af2 rudimentary function for trade 2024-11-29 03:07:17 +01:00
Yvonne Schmidt
333f27a016 modified toolbar button behaviour 2024-11-28 23:41:45 +01:00
Johannes Schmelz
b67379a6c3 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-28 22:56:06 +01:00
Johannes Schmelz
1e6188cf24 open buy popups 2024-11-28 22:56:02 +01:00
Yvonne Schmidt
12e859edd5 finished PropertyOverviewMenu 2024-11-28 21:55:44 +01:00
Johannes Schmelz
e000dcfc51 cleanup 2024-11-28 19:50:53 +01:00
Johannes Schmelz
e7a06159bb Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-28 19:42:07 +01:00
Johannes Schmelz
c900b6384d lock button when not active 2024-11-28 19:40:30 +01:00
Simon Wilkening
970a0ae254 Gebäude_Abreißen erstellt 2024-11-28 04:34:33 +01:00
Yvonne Schmidt
5e0ac0abc7 fixed button disabled behaviour 2024-11-28 03:58:40 +01:00
Simon Wilkening
bcd6711965 Merge remote-tracking branch 'origin/gui' into gui 2024-11-28 03:16:35 +01:00
Simon Wilkening
bb63a4df9f Popup_Handel_bestätigen erstellt 2024-11-28 03:16:11 +01:00
Yvonne Schmidt
b4d7349583 added framework for PropertyOverviewMenu 2024-11-28 03:00:28 +01:00
Luca Puderbach
fed8a3fd2d Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-28 02:31:50 +01:00
Luca Puderbach
bc6e7174ec Test Modelle Umbenannt 2024-11-28 02:31:43 +01:00
Yvonne Schmidt
075f98883a fixed toolbar fontsize 2024-11-28 02:02:29 +01:00
Yvonne Schmidt
c9df3a6176 Merge remote-tracking branch 'origin/gui' into gui 2024-11-28 00:40:25 +01:00
Johannes Schmelz
b2d2a79b00 added hslider 2024-11-28 00:40:11 +01:00
Luca Puderbach
26d8283930 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-28 00:18:27 +01:00
Luca Puderbach
4079c0a32c Würfel animation hinzugefügt 2024-11-28 00:13:32 +01:00
Johannes Schmelz
6d72a94fe4 event card complete 2024-11-28 00:07:32 +01:00
Yvonne Schmidt
227a7a027f added comments 2024-11-27 23:40:16 +01:00
Johannes Schmelz
9e595b92ba crash when rolling dice and waitForTurn removed 2024-11-27 23:19:25 +01:00
Luca Puderbach
c346058631 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-27 17:34:52 +01:00
Luca Puderbach
f2678ea33d doppelwürfel 2024-11-27 17:34:41 +01:00
Yvonne Schmidt
45a43d6998 Merge remote-tracking branch 'origin/gui' into gui 2024-11-27 00:17:31 +01:00
Yvonne Schmidt
cb9888af7a completed BuildingAdminMenu 2024-11-27 00:17:04 +01:00
Johannes Schmelz
93b183254f Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-27 00:11:11 +01:00
Johannes Schmelz
e92b305a56 cleanup 2024-11-27 00:11:07 +01:00
Johannes Schmelz
5b0628da15 dynamically get the fieldid for by popups 2024-11-27 00:10:59 +01:00
Yvonne Schmidt
8d087a8e84 added framework for BuildingAdminMenu 2024-11-26 23:15:14 +01:00
Johannes Schmelz
1715926c1c Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-26 23:01:59 +01:00
Johannes Schmelz
c8b69efca2 added correct colors in LobbyMenu 2024-11-26 23:01:55 +01:00
Yvonne Schmidt
7f6011720c lobbyMenu ready button toggles to grey 2024-11-26 22:30:13 +01:00
Yvonne Schmidt
bdc5f0269f fixed cancel button position 2024-11-26 22:27:55 +01:00
Yvonne Schmidt
a6054e825e fixed trade display 2024-11-26 22:24:03 +01:00
Johannes Schmelz
156e76fe0a cleanup 2024-11-26 21:31:21 +01:00
Johannes Schmelz
89587a4c78 set default value for drop down selection 2024-11-26 21:28:41 +01:00
Johannes Schmelz
29cc73e83b automaticyally set player name as 'Spieler'+ id+1 2024-11-26 20:58:57 +01:00
Johannes Schmelz
e56cdb1dcb Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-26 20:00:54 +01:00
Johannes Schmelz
9107a08011 dynamically set players in ChoosePatner 2024-11-26 20:00:50 +01:00
Yvonne Schmidt
0242587a5f added groundwork for selection listeners 2024-11-26 19:54:02 +01:00
Yvonne Schmidt
3ce27023c2 Merge remote-tracking branch 'origin/gui' into gui 2024-11-26 19:42:01 +01:00
Johannes Schmelz
174958c6b1 can now dynamically update toolbar view 2024-11-26 18:50:24 +01:00
Johannes Schmelz
c71e8b1e8e removed hostplayer as hostplayer always has id 0 2024-11-26 18:48:13 +01:00
Yvonne Schmidt
ada067a2a0 added and centered buttons 2024-11-26 18:25:23 +01:00
Johannes Schmelz
f4c4f6bc93 cleanup 2024-11-26 17:53:49 +01:00
Simon Wilkening
6eeb6fd209 Properties_de übersetzt 2024-11-26 15:29:45 +01:00
Simon Wilkening
efba3c496a Deckhelper korrigiert, Properties angepasst 2024-11-26 15:15:29 +01:00
Johannes Schmelz
27a0ab52e6 dice button now works and update dice images accordingly 2024-11-26 14:59:48 +01:00
Yvonne Schmidt
d6ce859fcd ChoosePartner accept-button opens TradeMenu 2024-11-26 01:12:29 +01:00
Yvonne Schmidt
e5f69c9536 Merge remote-tracking branch 'origin/gui' into gui 
# Conflicts:
#	Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/ChoosePartner.java
 2024-11-26 01:08:59 +01:00
Yvonne Schmidt
d8a2225038 added framework for TradeMenu 2024-11-26 01:07:59 +01:00
Johannes Schmelz
7b91a679f5 abbrechen button in chossePatner 2024-11-26 00:57:22 +01:00
Yvonne Schmidt
840658b590 fixed background location again 2024-11-26 00:34:49 +01:00
Yvonne Schmidt
c5e7ef855e fixed background location 2024-11-26 00:25:31 +01:00
Yvonne Schmidt
170227c97f fixed header in ChoosePartner menu 2024-11-26 00:21:13 +01:00
Johannes Schmelz
379803278b Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-26 00:11:42 +01:00
Johannes Schmelz
3956d8efa7 show all playe stats in toolbar 2024-11-26 00:11:37 +01:00
Yvonne Schmidt
269aceaf1a added ChoosePartner menu 2024-11-26 00:11:01 +01:00
Yvonne Schmidt
41127565fc Merge remote-tracking branch 'origin/gui' into gui 2024-11-26 00:10:52 +01:00
Johannes Schmelz
0e405d2f90 send PlayerHandler in GameStart 2024-11-25 22:11:35 +01:00
Yvonne Schmidt
f67810b288 fixed toolbar buttons 2024-11-25 21:29:54 +01:00
Johannes Schmelz
4095d9e79d fixed buyCard color and button function 2024-11-25 21:29:00 +01:00
Johannes Schmelz
547a4c2353 cleanup toolbar 2024-11-25 21:14:38 +01:00
Johannes Schmelz
9120e4d53c show test world when GameStart message is recieved 2024-11-25 17:50:54 +01:00
Johannes Schmelz
1a62b76104 corrected map size 2024-11-25 16:28:50 +01:00
Johannes Schmelz
cc7f277bef fixed b button 2024-11-25 15:05:02 +01:00
Johannes Schmelz
274df8dfd1 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-25 06:50:05 +01:00
Johannes Schmelz
0c2b266f5e Merge branch 'main' into 'gui' 
# Conflicts:
#   Projekte/battleship/client/src/main/java/pp/battleship/client/Menu.java
#   Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy
#   Projekte/monopoly/model/src/main/java/pp/monopoly/game/server/Player.java
 2024-11-25 05:33:21 +00:00
Simon Wilkening
16b4dbae18 Deckhelper korrigiert 2024-11-25 06:30:04 +01:00
Johannes Schmelz
88409dcc99 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-25 05:42:49 +01:00
Johannes Schmelz
5cacff39b7 refactor typo 2024-11-25 05:42:45 +01:00
Yvonne Schmidt
093723a9d0 added outline for ChoosePartner Menu 2024-11-25 05:40:49 +01:00
Johannes Schmelz
dfdbcdc9f3 board visible again 2024-11-25 05:16:24 +01:00
Johannes Schmelz
bd725e2dc4 refactor 2024-11-25 04:54:35 +01:00
Johannes Schmelz
dd9d9144dd Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-25 04:52:56 +01:00
Johannes Schmelz
1a429e4bb6 fixed settings in toolbar 2024-11-25 04:52:53 +01:00
Yvonne Schmidt
ad6fb5e926 added dice containers 2024-11-25 04:52:34 +01:00
Johannes Schmelz
72cb7049ba remove demo cube 2024-11-25 04:19:13 +01:00
Johannes Schmelz
2e42f3afac added testing shortcuts 2024-11-25 04:09:48 +01:00
Yvonne Schmidt
8474c9f5bc fixed EventCard sizing 2024-11-25 03:56:07 +01:00
Johannes Schmelz
b7ed03f7e8 resolve merge conflicts 2024-11-25 03:55:06 +01:00
Johannes Schmelz
a44b6b5e4c Merge branch 'connect' into 'gui' 
Client connect to server

See merge request progproj/gruppen-ht24/Gruppe-02!14
 2024-11-25 02:46:03 +00:00
Johannes Schmelz
5268f75e17 Client connect to server 2024-11-25 02:46:03 +00:00
Simon Wilkening
687d1621fc EventCard erweitert 2024-11-25 00:06:12 +01:00
Johannes Schmelz
a6944aa6e3 added dice images 2024-11-24 23:38:22 +01:00
Johannes Schmelz
b8365c76a1 fix mac executable 2024-11-24 22:58:47 +01:00
Johannes Schmelz
19216cc174 refactor 2024-11-24 22:57:19 +01:00
Johannes Schmelz
c6a23b9b8e execute for apple 2024-11-24 22:56:52 +01:00
Johannes Schmelz
c0f42fb1eb refactor 2024-11-24 22:50:52 +01:00
Tamino Mueller
160873e2cc added pictures and popups fixed 2024-11-24 22:42:32 +01:00
Tamino Mueller
8df859bbef Merge remote-tracking branch 'origin/gui' into gui 2024-11-24 22:34:54 +01:00
Tamino Mueller
e30d10a85d Pop-Up hinzugefügt 2024-11-24 22:34:19 +01:00
Yvonne Schmidt
bafc3f1db6 Merge remote-tracking branch 'origin/gui' into gui 2024-11-24 19:25:12 +01:00
Yvonne Schmidt
03571fcf74 code cleanup in der lobby 2024-11-24 19:24:51 +01:00
Johannes Schmelz
e7a6802488 fixed buyProperty 2024-11-24 19:14:56 +01:00
Yvonne Schmidt
a6e6b5e158 lobby übergibt figur 2024-11-24 19:05:28 +01:00
Simon Wilkening
74c3d925e6 TODOs und Kommentare ergänst 2024-11-24 19:04:58 +01:00
Yvonne Schmidt
f67fa4d7f0 lobby übergibt namen 2024-11-24 18:39:32 +01:00
Simon Wilkening
225a8c0e08 BuildingPropertyCard adjusted 2024-11-24 18:11:42 +01:00
Yvonne Schmidt
9a6ce27fe1 lobby uebergibt farbe und startgeld 2024-11-24 18:07:39 +01:00
Johannes Schmelz
437114704a get client id 2024-11-24 17:20:35 +01:00
Johannes Schmelz
9b4cac4e56 send PlayerHandler when starting game 2024-11-24 16:51:00 +01:00
Johannes Schmelz
e780513b35 saving the players 2024-11-24 00:32:16 +01:00
Johannes Schmelz
d582c59a7d added playerState changes 2024-11-24 00:29:48 +01:00
Johannes Schmelz
7d2c85f617 fixed card bug 2024-11-24 00:13:32 +01:00
Johannes Schmelz
4a882bc4ac Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-24 00:11:18 +01:00
Johannes Schmelz
3c4eac1fcd added logic for visiting event field 2024-11-24 00:11:14 +01:00
Yvonne Schmidt
75d5a15bdb defaultwerte in die Lobby eingefügt 2024-11-23 23:19:53 +01:00
Yvonne Schmidt
17f121f7d1 Merge remote-tracking branch 'origin/gui' into gui 2024-11-23 23:15:04 +01:00
Johannes Schmelz
a66c570b51 remove 2d map view 2024-11-23 23:09:02 +01:00
Yvonne Schmidt
e1e7f2eaf6 überschneidungen von elementen beseitigt 2024-11-23 23:07:42 +01:00
Johannes Schmelz
46d2dce372 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-23 22:12:39 +01:00
Johannes Schmelz
c39f1f6d4c tweaked camera params 2024-11-23 22:12:34 +01:00
Yvonne Schmidt
738b04f2d9 oberfläche der lobby fertig 2024-11-23 21:29:14 +01:00
Simon Wilkening
ecba1c3135 GateField korrigiert 2024-11-23 21:22:54 +01:00
Johannes Schmelz
748226f4ed added Move Camera based on player position 2024-11-23 19:27:04 +01:00
Johannes Schmelz
f658f53ba9 refactor 2024-11-23 19:26:36 +01:00
Johannes Schmelz
4a8304ee4f relabled FoodField 2024-11-23 18:53:29 +01:00
Simon Wilkening
7fe9604338 FoodField korrigiert 2024-11-23 18:28:28 +01:00
Johannes Schmelz
7f09a6dae8 refactor 2024-11-23 18:02:46 +01:00
Johannes Schmelz
270129bc97 fixed typo 2024-11-23 17:58:56 +01:00
Johannes Schmelz
62ec6f6bef dynamically allocate values 2024-11-23 17:58:17 +01:00
Johannes Schmelz
b24c14900c food field dynamic value allocation 2024-11-23 17:54:11 +01:00
Johannes Schmelz
44c55ce3a6 refactor 2024-11-23 17:42:51 +01:00
Johannes Schmelz
895bea048c Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-23 17:41:47 +01:00
Johannes Schmelz
885ab5bdc9 dynamically allocate values 2024-11-23 17:41:20 +01:00
Yvonne Schmidt
c6355b2c09 dropdown lesbar 2024-11-23 17:37:27 +01:00
Yvonne Schmidt
ada6bf3f24 changed GateField font color 2024-11-23 17:24:41 +01:00
Simon Wilkening
db471ac679 Merge remote-tracking branch 'origin/gui' into gui 2024-11-23 17:22:37 +01:00
Simon Wilkening
84059c4085 GateField 2024-11-23 17:22:24 +01:00
Yvonne Schmidt
09b363f943 auswahllogik im dropdown implementiert 2024-11-23 17:03:56 +01:00
Simon Wilkening
fd347c7780 Building property eingefügt 2024-11-23 16:50:16 +01:00
Johannes Schmelz
b38a34efa5 add figure when player added 2024-11-23 16:35:33 +01:00
Johannes Schmelz
10e24cf30e small bug fixes 2024-11-23 16:16:40 +01:00
Johannes Schmelz
3369057afb update the players figure when moved 2024-11-23 16:08:46 +01:00
Johannes Schmelz
7ada56e215 limit the amount of players to 6 2024-11-23 14:41:17 +01:00
Johannes Schmelz
373b9e6d53 allow the host player to set start money 2024-11-23 13:20:05 +01:00
Johannes Schmelz
3de31de9f7 bind playercolor to join order 2024-11-23 12:46:20 +01:00
Johannes Schmelz
7252259ab3 updated trade and client logic 2024-11-23 09:15:57 +01:00
Yvonne Schmidt
f33c673a05 lobby für feinschliff vorbereitet 2024-11-22 07:15:25 +01:00
Yvonne Schmidt
65a7958b66 popup ebenen angepasst und dropdown entfernt 2024-11-22 05:28:51 +01:00
Simon Wilkening
91e4df7478 B-Taste um Karte Kaufen Popup zu öffnen 2024-11-22 05:23:52 +01:00
Yvonne Schmidt
399606d9a0 Toolbar-Design angepasst 2024-11-22 04:45:27 +01:00
Johannes Schmelz
559afcaffd added NextPlayerTurn 2024-11-22 01:38:48 +01:00
Johannes Schmelz
15f5f91ddb rename sound files 2024-11-22 01:02:48 +01:00
Johannes Schmelz
067a8063a5 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-22 00:54:13 +01:00
Johannes Schmelz
35e367ba24 added sounds 2024-11-22 00:54:09 +01:00
Simon Wilkening
fe68d991fc Merge remote-tracking branch 'origin/gui' into gui 2024-11-22 00:44:55 +01:00
Simon Wilkening
88dc633e8e Würfellogik mit toolbar erneut verbunden 2024-11-22 00:44:36 +01:00
Johannes Schmelz
0b9cbb0f5f view assets response now send alls properties and fixed which players properties are sent 2024-11-22 00:42:07 +01:00
Johannes Schmelz
c3a33b4402 added house prices and color to buildingfields 2024-11-21 15:30:34 +01:00
Luca Puderbach
e12f00aad6 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-20 03:36:59 +01:00
Luca Puderbach
47bac0185f Port fix 2024-11-20 03:36:54 +01:00
Yvonne Schmidt
dafe1dab2a Merge remote-tracking branch 'origin/gui' into gui 2024-11-20 03:24:46 +01:00
Yvonne Schmidt
8ba4ea2819 menues angepasst und vorlage für dropdown implementiert 2024-11-20 03:24:27 +01:00
Simon Wilkening
f6f708fd5b Angepasste Toolbar 2024-11-20 03:17:10 +01:00
Luca Puderbach
1203077aed Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-20 02:39:20 +01:00
Luca Puderbach
ddbf79c928 can now add players 2024-11-20 02:37:00 +01:00
Johannes Schmelz
aa47dd579f added selenium dependecy for drop down menu 2024-11-20 02:21:23 +01:00
Johannes Schmelz
cdce478d77 send GameStart message with a list of all Players 2024-11-20 01:45:34 +01:00
Johannes Schmelz
f11f4a59f1 fixed lemurproto dependecy 2024-11-20 00:55:33 +01:00
Luca Puderbach
d631e8df1e TempFix 2024-11-20 00:50:19 +01:00
Johannes Schmelz
af80d40700 fix server start 2024-11-19 23:59:23 +01:00
Johannes Schmelz
3a6f8a945a palyer ready fix 2024-11-19 23:59:16 +01:00
Luca Puderbach
bb9727d54a Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-19 23:09:44 +01:00
Luca Puderbach
7da8b3e545 Spieler Lobby 2024-11-19 23:09:39 +01:00
Johannes Schmelz
b6968df451 Merge branch 'main' into 'gui' 
Main

See merge request progproj/gruppen-ht24/Gruppe-02!13
 2024-11-19 20:30:56 +00:00
Johannes Schmelz
aa986fb948 added backgroud music file 2024-11-19 20:51:24 +01:00
Yvonne Schmidt
6e63de6e99 Merge remote-tracking branch 'origin/gui' into gui 2024-11-19 19:54:40 +01:00
Yvonne Schmidt
962ecd08fa SettingsMenu hat neues design 2024-11-19 19:54:22 +01:00
Luca Puderbach
580a26b3ea Grundlage Toolbar 2024-11-19 19:50:25 +01:00
Johannes Schmelz
0cda6b5fa0 added first sound files 2024-11-19 19:40:27 +01:00
Johannes Schmelz
cc8c3795b8 added game sound logic 2024-11-19 19:27:52 +01:00
Johannes Schmelz
3c21165efb adjusted config params 2024-11-19 19:09:37 +01:00
Luca Puderbach
818fdf4670 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-19 17:44:57 +01:00
Luca Puderbach
b7d679b492 neue map 2024-11-19 17:44:52 +01:00
Yvonne Schmidt
a42093df23 SettingsMenu nochmal angepasst 2024-11-19 17:34:22 +01:00
Johannes Schmelz
6157db51da added server label 2024-11-19 14:46:11 +01:00
Yvonne Schmidt
843052989b Merge remote-tracking branch 'origin/gui' into gui 2024-11-18 23:04:43 +01:00
Yvonne Schmidt
8e01fa3192 SettingsMenu angepasst 2024-11-18 23:04:09 +01:00
Johannes Schmelz
e2126a7ea7 implemented self host for server 2024-11-18 23:01:34 +01:00
Luca Puderbach
0b46d14650 LobbyServer Einfügen 2024-11-18 18:56:42 +01:00
Luca Puderbach
9e28deedf7 Grundlagen Lobby 2024-11-18 18:30:35 +01:00
Luca Puderbach
9c0172b413 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-18 17:27:51 +01:00
Luca Puderbach
2933d022aa Veränderung Erreichen der Testwelt 2024-11-18 17:27:46 +01:00
Yvonne Schmidt
bdefb7193e Merge remote-tracking branch 'origin/gui' into gui 2024-11-18 17:13:13 +01:00
Yvonne Schmidt
69b68a6975 toolbar style hinzugefügt 2024-11-18 17:08:58 +01:00
Expand all files Collapse all files

Diff Content Not Available