626 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Johannes Schmelz	10e30d9bd9	Merge branch 'main' into 'gui' ... # Conflicts: # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/EventCardPopup.java	2024-12-12 16:50:21 +00:00
Johannes Schmelz	5de76f3226	demo	2024-12-12 17:48:24 +01:00
Johannes Schmelz	e2db058fc7	java doc	2024-12-12 17:38:46 +01:00
Johannes Schmelz	7c79bb77e7	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-12 16:13:55 +01:00
Johannes Schmelz	444cf9db4e	fixed names in Player Popups	2024-12-12 16:13:50 +01:00
Simon Wilkening	9e199d677e	Bahnhöfe --> Tore	2024-12-10 13:46:35 +01:00
Johannes Schmelz	df4a81cbf2	disable snow	2024-12-10 11:23:49 +01:00
Johannes Schmelz	c635df9369	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-10 11:23:10 +01:00
Johannes Schmelz	c6ad605021	basic camera movement	2024-12-10 11:22:21 +01:00
Luca Puderbach	1e20a2ac6e	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-10 10:32:08 +01:00
Luca Puderbach	36a9a7addf	Karten add	2024-12-10 10:29:51 +01:00
Johannes Schmelz	e1190cd4a2	cleanup	2024-12-10 10:23:33 +01:00
Johannes Schmelz	34ecd2277b	cleanup	2024-12-10 10:19:59 +01:00
Johannes Schmelz	5959f36a21	new background	2024-12-10 10:14:06 +01:00
Simon Wilkening	1db2d9ebac	Fixed "Spieler" in ...Trade-Popups	2024-12-10 08:27:23 +01:00
Yvonne Schmidt	54bac50a7e	Merge remote-tracking branch 'origin/gui' into gui	2024-12-10 07:17:33 +01:00
Yvonne Schmidt	274ed2b25d	added new background	2024-12-10 07:17:18 +01:00
Johannes Schmelz	371fa83319	remove deck cards	2024-12-10 06:15:13 +01:00
Simon Wilkening	c1faf91188	Fixed Containers for Buildings	2024-12-10 04:36:55 +01:00
Johannes Schmelz	617d707df8	fixed GateFieldPopUp	2024-12-10 04:07:30 +01:00
Johannes Schmelz	d18cea435c	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-10 03:56:01 +01:00
Johannes Schmelz	1543f0dcea	more models	2024-12-10 03:55:57 +01:00
Johannes Schmelz	ae181e4eff	more models	2024-12-10 03:55:44 +01:00
Johannes Schmelz	fa96324c15	mode models	2024-12-10 03:55:33 +01:00
Johannes Schmelz	9f559fe0d7	more models	2024-12-10 03:55:08 +01:00
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
Yvonne Schmidt	6f2027c2fb	added toolbar spacer	2024-12-10 03:45:08 +01:00
Yvonne Schmidt	6e99f17787	adjusted font	2024-12-10 03:40:04 +01:00
Yvonne Schmidt	b7e2e3213a	Merge remote-tracking branch 'origin/gui' into gui	2024-12-10 03:27:59 +01:00
Yvonne Schmidt	3ea6452d6d	fixed font	2024-12-10 03:27:36 +01:00
Luca Puderbach	fd3c141967	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-10 03:27:06 +01:00
Luca Puderbach	b3d2dfed08	Kamera Update T1	2024-12-10 03:26:55 +01:00
Simon Wilkening	5306208107	Containers PropertyCards	2024-12-10 03:22:26 +01:00
Yvonne Schmidt	2a7cbeed89	fixed bankrupt warning	2024-12-10 03:08:36 +01:00
Yvonne Schmidt	0a34751825	resized startmenu logos	2024-12-10 02:40:32 +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