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

fb280101a5 Merge remote-tracking branch 'origin/gui' into gui Yvonne Schmidt 2024-12-08 18:40:48 +0100
844495ebbb modified toolbar Yvonne Schmidt 2024-12-08 18:40:28 +0100
e14f6bbef7 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-12-08 18:38:15 +0100
4839ddd497 clean up and doc Johannes Schmelz 2024-12-08 18:38:06 +0100
b901323e2f added color changes for buttons Yvonne Schmidt 2024-12-08 18:30:18 +0100
640665fd29 fixed layering issue Yvonne Schmidt 2024-12-08 18:29:14 +0100
ba8791d9fe update Toolbar view Johannes Schmelz 2024-12-08 18:08:16 +0100
f8fe0b9877 fixed property trade Johannes Schmelz 2024-12-08 17:34:19 +0100
48913356e3 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-12-08 16:05:39 +0100
e498c6f179 refactor Johannes Schmelz 2024-12-08 16:03:21 +0100
31fe60807f spelling Johannes Schmelz 2024-12-08 15:57:32 +0100
c758ba9735 corrected toolbar labels Yvonne Schmidt 2024-12-08 15:05:47 +0100
650dcb85db toolbar frame has playercolor Yvonne Schmidt 2024-12-08 14:53:41 +0100
6b110c81c8 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Luca Puderbach 2024-12-08 04:57:09 +0100
93ef00870b update toolbar + background Luca Puderbach 2024-12-08 04:57:04 +0100
645433610f added control for figures Johannes Schmelz 2024-12-08 02:43:58 +0100
10a5b6b4d4 cleanup Johannes Schmelz 2024-12-08 02:39:05 +0100
69fccefed9 file path updated Johannes Schmelz 2024-12-08 02:23:21 +0100
14aecdd929 changed images Johannes Schmelz 2024-12-08 02:21:54 +0100
48f18dd468 Merge branch 'reworkedGui' into 'gui' Johannes Schmelz 2024-12-08 01:19:34 +0000
96fe09c6fa Reworked gui and client states Johannes Schmelz 2024-12-08 01:19:34 +0000
ac881eab3f Merge branch 'reworkedGui' into 'gui' Johannes Schmelz 2024-12-08 01:19:28 +0000
a686671c15 Merge branch 'reworkedGui' into 'main' Johannes Schmelz 2024-12-08 01:18:35 +0000
e102d22f14 refactor Worlds and client States Johannes Schmelz 2024-12-08 01:18:35 +0000
a157a3d402 Merge branch 'reworkedGui' into 'main' Johannes Schmelz 2024-12-08 01:18:20 +0000
159927e52c now able to add all nessecary models reworkedGui Johannes Schmelz 2024-12-08 02:16:40 +0100
14c68f55d9 ltl backgrounds Luca Puderbach 2024-12-08 01:16:26 +0100
8614faf940 show popups Johannes Schmelz 2024-12-07 22:11:31 +0100
4ba43602fa player now moves without animation Johannes Schmelz 2024-12-07 21:58:26 +0100
392a81b2d8 fixed background music overlap Yvonne Schmidt 2024-12-07 18:29:41 +0100
944b6b674e replaced text displays with labels Yvonne Schmidt 2024-12-07 14:54:55 +0100
b4e2beca3a frist working version, TODO: trigger the render events Johannes Schmelz 2024-12-07 01:13:17 +0100
5f4c6be7b8 adjusted test in ReceivedRent Simon Wilkening 2024-12-06 17:04:00 +0100
aca92cd7f1 clean up Johannes Schmelz 2024-12-06 16:21:12 +0100
b50b5e64d1 can only trade fields without buildings Johannes Schmelz 2024-12-06 16:06:40 +0100
551786bf30 fixed enabled pref in GameMusic Johannes Schmelz 2024-12-06 15:56:42 +0100
2aca94100e adjusted test in ReceivedRent Simon Wilkening 2024-12-06 13:20:40 +0100
9e81fb8549 TopDialog in Propertyoverview eingefügt Simon Wilkening 2024-12-06 13:17:57 +0100
3c6e519e77 Rent/ReceivedRent text changed Simon Wilkening 2024-12-06 13:12:56 +0100
9be00ab848 renamed IgfPadubrin and Rent/ReceivedRent Simon Wilkening 2024-12-06 12:35:57 +0100
c2c22f9ae5 NoMoneywarning and TimeOut use Dialogmanager now Simon Wilkening 2024-12-06 11:57:20 +0100
e65c2661f7 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-12-05 02:48:00 +0100
88db193b5e choose your charakter Johannes Schmelz 2024-12-05 02:47:55 +0100
38824895bb set new toolbar background Yvonne Schmidt 2024-12-05 02:05:47 +0100
a78261594d ImageButton for new Button design Johannes Schmelz 2024-12-05 01:43:01 +0100
646d301554 added toolbar icons Yvonne Schmidt 2024-12-05 01:16:06 +0100
e49b22c022 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-12-04 18:51:19 +0100
8821602728 kamera Luca Puderbach 2024-12-04 16:44:26 +0100
eb19e290bb Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Luca Puderbach 2024-12-04 16:39:37 +0100
b477077b9b Kamera Teil1 Luca Puderbach 2024-12-04 16:39:32 +0100
02cfc1d21a fixed formating errors Yvonne Schmidt 2024-12-04 16:00:24 +0100
4c40b447a5 fixed formating errors Yvonne Schmidt 2024-12-04 12:16:04 +0100
eaff7b6c5d fixed formating error in RejectTrade Yvonne Schmidt 2024-12-04 01:52:30 +0100
9ee1b5b81b simplified representation of trade Yvonne Schmidt 2024-12-04 01:48:18 +0100
49b9972ade replaced textinput with dynamic label Yvonne Schmidt 2024-12-04 01:10:12 +0100
aae003823d trigger money sounds Johannes Schmelz 2024-12-03 12:34:56 +0100
1369de865a can no longer build if already has hotel Johannes Schmelz 2024-12-03 12:30:34 +0100
8e3cf9c31e now allowed to roll dice after getting out of jail Johannes Schmelz 2024-12-03 12:24:55 +0100
bc31c61fb3 bigger hack Johannes Schmelz 2024-12-03 12:24:25 +0100
975e4a2737 gym card text Johannes Schmelz 2024-12-03 12:16:03 +0100
8d638158e4 fixed Miete popup Johannes Schmelz 2024-12-03 12:15:00 +0100
1f37eb9962 refactor PlayerColor fixed default playermodel selection Johannes Schmelz 2024-12-03 12:07:09 +0100
09ea8a046e mortage house interaction Johannes Schmelz 2024-12-03 11:37:36 +0100
0acb23ab8b price settings Johannes Schmelz 2024-12-03 01:09:00 +0100
831974cb63 miete erhalten popup Johannes Schmelz 2024-12-03 00:58:01 +0100
031ac52670 foodfield rent calc Johannes Schmelz 2024-12-03 00:40:43 +0100
14ceb9dc67 fixed GateField rent Johannes Schmelz 2024-12-03 00:39:36 +0100
aa86c25e7c fixed sell house payment Johannes Schmelz 2024-12-03 00:30:54 +0100
cb0788e44c lock endTurnButton when player needs to roll dice Johannes Schmelz 2024-12-03 00:29:27 +0100
9e88353bd5 show bankrupt popup once Johannes Schmelz 2024-12-03 00:17:23 +0100
6db96f0a1d trigger demo mode Johannes Schmelz 2024-12-03 00:12:22 +0100
b01bb3cf7b update for jar export Johannes Schmelz 2024-12-02 16:29:57 +0100
95b9da9377 server doc Johannes Schmelz 2024-12-02 09:06:00 +0100
30822e3f4d Java Docs Luca Puderbach 2024-12-02 09:02:41 +0100
957bf8ffcc Merge remote-tracking branch 'origin/gui' into gui Yvonne Schmidt 2024-12-02 09:00:57 +0100
446ecfd4b5 added documentation for NoMoneyWarning Yvonne Schmidt 2024-12-02 09:00:43 +0100
821c9ec3fb added documentation for SellHouse Yvonne Schmidt 2024-12-02 08:58:41 +0100
531a3e263c added documentation for TakeMortage Yvonne Schmidt 2024-12-02 08:54:49 +0100
4917208818 added documentation for TimeOut Yvonne Schmidt 2024-12-02 08:51:22 +0100
e81cdf3b40 added documentation for WinnerPopUp Yvonne Schmidt 2024-12-02 08:49:26 +0100
bffe614b54 added documentation for LooserPopUp Yvonne Schmidt 2024-12-02 08:47:36 +0100
69ad19757d added documentation for GulagInfo Yvonne Schmidt 2024-12-02 08:44:23 +0100
a4c0afe277 added documentation for Gulag Yvonne Schmidt 2024-12-02 08:42:08 +0100
cc157a3cf3 added documentation for Rent Yvonne Schmidt 2024-12-02 08:40:02 +0100
ff2b64d476 removed errors in java doc Johannes Schmelz 2024-12-02 08:39:47 +0100
459a54ac5d added documentation for Rent Yvonne Schmidt 2024-12-02 08:36:54 +0100
a50821f2e6 added documentation for RejectTrade Yvonne Schmidt 2024-12-02 08:34:53 +0100
72e0fc7cbd added documentation for GateFieldCard Yvonne Schmidt 2024-12-02 08:31:14 +0100
3260d06bc8 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-12-02 08:28:09 +0100
e07db0129f completed tests Johannes Schmelz 2024-12-02 08:28:05 +0100
3bfa7ff69f added documentation for FoodFieldCard Yvonne Schmidt 2024-12-02 08:26:08 +0100
160fff88ea added documentation for EventCardPopup Yvonne Schmidt 2024-12-02 08:23:13 +0100
7a658cb3d6 added documentation for EventCardPopup Yvonne Schmidt 2024-12-02 08:15:54 +0100
25361933d7 added documentation for ConfirmTrade Yvonne Schmidt 2024-12-02 08:13:06 +0100
4ac02a1a7b added documentation for BuyHouse Yvonne Schmidt 2024-12-02 08:10:08 +0100
6f15f12b49 added documentation for BuildingPropertyCard Yvonne Schmidt 2024-12-02 08:05:00 +0100
9e50c1afe2 added documentation for Bankrupt Yvonne Schmidt 2024-12-02 07:59:24 +0100
3a43ea10d9 added documentation for AcceptTrade Yvonne Schmidt 2024-12-02 07:55:07 +0100
3539b1cf23 added documentation for BuildingAdminMenu Yvonne Schmidt 2024-12-02 07:48:57 +0100
d0ba0d011f added documentation for CameraController Yvonne Schmidt 2024-12-02 07:45:37 +0100