231 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Johannes Schmelz	4ecccc5951	Merge branch 'gui' into 'connect' ... # Conflicts: # Projekte/monopoly/client/src/main/java/pp/monopoly/client/MonopolyApp.java # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/LobbyMenu.java # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/BuildingPropertyCard.java # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/BuyCard.java # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/FoodFieldCard.java # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/GateFieldCard.java # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/WinnerPopUp.java # Projekte/monopoly/model/src/main/java/pp/monopoly/game/client/ClientGameLogic.java	2024-11-25 02:45:02 +00:00
Johannes Schmelz	f90ce5aa81	all button sounds now	2024-11-25 03:35:32 +01:00
Yvonne Schmidt	4a9eba255b	restyled selector	2024-11-25 03:24:00 +01:00
Johannes Schmelz	4713a526b3	Merge branch 'connect' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into connect	2024-11-25 03:08:01 +01:00
Johannes Schmelz	362c0e5679	added serialisables	2024-11-25 03:07:57 +01:00
Yvonne Schmidt	fab2457715	added header to CreateGameMenu	2024-11-25 02:51:43 +01:00
Yvonne Schmidt	7b3f31f099	Merge remote-tracking branch 'origin/connect' into connect ... # Conflicts: # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/CreateGameMenu.java	2024-11-25 02:48:26 +01:00
Johannes Schmelz	ed105f1b70	cleanup	2024-11-25 02:43:58 +01:00
Yvonne Schmidt	cd4331aee3	added header to CreateGameMenu	2024-11-25 02:43:08 +01:00
Yvonne Schmidt	acc797f2ff	Merge remote-tracking branch 'origin/connect' into connect	2024-11-25 02:12:01 +01:00
Yvonne Schmidt	853c32a5b8	fixed Buttons	2024-11-25 02:11:05 +01:00
Johannes Schmelz	72bef7143a	serialize messages	2024-11-25 02:05:56 +01:00
Yvonne Schmidt	b1ed571950	added background to CreateGameMenu	2024-11-25 02:01:38 +01:00
Johannes Schmelz	1a75d6d6a8	buttons now work as intended	2024-11-25 01:51:27 +01:00
Yvonne Schmidt	c990e7b562	added button sounds	2024-11-25 01:50:52 +01:00
Johannes Schmelz	c87406f60e	fixed esc menu	2024-11-25 00:52:10 +01:00
Johannes Schmelz	21914a1294	fixed startmenu	2024-11-25 00:33:05 +01:00
Johannes Schmelz	a344145732	fixed sounds	2024-11-25 00:28:42 +01:00
Yvonne Schmidt	a27ac31086	Merge remote-tracking branch 'origin/connect' into connect	2024-11-25 00:24:43 +01:00
Yvonne Schmidt	9a7f75b76b	added effect sound slider	2024-11-25 00:24:25 +01:00
Simon Wilkening	687d1621fc	EventCard erweitert	2024-11-25 00:06:12 +01:00
Johannes Schmelz	a6944aa6e3	added dice images	2024-11-24 23:38:22 +01:00
Johannes Schmelz	3e487c00d5	accidentally deleted volumeSlider	2024-11-24 23:29:59 +01:00
Johannes Schmelz	4820b8cf46	added looser popup	2024-11-24 23:28:04 +01:00
Johannes Schmelz	caa4cb5262	winner popup	2024-11-24 23:23:56 +01:00
Johannes Schmelz	b8365c76a1	fix mac executable	2024-11-24 22:58:47 +01:00
Johannes Schmelz	19216cc174	refactor	2024-11-24 22:57:19 +01:00
Johannes Schmelz	c6a23b9b8e	execute for apple	2024-11-24 22:56:52 +01:00
Johannes Schmelz	c0f42fb1eb	refactor	2024-11-24 22:50:52 +01:00
Tamino Mueller	160873e2cc	added pictures and popups fixed	2024-11-24 22:42:32 +01:00
Johannes Schmelz	1b2a7d73b5	extend dialog	2024-11-24 22:41:53 +01:00
Tamino Mueller	8df859bbef	Merge remote-tracking branch 'origin/gui' into gui	2024-11-24 22:34:54 +01:00
Tamino Mueller	e30d10a85d	Pop-Up hinzugefügt	2024-11-24 22:34:19 +01:00
Johannes Schmelz	55778dbcea	removed the buttons on start	2024-11-24 22:29:19 +01:00
Johannes Schmelz	422faec281	send player ready	2024-11-24 22:06:19 +01:00
Johannes Schmelz	dcf10e0819	automatically join lobby when selfhosting	2024-11-24 21:36:03 +01:00
Johannes Schmelz	6b78733a5d	fixed server join	2024-11-24 21:30:18 +01:00
Johannes Schmelz	c124a99901	fixed screen size	2024-11-24 21:29:41 +01:00
Johannes Schmelz	d7df4002da	lobby menu	2024-11-24 21:01:57 +01:00
Johannes Schmelz	8b0ef97a82	connect menu cow working	2024-11-24 20:52:29 +01:00
Johannes Schmelz	75d3bef5c8	move start menu	2024-11-24 20:42:07 +01:00
Yvonne Schmidt	bafc3f1db6	Merge remote-tracking branch 'origin/gui' into gui	2024-11-24 19:25:12 +01:00
Yvonne Schmidt	03571fcf74	code cleanup in der lobby	2024-11-24 19:24:51 +01:00
Johannes Schmelz	e7a6802488	fixed buyProperty	2024-11-24 19:14:56 +01:00
Johannes Schmelz	c2d5611ab9	changed settings menu to match	2024-11-24 19:10:59 +01:00
Yvonne Schmidt	a6e6b5e158	lobby übergibt figur	2024-11-24 19:05:28 +01:00
Simon Wilkening	74c3d925e6	TODOs und Kommentare ergänst	2024-11-24 19:04:58 +01:00
Johannes Schmelz	fb28f3fefc	tmp settings menu fix	2024-11-24 19:02:56 +01:00
Yvonne Schmidt	f67fa4d7f0	lobby übergibt namen	2024-11-24 18:39:32 +01:00
Johannes Schmelz	6a34dab00c	changed app to match battleship	2024-11-24 18:27:41 +01:00