452 Commits

Author	SHA1	Message	Date
Johannes Schmelz	cf6ee535b8	remove old textures	2024-12-10 03:54:56 +01:00
Johannes Schmelz	be89bf1a27	haus models	2024-12-10 03:54:29 +01:00
Johannes Schmelz	996bc0118a	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-10 02:32:11 +01:00
Johannes Schmelz	bbcb12c131	working tank model	2024-12-10 02:32:07 +01:00
Yvonne Schmidt	1969afc58f	Merge remote-tracking branch 'origin/gui' into gui	2024-12-10 02:24:41 +01:00
Yvonne Schmidt	ad0c432102	added greyed button	2024-12-10 02:24:29 +01:00
Johannes Schmelz	315739646c	free cam	2024-12-10 01:12:56 +01:00
Luca Puderbach	330e788498	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-10 00:52:41 +01:00
Luca Puderbach	fc5a2809c8	Jägermeister	2024-12-10 00:52:30 +01:00
Luca Puderbach	0acb63adb6	Mac Blocker	2024-12-10 00:48:43 +01:00
Johannes Schmelz	b4c664927b	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-09 23:57:49 +01:00
Johannes Schmelz	ed27e0aaf1	popUp	2024-12-09 23:57:45 +01:00
Yvonne Schmidt	98f453d7f8	added javadoc	2024-12-09 22:38:02 +01:00
Yvonne Schmidt	8de7499c21	added spacer to toolbar	2024-12-09 22:16:53 +01:00
Johannes Schmelz	b680d7bc58	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-09 21:37:58 +01:00
Yvonne Schmidt	30559bf443	set all popups to same layer	2024-12-09 21:22:07 +01:00
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	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