Felix Koppe 
							
						 
					 
					
						
						
							
						
						be15b3bd63 
					 
					
						
						
							
							Minor changes  
						
						 
						
						
						
						
					 
					
						2024-11-30 10:51:35 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Koppe 
							
						 
					 
					
						
						
							
						
						3147f5b7a3 
					 
					
						
						
							
							Fix some errors  
						
						 
						
						
						
						
					 
					
						2024-11-29 14:37:46 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Koppe 
							
						 
					 
					
						
						
							
						
						f024ba4866 
					 
					
						
						
							
							Add preferences and sounds  
						
						 
						
						
						
						
					 
					
						2024-11-29 14:01:18 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Koppe 
							
						 
					 
					
						
						
							
						
						457023ad93 
					 
					
						
						
							
							Work  
						
						 
						
						
						
						
					 
					
						2024-11-29 12:30:59 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Koppe 
							
						 
					 
					
						
						
							
						
						c3055a0646 
					 
					
						
						
							
							Work  
						
						 
						
						
						
						
					 
					
						2024-11-29 12:29:20 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Koppe 
							
						 
					 
					
						
						
							
						
						ae1ec74056 
					 
					
						
						
							
							Merge dev/client_beck  
						
						 
						
						
						
						
					 
					
						2024-11-29 10:48:05 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Koppe 
							
						 
					 
					
						
						
							
						
						24cc81d9d4 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/dev/client_beck' into dev/client_koppe2  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java
#	Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java
#	Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java 
						
						
					 
					
						2024-11-29 10:13:15 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Koppe 
							
						 
					 
					
						
						
							
						
						c25c12d0d6 
					 
					
						
						
							
							Work on ceremony2  
						
						 
						
						
						
						
					 
					
						2024-11-29 09:45:36 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Koppe 
							
						 
					 
					
						
						
							
						
						7b689d6bf6 
					 
					
						
						
							
							Work on ceremony  
						
						 
						
						
						
						
					 
					
						2024-11-28 21:39:08 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						2099e02567 
					 
					
						
						
							
							added board dice; edited DiceControl; added high-res font; working on ActionTextHandler  
						
						 
						
						
						
						
					 
					
						2024-11-28 20:07:15 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						3dcdbdf489 
					 
					
						
						
							
							added display of 'colorÃ' to playerName  
						
						 
						
						
						
						
					 
					
						2024-11-28 17:29:59 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Koppe 
							
						 
					 
					
						
						
							
						
						88cb87d4cd 
					 
					
						
						
							
							Merge commit  
						
						 
						
						
						
						
					 
					
						2024-11-28 16:25:57 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Koppe 
							
						 
					 
					
						
						
							
						
						827e7aac86 
					 
					
						
						
							
							Add stuff  
						
						 
						
						
						
						
					 
					
						2024-11-28 16:25:13 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Koppe 
							
						 
					 
					
						
						
							
						
						eec68188ee 
					 
					
						
						
							
							Make use of parallelProjection  
						
						 
						
						
						
						
					 
					
						2024-11-28 16:08:33 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Koppe 
							
						 
					 
					
						
						
							
						
						3235a46788 
					 
					
						
						
							
							Rewrite gui  
						
						 
						
						
						
						
					 
					
						2024-11-28 15:00:53 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						7da388af37 
					 
					
						
						
							
							added improved pieces model; added functionality to notifications + todos  
						
						 
						
						
						
						
					 
					
						2024-11-28 02:08:51 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						304acf17a3 
					 
					
						
						
							
							added full highlight functionality for bonuscards; added bonus Symbols display  
						
						 
						
						
						
						
					 
					
						2024-11-28 01:21:15 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						9736dc828b 
					 
					
						
						
							
							added highlight to bonuscards  
						
						 
						
						
						
						
					 
					
						2024-11-27 19:50:29 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						0b9fc90274 
					 
					
						
						
							
							added dice, started adding notification implementation, added hover, highlight and select functionality for pieces  
						
						 
						
						
						
						
					 
					
						2024-11-27 03:05:35 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						6528e5c2b6 
					 
					
						
						
							
							started adding notifications  
						
						 
						
						
						
						
					 
					
						2024-11-26 20:53:29 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						c204a3a4cb 
					 
					
						
						
							
							change shader folder structure  
						
						 
						
						
						
						
					 
					
						2024-11-26 17:05:38 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						d794ba9d03 
					 
					
						
						
							
							added smooth outline  
						
						 
						
						
						
						
					 
					
						2024-11-26 16:54:40 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						e97147d0e9 
					 
					
						
						
							
							merge from koppe  
						
						 
						
						
						
						
					 
					
						2024-11-26 16:47:24 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						1b151aabdd 
					 
					
						
						
							
							added select nodes, cards & pieces  
						
						 
						
						
						
						
					 
					
						2024-11-26 16:45:13 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix 
							
						 
					 
					
						
						
							
						
						3e7d3dbc1b 
					 
					
						
						
							
							Fix  
						
						 
						
						
						
						
					 
					
						2024-11-26 16:18:33 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						7a482b74ab 
					 
					
						
						
							
							fixed shaders in/out  
						
						 
						
						
						
						
					 
					
						2024-11-26 13:29:40 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						5cc1888794 
					 
					
						
						
							
							merge dev/client_koppe into dev/client_beck for camera movement  
						
						 
						
						
						
						
					 
					
						2024-11-26 13:13:32 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						9dd70a96a0 
					 
					
						
						
							
							added outline for  bonuscards  
						
						 
						
						
						
						
					 
					
						2024-11-26 12:56:26 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						80f5c4ce90 
					 
					
						
						
							
							tried adding shield outline, but there is a bug -> black screen  
						
						 
						
						
						
						
					 
					
						2024-11-26 07:40:41 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix 
							
						 
					 
					
						
						
							
						
						96489f2454 
					 
					
						
						
							
							Minor work  
						
						 
						
						
						
						
					 
					
						2024-11-25 16:32:16 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix 
							
						 
					 
					
						
						
							
						
						439231aecf 
					 
					
						
						
							
							Add rotateable cam  
						
						 
						
						
						
						
					 
					
						2024-11-25 16:15:59 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix 
							
						 
					 
					
						
						
							
						
						8982662f5b 
					 
					
						
						
							
							Remove debug statement  
						
						 
						
						
						
						
					 
					
						2024-11-25 14:01:06 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix 
							
						 
					 
					
						
						
							
						
						d70efb32ea 
					 
					
						
						
							
							Fix audio settings  
						
						 
						
						
						
						
					 
					
						2024-11-25 13:59:55 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						b9986ded87 
					 
					
						
						
							
							try push  
						
						 
						
						
						
						
					 
					
						2024-11-24 22:41:17 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						fd09460d61 
					 
					
						
						
							
							try push  
						
						 
						
						
						
						
					 
					
						2024-11-24 22:40:50 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						e5dca013d1 
					 
					
						
						
							
							try push  
						
						 
						
						
						
						
					 
					
						2024-11-24 22:38:23 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						7bfc6e7c3e 
					 
					
						
						
							
							try push  
						
						 
						
						
						
						
					 
					
						2024-11-24 22:37:37 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						10428deedd 
					 
					
						
						
							
							added resource restructuring  
						
						 
						
						
						
						
					 
					
						2024-11-24 19:54:29 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						a196d3d7f2 
					 
					
						
						
							
							added basic player name display  
						
						 
						
						
						
						
					 
					
						2024-11-24 19:49:54 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						16dc28013e 
					 
					
						
						
							
							merge development into dev/client  
						
						 
						
						
						
						
					 
					
						2024-11-24 10:39:28 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						9ab71bfaf6 
					 
					
						
						
							
							merge dev/client_koppe into dev/client  
						
						 
						
						
						
						
					 
					
						2024-11-24 10:34:48 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						ccad47f95a 
					 
					
						
						
							
							Merge branch 'dev/client' into dev/client_koppe  
						
						 
						
						
						
						
					 
					
						2024-11-24 10:32:00 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						f830aec8ce 
					 
					
						
						
							
							Merge branch 'dev/client_beck' into 'dev/client'  
						
						 
						
						... 
						
						
						
						Added basic display of bonusCards for presentation on Monday
See merge request progproj/gruppen-ht24/Gruppe-01!10 
						
						
					 
					
						2024-11-24 09:31:33 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						c8c0188452 
					 
					
						
						
							
							merge dev/client into dev/client_koppe  
						
						 
						
						
						
						
					 
					
						2024-11-24 10:30:37 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						a5b7488e92 
					 
					
						
						
							
							Merge branch 'dev/client' into dev/client_beck  
						
						 
						
						
						
						
					 
					
						2024-11-24 09:23:57 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						11794b6ac7 
					 
					
						
						
							
							added GuiHandler and showing bonuscards  
						
						 
						
						
						
						
					 
					
						2024-11-24 09:21:44 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						a8d80fd3f4 
					 
					
						
						
							
							Merge branch 'dev/client_beck' into 'dev/client'  
						
						 
						
						... 
						
						
						
						Added all basic functionalitites to BoardHandler
See merge request progproj/gruppen-ht24/Gruppe-01!9 
						
						
					 
					
						2024-11-23 21:12:14 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fleischer Hanno 
							
						 
					 
					
						
						
							
						
						806f0d7d9d 
					 
					
						
						
							
							added message contents to the messages  
						
						 
						
						... 
						
						
						
						addedn the conentents for all messages regarding the BPMN diagramm and own interpretation.
also created an identifier for pieces to be used for network communication between server and client so that they talk about the same piece. 
						
						
					 
					
						2024-11-23 12:26:20 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						7368014b10 
					 
					
						
						
							
							merge dev/client into dev/client_beck  
						
						 
						
						
						
						
					 
					
						2024-11-22 20:38:00 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						ebdedc6494 
					 
					
						
						
							
							added  working piece outline; added final tweaks for boardHandler  
						
						 
						
						
						
						
					 
					
						2024-11-22 19:53:32 +01:00