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

Mono Color

• 4cdd7c0cab Upload Vostellung_PP_Gruppe2_Monopoly main Simon Wilkening 2024-12-19 10:24:04 +00:00
• e66487776d Delete ClientGameLogicTest.java Filip Szepielewicz 2024-12-13 13:50:30 +00:00
• 97397e3053 Delete ClientLogicTest.java Filip Szepielewicz 2024-12-13 13:49:04 +00:00
• be568fd8f2 completed documentation Johannes Schmelz 2024-12-12 18:17:21 +01:00
• 83aaae9fa6 Merge branch 'gui' into 'main' Johannes Schmelz 2024-12-12 16:51:29 +00:00
• 10e30d9bd9 Merge branch 'main' into 'gui' gui Johannes Schmelz 2024-12-12 16:50:21 +00:00
• 5de76f3226 demo Johannes Schmelz 2024-12-12 17:48:24 +01:00
• e2db058fc7 java doc Johannes Schmelz 2024-12-12 17:38:46 +01:00
• 7c79bb77e7 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-12-12 16:13:55 +01:00
• 444cf9db4e fixed names in Player Popups Johannes Schmelz 2024-12-12 16:13:50 +01:00
• eb54fb1d14 build correct demo Johannes Schmelz 2024-12-10 14:12:28 +01:00
• 40c550cc4d mortage Johannes Schmelz 2024-12-10 14:10:17 +01:00
• 9e199d677e Bahnhöfe --> Tore Simon Wilkening 2024-12-10 13:46:35 +01:00
• 18300987a4 demo Johannes Schmelz 2024-12-10 12:13:40 +01:00
• df4a81cbf2 disable snow Johannes Schmelz 2024-12-10 11:23:49 +01:00
• c635df9369 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-12-10 11:23:10 +01:00
• c6ad605021 basic camera movement Johannes Schmelz 2024-12-10 11:22:21 +01:00
• 1e20a2ac6e Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Luca Puderbach 2024-12-10 10:32:08 +01:00
• 36a9a7addf Karten add Luca Puderbach 2024-12-10 10:29:51 +01:00
• e1190cd4a2 cleanup Johannes Schmelz 2024-12-10 10:23:33 +01:00
• 34ecd2277b cleanup Johannes Schmelz 2024-12-10 10:19:59 +01:00
• 5959f36a21 new background Johannes Schmelz 2024-12-10 10:14:06 +01:00
• 1db2d9ebac Fixed "Spieler" in ...Trade-Popups Simon Wilkening 2024-12-10 08:27:23 +01:00
• 54bac50a7e Merge remote-tracking branch 'origin/gui' into gui Yvonne Schmidt 2024-12-10 07:17:33 +01:00
• 274ed2b25d added new background Yvonne Schmidt 2024-12-10 07:17:18 +01:00
• 371fa83319 remove deck cards Johannes Schmelz 2024-12-10 06:15:13 +01:00
• c1faf91188 Fixed Containers for Buildings Simon Wilkening 2024-12-10 04:36:55 +01:00
• 617d707df8 fixed GateFieldPopUp Johannes Schmelz 2024-12-10 04:07:30 +01:00
• d18cea435c Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-12-10 03:56:01 +01:00
• 1543f0dcea more models Johannes Schmelz 2024-12-10 03:55:57 +01:00
• ae181e4eff more models Johannes Schmelz 2024-12-10 03:55:44 +01:00
• fa96324c15 mode models Johannes Schmelz 2024-12-10 03:55:33 +01:00
• 9f559fe0d7 more models Johannes Schmelz 2024-12-10 03:55:08 +01:00
• cf6ee535b8 remove old textures Johannes Schmelz 2024-12-10 03:54:56 +01:00
• be89bf1a27 haus models Johannes Schmelz 2024-12-10 03:54:29 +01:00
• 6f2027c2fb added toolbar spacer Yvonne Schmidt 2024-12-10 03:45:08 +01:00
• 6e99f17787 adjusted font Yvonne Schmidt 2024-12-10 03:40:04 +01:00
• b7e2e3213a Merge remote-tracking branch 'origin/gui' into gui Yvonne Schmidt 2024-12-10 03:27:59 +01:00
• 3ea6452d6d fixed font Yvonne Schmidt 2024-12-10 03:27:36 +01:00
• fd3c141967 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Luca Puderbach 2024-12-10 03:27:06 +01:00
• b3d2dfed08 Kamera Update T1 Luca Puderbach 2024-12-10 03:26:55 +01:00
• 5306208107 Containers PropertyCards Simon Wilkening 2024-12-10 03:22:26 +01:00
• 2a7cbeed89 fixed bankrupt warning Yvonne Schmidt 2024-12-10 03:08:36 +01:00
• 0a34751825 resized startmenu logos Yvonne Schmidt 2024-12-10 02:40:32 +01:00
• 996bc0118a Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-12-10 02:32:11 +01:00
• bbcb12c131 working tank model Johannes Schmelz 2024-12-10 02:32:07 +01:00
• 1969afc58f Merge remote-tracking branch 'origin/gui' into gui Yvonne Schmidt 2024-12-10 02:24:41 +01:00
• ad0c432102 added greyed button Yvonne Schmidt 2024-12-10 02:24:29 +01:00
• 315739646c free cam Johannes Schmelz 2024-12-10 01:12:56 +01:00
• 330e788498 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Luca Puderbach 2024-12-10 00:52:41 +01:00
• fc5a2809c8 Jägermeister Luca Puderbach 2024-12-10 00:52:30 +01:00
• 0acb63adb6 Mac Blocker Luca Puderbach 2024-12-10 00:48:43 +01:00
• b4c664927b Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-12-09 23:57:49 +01:00
• ed27e0aaf1 popUp Johannes Schmelz 2024-12-09 23:57:45 +01:00
• 98f453d7f8 added javadoc Yvonne Schmidt 2024-12-09 22:38:02 +01:00
• 8de7499c21 added spacer to toolbar Yvonne Schmidt 2024-12-09 22:16:53 +01:00
• b680d7bc58 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-12-09 21:37:58 +01:00
• 30559bf443 set all popups to same layer Yvonne Schmidt 2024-12-09 21:22:07 +01:00
• 8774c4246d added panzer Johannes Schmelz 2024-12-09 21:10:57 +01:00
• 7b82b20736 HoHoHo Luca Puderbach 2024-12-09 20:22:17 +01:00
• 698937e77c Bayblade Mode activated Luca Puderbach 2024-12-09 19:53:47 +01:00
• 7cbf000c44 readjusted popup layering Yvonne Schmidt 2024-12-09 17:57:00 +01:00
• 249110f83c Merge remote-tracking branch 'origin/gui' Johannes Schmelz 2024-12-09 14:13:44 +01:00
• e98e17f6d7 cleanup Johannes Schmelz 2024-12-09 13:55:04 +01:00
• e337303408 fixed offset Johannes Schmelz 2024-12-09 13:37:30 +01:00
• 97619fe662 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-12-09 13:29:03 +01:00
• 246566a211 aussetzen Johannes Schmelz 2024-12-09 13:28:59 +01:00
• 96a78ee61b Animation Hinzugefügt Luca Puderbach 2024-12-09 08:17:07 +01:00
• c9e99ee9ff Merge remote-tracking branch 'origin/gui' into gui Yvonne Schmidt 2024-12-09 05:53:08 +01:00
• 111f2b1283 rescaled dice Yvonne Schmidt 2024-12-09 05:52:52 +01:00
• 93386fa77a Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-12-09 05:32:16 +01:00
• 6cdf0eee53 disable buttons when having to pause one round Johannes Schmelz 2024-12-09 05:32:11 +01:00
• b6803c562c recolored selection containers Yvonne Schmidt 2024-12-09 05:31:22 +01:00
• 38699ac07a added App icon Johannes Schmelz 2024-12-09 05:23:52 +01:00
• f396ef52f2 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Luca Puderbach 2024-12-09 05:15:14 +01:00
• 73bf147817 uniman2 Luca Puderbach 2024-12-09 05:15:10 +01:00
• 80f9054add recolored selection containers Yvonne Schmidt 2024-12-09 04:56:28 +01:00
• b819e1ca9b Figurenbewegung Luca Puderbach 2024-12-09 04:19:00 +01:00
• c4955e0b57 uniman Luca Puderbach 2024-12-09 04:14:34 +01:00
• 008cb1ebe4 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-12-09 03:25:44 +01:00
• 723c934d73 added cards and changed camera Johannes Schmelz 2024-12-09 03:25:39 +01:00
• 4eac2e3312 adjusted sound effects Yvonne Schmidt 2024-12-09 02:58:56 +01:00
• fef881f42c Merge remote-tracking branch 'origin/gui' into gui Yvonne Schmidt 2024-12-09 02:46:03 +01:00
• eeaf29a646 resolved popup overlap Yvonne Schmidt 2024-12-09 02:45:46 +01:00
• 2eae0fce2a Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-12-09 02:31:45 +01:00
• aa9e8ed3f0 add and remove houses and hotel models Johannes Schmelz 2024-12-09 02:31:41 +01:00
• 3e14a2674f resolved popup overlap Yvonne Schmidt 2024-12-09 02:30:45 +01:00
• 815899fa8d Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Luca Puderbach 2024-12-09 01:47:35 +01:00
• 793e93ef24 Map Update Luca Puderbach 2024-12-09 01:47:29 +01:00
• 43d0549e9e Hotel und Hauser Texturen hinzugefuegt. Dennis_Malkmus 2024-12-09 01:07:04 +01:00
• 170afe2718 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-12-08 21:36:08 +01:00
• 17220c228b load predefined game state Johannes Schmelz 2024-12-08 21:36:03 +01:00
• 0f1be83064 added generic buttons Yvonne Schmidt 2024-12-08 21:35:50 +01:00
• e0ab09295d adjusted tests Johannes Schmelz 2024-12-08 21:09:58 +01:00
• 758e9b8397 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-12-08 20:59:12 +01:00
• b3fe289fbe ImageButtons in Toolbar Johannes Schmelz 2024-12-08 20:59:08 +01:00
• 42fefb2899 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Luca Puderbach 2024-12-08 19:23:15 +01:00
• 5da86117c8 Anpassung Farbe Luca Puderbach 2024-12-08 19:23:10 +01:00
• 1376da3ba6 added documentation Yvonne Schmidt 2024-12-08 19:00:08 +01:00
• fb280101a5 Merge remote-tracking branch 'origin/gui' into gui Yvonne Schmidt 2024-12-08 18:40:48 +01:00