peet/Gruppe-02-clone
1
0
Fork 0
mirror of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git synced 2025-01-19 00:06:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
626 Commits 18 Branches 0 Tags 569 MiB
10e30d9bd9
Commit Graph

626 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Johannes Schmelz
8774c4246d added panzer 2024-12-09 21:10:57 +01:00
Luca Puderbach
7b82b20736 HoHoHo 2024-12-09 20:22:17 +01:00
Luca Puderbach
698937e77c Bayblade Mode activated 2024-12-09 19:53:47 +01:00
Yvonne Schmidt
7cbf000c44 readjusted popup layering 2024-12-09 17:57:00 +01:00
Johannes Schmelz
249110f83c Merge remote-tracking branch 'origin/gui' 2024-12-09 14:13:44 +01:00
Johannes Schmelz
e98e17f6d7 cleanup 2024-12-09 13:55:04 +01:00
Johannes Schmelz
e337303408 fixed offset 2024-12-09 13:37:30 +01:00
Johannes Schmelz
97619fe662 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-09 13:29:03 +01:00
Johannes Schmelz
246566a211 aussetzen 2024-12-09 13:28:59 +01:00
Luca Puderbach
96a78ee61b Animation Hinzugefügt 2024-12-09 08:17:07 +01:00
Yvonne Schmidt
c9e99ee9ff Merge remote-tracking branch 'origin/gui' into gui 2024-12-09 05:53:08 +01:00
Yvonne Schmidt
111f2b1283 rescaled dice 2024-12-09 05:52:52 +01:00
Johannes Schmelz
93386fa77a Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-09 05:32:16 +01:00
Johannes Schmelz
6cdf0eee53 disable buttons when having to pause one round 2024-12-09 05:32:11 +01:00
Yvonne Schmidt
b6803c562c recolored selection containers 2024-12-09 05:31:22 +01:00
Johannes Schmelz
38699ac07a added App icon 2024-12-09 05:23:52 +01:00
Luca Puderbach
f396ef52f2 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-09 05:15:14 +01:00
Luca Puderbach
73bf147817 uniman2 2024-12-09 05:15:10 +01:00
Yvonne Schmidt
80f9054add recolored selection containers 2024-12-09 04:56:28 +01:00
Luca Puderbach
b819e1ca9b Figurenbewegung 2024-12-09 04:19:00 +01:00
Luca Puderbach
c4955e0b57 uniman 2024-12-09 04:14:34 +01:00
Johannes Schmelz
008cb1ebe4 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-09 03:25:44 +01:00
Johannes Schmelz
723c934d73 added cards and changed camera 2024-12-09 03:25:39 +01:00
Yvonne Schmidt
4eac2e3312 adjusted sound effects 2024-12-09 02:58:56 +01:00
Yvonne Schmidt
fef881f42c Merge remote-tracking branch 'origin/gui' into gui 2024-12-09 02:46:03 +01:00
Yvonne Schmidt
eeaf29a646 resolved popup overlap 2024-12-09 02:45:46 +01:00
Johannes Schmelz
2eae0fce2a Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-09 02:31:45 +01:00
Johannes Schmelz
aa9e8ed3f0 add and remove houses and hotel models 2024-12-09 02:31:41 +01:00
Yvonne Schmidt
3e14a2674f resolved popup overlap 2024-12-09 02:30:45 +01:00
Luca Puderbach
815899fa8d Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-09 01:47:35 +01:00
Luca Puderbach
793e93ef24 Map Update 2024-12-09 01:47:29 +01:00
Dennis_Malkmus
43d0549e9e Hotel und Hauser Texturen hinzugefuegt. 2024-12-09 01:07:04 +01:00
Johannes Schmelz
170afe2718 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-08 21:36:08 +01:00
Johannes Schmelz
17220c228b load predefined game state 2024-12-08 21:36:03 +01:00
Yvonne Schmidt
0f1be83064 added generic buttons 2024-12-08 21:35:50 +01:00
Johannes Schmelz
e0ab09295d adjusted tests 2024-12-08 21:09:58 +01:00
Johannes Schmelz
758e9b8397 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-08 20:59:12 +01:00
Johannes Schmelz
b3fe289fbe ImageButtons in Toolbar 2024-12-08 20:59:08 +01:00
Luca Puderbach
42fefb2899 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-08 19:23:15 +01:00
Luca Puderbach
5da86117c8 Anpassung Farbe 2024-12-08 19:23:10 +01:00
Yvonne Schmidt
1376da3ba6 added documentation 2024-12-08 19:00:08 +01:00
Yvonne Schmidt
fb280101a5 Merge remote-tracking branch 'origin/gui' into gui 2024-12-08 18:40:48 +01:00
Yvonne Schmidt
844495ebbb modified toolbar 2024-12-08 18:40:28 +01:00
Johannes Schmelz
e14f6bbef7 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-08 18:38:15 +01:00
Johannes Schmelz
4839ddd497 clean up and doc 2024-12-08 18:38:06 +01:00
Yvonne Schmidt
b901323e2f added color changes for buttons 2024-12-08 18:30:18 +01:00
Yvonne Schmidt
640665fd29 fixed layering issue 2024-12-08 18:29:14 +01:00
Johannes Schmelz
ba8791d9fe update Toolbar view 2024-12-08 18:08:16 +01:00
Johannes Schmelz
f8fe0b9877 fixed property trade 2024-12-08 17:34:19 +01:00
Johannes Schmelz
48913356e3 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-08 16:05:39 +01:00