Simon Wilkening
							
						 
					 | 
					
						
						
							
						
						6eeb6fd209
					 | 
					
						
						
							
							Properties_de übersetzt
						
						
						
						
						
						
					 | 
					
						2024-11-26 15:29:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Simon Wilkening
							
						 
					 | 
					
						
						
							
						
						efba3c496a
					 | 
					
						
						
							
							Deckhelper korrigiert, Properties angepasst
						
						
						
						
						
						
					 | 
					
						2024-11-26 15:15:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						27a0ab52e6
					 | 
					
						
						
							
							dice button now works and update dice images accordingly
						
						
						
						
						
						
					 | 
					
						2024-11-26 14:59:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						3956d8efa7
					 | 
					
						
						
							
							show all playe stats in toolbar
						
						
						
						
						
						
					 | 
					
						2024-11-26 00:11:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						0e405d2f90
					 | 
					
						
						
							
							send PlayerHandler in GameStart
						
						
						
						
						
						
					 | 
					
						2024-11-25 22:11:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						9120e4d53c
					 | 
					
						
						
							
							show test world when GameStart message is recieved
						
						
						
						
						
						
					 | 
					
						2024-11-25 17:50:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						1a62b76104
					 | 
					
						
						
							
							corrected map size
						
						
						
						
						
						
					 | 
					
						2024-11-25 16:28:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						d10111d2ab
					 | 
					
						
						
							
							Gui v1.0
						
						
						
						
						
						
					 | 
					
						2024-11-25 05:33:36 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						1be29b8b7a
					 | 
					
						
						
							
							newest version of tests
						
						
						
						
						
						
					 | 
					
						2024-11-25 04:34:06 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						b135f3fa50
					 | 
					
						
						
							
							idk
						
						
						
						
						
						
					 | 
					
						2024-11-18 05:51:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						0e580a3180
					 | 
					
						
						
							
							Figure Syncronizer now added
						
						
						
						
						
						
					 | 
					
						2024-11-18 05:38:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						a7ea5773da
					 | 
					
						
						
							
							resolve merge conflict
						
						
						
						
						
						
					 | 
					
						2024-11-18 05:05:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						cac06dda7d
					 | 
					
						
						
							
							Refactor
						
						
						
						
						
						
					 | 
					
						2024-11-18 04:01:41 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						12c1c97a99
					 | 
					
						
						
							
							Merge branch 'logic' into 'gui'
						
						
						
						
						
						
						
						# Conflicts:
#   Projekte/monopoly/model/src/main/java/pp/monopoly/game/client/ClientGameLogic.java
#   Projekte/monopoly/model/src/main/java/pp/monopoly/notification/Sound.java 
						
						
					 | 
					
						2024-11-18 03:50:41 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Luca Puderbach
							
						 
					 | 
					
						
						
							
						
						af4b4243ea
					 | 
					
						
						
							
							Resolve merge conflicts
						
						
						
						
						
						
					 | 
					
						2024-11-18 04:42:30 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						b37a5095f0
					 | 
					
						
						
							
							client recieve message logic
						
						
						
						
						
						
					 | 
					
						2024-11-18 03:20:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						951b4c198c
					 | 
					
						
						
							
							Server bug fix. Add player did not correspond with the params
						
						
						
						
						
						
					 | 
					
						2024-11-18 00:24:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						9d0fcc3370
					 | 
					
						
						
							
							Erste Tests
						
						
						
						
						
						
					 | 
					
						2024-11-17 18:28:55 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						2f6d6037de
					 | 
					
						
						
							
							Merge branch 'logic' into 'main'
						
						
						
						
						
						
						
						Serverseitige Logik
