55 Commits

Author	SHA1	Message	Date
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	5959f36a21	new background	2024-12-10 10:14:06 +01:00
Yvonne Schmidt	274ed2b25d	added new background	2024-12-10 07:17:18 +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
Johannes Schmelz	bbcb12c131	working tank model	2024-12-10 02:32:07 +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
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
Yvonne Schmidt	111f2b1283	rescaled dice	2024-12-09 05:52:52 +01:00
Johannes Schmelz	38699ac07a	added App icon	2024-12-09 05:23:52 +01:00
Luca Puderbach	73bf147817	uniman2	2024-12-09 05:15:10 +01:00
Luca Puderbach	c4955e0b57	uniman	2024-12-09 04:14:34 +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
Yvonne Schmidt	0f1be83064	added generic buttons	2024-12-08 21:35:50 +01:00
Yvonne Schmidt	844495ebbb	modified toolbar	2024-12-08 18:40:28 +01:00
Luca Puderbach	93ef00870b	update toolbar + background	2024-12-08 04:57:04 +01:00
Johannes Schmelz	69fccefed9	file path updated	2024-12-08 02:23:21 +01:00
Johannes Schmelz	14aecdd929	changed images	2024-12-08 02:21:54 +01:00
Luca Puderbach	14c68f55d9	ltl backgrounds	2024-12-08 01:16:26 +01:00
Johannes Schmelz	e65c2661f7	Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui	2024-12-05 02:48:00 +01:00
Johannes Schmelz	88db193b5e	choose your charakter	2024-12-05 02:47:55 +01:00
Yvonne Schmidt	38824895bb	set new toolbar background	2024-12-05 02:05:47 +01:00
Yvonne Schmidt	646d301554	added toolbar icons	2024-12-05 01:16:06 +01:00
Johannes Schmelz	471f703634	updated models	2024-12-02 04:16:49 +01:00
Luca Puderbach	782b1a10c3	Kleine model Changes	2024-11-29 06:19:58 +01:00
Johannes Schmelz	908ba09e2a	more models	2024-11-29 05:58:28 +01:00
Johannes Schmelz	4a84ef4b3c	more models	2024-11-29 05:58:15 +01:00
Johannes Schmelz	f3353327dd	added first models	2024-11-29 05:56:39 +01:00
Luca Puderbach	91826b730f	Lade Figuren auf Spielbrett	2024-11-29 04:35:16 +01:00
Luca Puderbach	bc6e7174ec	Test Modelle Umbenannt	2024-11-28 02:31:43 +01:00
Luca Puderbach	f2678ea33d	doppelwürfel	2024-11-27 17:34:41 +01:00
Johannes Schmelz	d10111d2ab	Gui v1.0	2024-11-25 05:33:36 +00:00
Johannes Schmelz	dbd9dd0001	refactor models	2024-11-18 16:43:54 +01:00
Dennis_Malkmus	4ac897693c	Merge remote-tracking branch 'origin/gui' into gui	2024-11-18 14:56:48 +01:00
Dennis_Malkmus	dfb962e9fe	Einfügen Übergangsmodell (6 gefärbte Spielsteine)	2024-11-18 14:53:51 +01:00
Yvonne Schmidt	acfeebca14	Startmenü fertig	2024-11-18 07:52:47 +01:00
Johannes Schmelz	fffd32e13c	Merge branch 'main' into 'gui' ... # Conflicts: # Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy # Projekte/monopoly/client/src/main/java/pp/monopoly/client/GameSound.java # Projekte/monopoly/client/src/main/java/pp/monopoly/client/MonopolyApp.java # Projekte/monopoly/client/src/main/java/pp/monopoly/client/StartMenu.java # Projekte/monopoly/model/src/main/java/pp/monopoly/game/client/ClientGameLogic.java # Projekte/monopoly/model/src/main/java/pp/monopoly/game/server/ServerGameLogic.java # Projekte/monopoly/model/src/main/resources/monopoly.properties	2024-11-18 03:14:07 +00:00
Yvonne Schmidt	1af8614b35	Tooolbar in Testworld implementiert	2024-11-17 22:33:12 +01:00
Yvonne Schmidt	8ab37e73c1	Anpassung des Button designs	2024-11-15 18:39:21 +01:00
Luca Puderbach	c31f924d77	CreateGame fertig für feinschliff (Icon test)	2024-11-15 06:25:21 +01:00
Luca Puderbach	15b3902bd3	SettingsMenü Anpassungen	2024-11-15 02:31:12 +01:00