Gruppe-02-clone

mirror of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git synced 2025-04-12 19:31:07 +02:00

Commit Graph

Select branches

Hide Pull Requests

Testhandbuch

b_Mueller_Tamino

b_Schmelz_Johannes

b_malkmus_dennis

b_puderbach_luca

b_schmelz_johannes

b_schmidt_yvonne

b_szepielewicz_filip

b_wilkening_simon

client_logic

connect

demo

gui

logic

main

revert-71a4ac8d

revert-f248a77c

reworkedGui

79c96677bd Merge remote-tracking branch 'origin/gui' into gui Yvonne Schmidt 2024-12-01 00:35:27 +0100
54118071cb fixed popup overlap Yvonne Schmidt 2024-12-01 00:34:57 +0100
2e28b54936 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-12-01 00:30:55 +0100
f333e2d2c0 button function Johannes Schmelz 2024-12-01 00:30:50 +0100
b89d40b39f fixed nullPointer Yvonne Schmidt 2024-12-01 00:14:04 +0100
488ae154cf fixed overlapping popups Yvonne Schmidt 2024-11-30 23:26:37 +0100
c1e501c271 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-11-30 22:39:12 +0100
89d5185c91 rent popup fixed Johannes Schmelz 2024-11-30 22:39:08 +0100
f4bf38bca1 AcceptTrade, RejectTrade und NoMoneyWarning hinzugefügt Simon Wilkening 2024-11-30 22:01:35 +0100
b87b3f054b trigger rent popup Johannes Schmelz 2024-11-30 21:49:16 +0100
f6137b8b68 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-11-30 20:50:40 +0100
87309235bd trade logic complete Johannes Schmelz 2024-11-30 20:50:36 +0100
d37017bfa0 Winner and Looser Popup close the game again Simon Wilkening 2024-11-30 20:33:08 +0100
5d6440bd50 Eventcards korrigiert Simon Wilkening 2024-11-30 20:20:43 +0100
a70295f1ff Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-11-30 15:15:35 +0100
b681b13468 send Trades Johannes Schmelz 2024-11-30 15:15:30 +0100
2c536f32cf fixed close on FoodField Johannes Schmelz 2024-11-30 15:14:58 +0100
991fe5280f centered account values Yvonne Schmidt 2024-11-30 01:03:11 +0100
174fe5cfb3 resized LooserPopUp Yvonne Schmidt 2024-11-30 00:58:24 +0100
119284f256 resized WinnerPopUp Yvonne Schmidt 2024-11-30 00:40:58 +0100
05680af726 fixed BuildingAdminMenu Yvonne Schmidt 2024-11-29 23:07:58 +0100
fba82f670b fixed jailState Johannes Schmelz 2024-11-29 19:21:27 +0100
afa2ebd004 set correct translation Johannes Schmelz 2024-11-29 19:04:00 +0100
f0eeff3493 update view Johannes Schmelz 2024-11-29 18:27:25 +0100
44d64c4e0f trigger timeoutPopup Johannes Schmelz 2024-11-29 17:42:10 +0100
86ece3b70d fixed move logic Johannes Schmelz 2024-11-29 16:44:28 +0100
6cdad71693 Gulag und Rent erstellt Simon Wilkening 2024-11-29 08:57:11 +0100
cf6d5ea22e BuyHouse, RepayMortage und TakeMortage erstellt Simon Wilkening 2024-11-29 08:27:51 +0100
ecf227daa6 added colored strip to toolbar Yvonne Schmidt 2024-11-29 07:42:59 +0100
4b5a156865 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Luca Puderbach 2024-11-29 07:22:51 +0100
cfae369fd3 Anzeige Spielerfarbe + Figur Pos Luca Puderbach 2024-11-29 07:22:46 +0100
b05eabbbf8 Verschiedene Popups kommentiert und richtig benannt Simon Wilkening 2024-11-29 07:21:28 +0100
fd178eee43 Merge remote-tracking branch 'origin/gui' into gui Simon Wilkening 2024-11-29 07:16:21 +0100
aef2ef34fb Verschiedene Popups kommentiert und richtig benannt Simon Wilkening 2024-11-29 07:14:44 +0100
fcbffa1189 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-11-29 07:11:24 +0100
0d8240381e fixed some mistakes Johannes Schmelz 2024-11-29 07:11:20 +0100
77da6679ef added another label styling Yvonne Schmidt 2024-11-29 06:55:59 +0100
5845254caa added new label styling Yvonne Schmidt 2024-11-29 06:47:26 +0100
5d92d7cfcc Merge remote-tracking branch 'origin/gui' into gui Yvonne Schmidt 2024-11-29 06:42:56 +0100
67f6649242 added selector with no integration Yvonne Schmidt 2024-11-29 06:34:42 +0100
1438ae5e4f improve position calc Johannes Schmelz 2024-11-29 06:26:09 +0100
01c351e64b Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-11-29 06:23:12 +0100
b0c21dfcb8 added trigger for winner looser popup Johannes Schmelz 2024-11-29 06:23:08 +0100
f4cddbc87f Bankrott-Warnung und Timeout-Warning kommentiert und richtig benannt Simon Wilkening 2024-11-29 06:20:23 +0100
cfce176c82 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Luca Puderbach 2024-11-29 06:20:03 +0100
782b1a10c3 Kleine model Changes Luca Puderbach 2024-11-29 06:19:58 +0100
2d9cd0e4e1 resolve merge conflict Johannes Schmelz 2024-11-29 06:17:57 +0100
908ba09e2a more models Johannes Schmelz 2024-11-29 05:58:28 +0100
4a84ef4b3c more models Johannes Schmelz 2024-11-29 05:58:15 +0100
f3353327dd added first models Johannes Schmelz 2024-11-29 05:56:39 +0100
316433f592 resolve merge conflicts Johannes Schmelz 2024-11-29 05:33:03 +0100
1ccdea0c87 Merge remote-tracking branch 'origin/gui' into gui Yvonne Schmidt 2024-11-29 05:16:44 +0100
7d9af0c4c7 added selector to SellHouse Yvonne Schmidt 2024-11-29 05:16:33 +0100
a1247cdae5 Bankrott-Warnung und Timeout-Warning erstellt erstellt Simon Wilkening 2024-11-29 05:11:24 +0100
5696192cce Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Luca Puderbach 2024-11-29 04:41:14 +0100
91826b730f Lade Figuren auf Spielbrett Luca Puderbach 2024-11-29 04:35:16 +0100
48b1cf817a refactor Johannes Schmelz 2024-11-29 04:32:57 +0100
94ba9f0af2 rudimentary function for trade Johannes Schmelz 2024-11-29 03:07:17 +0100
333f27a016 modified toolbar button behaviour Yvonne Schmidt 2024-11-28 23:41:45 +0100
b67379a6c3 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-11-28 22:56:06 +0100
1e6188cf24 open buy popups Johannes Schmelz 2024-11-28 22:56:02 +0100
12e859edd5 finished PropertyOverviewMenu Yvonne Schmidt 2024-11-28 21:55:44 +0100
a9e4afec08 Update 2 files Testhandbuch Filip Szepielewicz 2024-11-28 20:08:07 +0000
e000dcfc51 cleanup Johannes Schmelz 2024-11-28 19:50:53 +0100
e7a06159bb Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-11-28 19:42:07 +0100
c900b6384d lock button when not active Johannes Schmelz 2024-11-28 19:40:30 +0100
970a0ae254 Gebäude_Abreißen erstellt Simon Wilkening 2024-11-28 04:34:33 +0100
5e0ac0abc7 fixed button disabled behaviour Yvonne Schmidt 2024-11-28 03:58:40 +0100
bcd6711965 Merge remote-tracking branch 'origin/gui' into gui Simon Wilkening 2024-11-28 03:16:35 +0100
bb63a4df9f Popup_Handel_bestätigen erstellt Simon Wilkening 2024-11-28 03:16:11 +0100
b4d7349583 added framework for PropertyOverviewMenu Yvonne Schmidt 2024-11-28 03:00:28 +0100
fed8a3fd2d Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Luca Puderbach 2024-11-28 02:31:50 +0100
bc6e7174ec Test Modelle Umbenannt Luca Puderbach 2024-11-28 02:31:43 +0100
075f98883a fixed toolbar fontsize Yvonne Schmidt 2024-11-28 02:02:29 +0100
c9df3a6176 Merge remote-tracking branch 'origin/gui' into gui Yvonne Schmidt 2024-11-28 00:40:25 +0100
b2d2a79b00 added hslider Johannes Schmelz 2024-11-28 00:40:11 +0100
26d8283930 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Luca Puderbach 2024-11-28 00:18:27 +0100
4079c0a32c Würfel animation hinzugefügt Luca Puderbach 2024-11-28 00:13:32 +0100
6d72a94fe4 event card complete Johannes Schmelz 2024-11-28 00:07:32 +0100
227a7a027f added comments Yvonne Schmidt 2024-11-27 23:40:16 +0100
9e595b92ba crash when rolling dice and waitForTurn removed Johannes Schmelz 2024-11-27 23:19:25 +0100
c346058631 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Luca Puderbach 2024-11-27 17:34:52 +0100
f2678ea33d doppelwürfel Luca Puderbach 2024-11-27 17:34:41 +0100
45a43d6998 Merge remote-tracking branch 'origin/gui' into gui Yvonne Schmidt 2024-11-27 00:17:31 +0100
cb9888af7a completed BuildingAdminMenu Yvonne Schmidt 2024-11-27 00:17:04 +0100
93b183254f Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-11-27 00:11:11 +0100
e92b305a56 cleanup Johannes Schmelz 2024-11-27 00:11:07 +0100
5b0628da15 dynamically get the fieldid for by popups Johannes Schmelz 2024-11-27 00:10:59 +0100
8d087a8e84 added framework for BuildingAdminMenu Yvonne Schmidt 2024-11-26 23:15:14 +0100
1715926c1c Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-11-26 23:01:59 +0100
c8b69efca2 added correct colors in LobbyMenu Johannes Schmelz 2024-11-26 23:01:55 +0100
7f6011720c lobbyMenu ready button toggles to grey Yvonne Schmidt 2024-11-26 22:30:13 +0100
bdc5f0269f fixed cancel button position Yvonne Schmidt 2024-11-26 22:27:55 +0100
a6054e825e fixed trade display Yvonne Schmidt 2024-11-26 22:24:03 +0100
156e76fe0a cleanup Johannes Schmelz 2024-11-26 21:31:21 +0100
89587a4c78 set default value for drop down selection Johannes Schmelz 2024-11-26 21:28:41 +0100
29cc73e83b automaticyally set player name as 'Spieler'+ id+1 Johannes Schmelz 2024-11-26 20:58:57 +0100
e56cdb1dcb Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-11-26 20:00:54 +0100
9107a08011 dynamically set players in ChoosePatner Johannes Schmelz 2024-11-26 20:00:50 +0100
0242587a5f added groundwork for selection listeners Yvonne Schmidt 2024-11-26 19:54:02 +0100