See merge request progproj/gruppen-ht24/Gruppe-02!6 
						
						
					 | 
					
						2024-11-17 18:25:32 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						1d69bcc814
					 | 
					
						
						
							
							refactor and bug fixes
						
						
						
						
						
						
					 | 
					
						2024-11-17 17:43:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						62c363068b
					 | 
					
						
						
							
							fixed bug with client server messages
						
						
						
						
						
						
					 | 
					
						2024-11-16 18:57:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						d2e0b8187b
					 | 
					
						
						
							
							implemented PlayerStates
						
						
						
						
						
						
					 | 
					
						2024-11-16 18:42:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						628b98af9b
					 | 
					
						
						
							
							recive logic for messages
						
						
						
						
						
						
					 | 
					
						2024-11-16 18:03:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						627e3dbd7f
					 | 
					
						
						
							
							added fine to FineField
						
						
						
						
						
						
					 | 
					
						2024-11-16 17:53:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						10b978debf
					 | 
					
						
						
							
							fixed addPlayer
						
						
						
						
						
						
					 | 
					
						2024-11-15 04:27:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						3bdfd6a78a
					 | 
					
						
						
							
							TradeHandler logic
						
						
						
						
						
						
					 | 
					
						2024-11-15 03:19:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						e59ab4a320
					 | 
					
						
						
							
							cleintmessages logic
						
						
						
						
						
						
					 | 
					
						2024-11-15 03:06:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Luca Puderbach
							
						 
					 | 
					
						
						
							
						
						12ef219064
					 | 
					
						
						
							
							Änderungs des StartBildschirms
						
						
						
						
						
						
					 | 
					
						2024-11-15 01:25:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Luca Puderbach
							
						 
					 | 
					
						
						
							
						
						853b52b52d
					 | 
					
						
						
							
							Implementierung eines grundlegenden Startmenüs
						
						
						
						
						
						
					 | 
					
						2024-11-15 00:39:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						7a2ad1d31a
					 | 
					
						
						
							
							corrected server states
						
						
						
						
						
						
					 | 
					
						2024-11-14 23:50:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						c5ad476eaf
					 | 
					
						
						
							
							added rent payment logic
						
						
						
						
						
						
						
						added player on field logic 
						
						
					 | 
					
						2024-11-14 23:50:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Filip Szepielewicz
							
						 
					 | 
					
						
						
							
						
						12978ff410
					 | 
					
						
						
							
							T001 - T034 erster versuch
						
						
						
						
						
						
					 | 
					
						2024-11-14 21:54:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yvonne Schmidt
							
						 
					 | 
					
						
						
							
						
						caa45097c3
					 | 
					
						
						
							
							klassen angepasst
						
						
						
						
						
						
					 | 
					
						2024-11-14 21:31:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						232e3a117c
					 | 
					
						
						
							
							corrected rent prices
						
						
						
						
						
						
					 | 
					
						2024-11-14 01:08:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						3668382911
					 | 
					
						
						
							
							FineField in Player
						
						
						
						
						
						
					 | 
					
						2024-11-13 23:50:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						fafa53ffb7
					 | 
					
						
						
							
							rent calculation
						
						
						
						
						
						
					 | 
					
						2024-11-13 23:49:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						44673fd57e
					 | 
					
						
						
							
							createBoard method
						
						
						
						
						
						
					 | 
					
						2024-11-13 23:30:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						f7149f225c
					 | 
					
						
						
							
							Interpreter fuer messages hinzugefuegt
						
						
						
						
						
						
					 | 
					
						2024-11-13 18:54:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						6773e18d34
					 | 
					
						
						
							
							Message Klassen hinzugefuegt
						
						
						
						
						
						
					 | 
					
						2024-11-13 14:11:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						7ee2273761
					 | 
					
						
						
							
							First compileable version of Client
						
						
						
						
						
						
					 | 
					
						2024-11-13 12:42:37 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						86b8297c9d
					 | 
					
						
						
							
							fixed bugs, game now compiles
						
						
						
						
						
						
					 | 
					
						2024-11-13 13:31:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yvonne Schmidt
							
						 
					 | 
					
						
						
							
						
						17533112a1
					 | 
					
						
						
							
							Startmenü implementiert und Spielmenü Stummel erstellt
						
						
						
						
						
						
					 | 
					
						2024-11-12 23:30:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						2cc1a338ec
					 | 
					
						
						
							
							added Figure to Player for visual representation
						
						
						
						
						
						
					 | 
					
						2024-11-12 22:36:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						81731247c7
					 | 
					
						
						
							
							added Fields
						
						
						
						
						
						
					 | 
					
						2024-11-12 22:35:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						65c85aacf0
					 | 
					
						
						
							
							started UC-gameplay-15
						
						
						
						
						
						
					 | 
					
						2024-11-12 22:34:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						dca23151a8
					 | 
					
						
						
							
							added Visitors
						
						
						
						
						
						
					 | 
					
						2024-11-12 22:33:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						25305760c5
					 | 
					
						
						
							
							added Player
						
						
						
						
						
						
					 | 
					
						2024-11-12 22:32:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Schmelz
							
						 
					 | 
					
						
						
							
						
						3784348f91
					 | 
					
						
						
							
							init for monopoly
						
						
						
						
						
						
					 | 
					
						2024-11-12 14:53:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |