Cedric Beck 
							
						 
					 
					
						
						
							
						
						1cca5a9c6b 
					 
					
						
						
							
							added MapLoader and map for map view  
						
						 
						
						
						
						
					 
					
						2024-11-14 21:21:01 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hanno Fleischer 
							
						 
					 
					
						
						
							
						
						ee59807395 
					 
					
						
						
							
							Replaced in the notifications Card with BonusCard  
						
						 
						
						
						
						
					 
					
						2024-11-14 19:58:26 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hanno Fleischer 
							
						 
					 
					
						
						
							
						
						37511d6334 
					 
					
						
						
							
							Merge branch 'dev/client_koppe' into 'development'  
						
						 
						
						... 
						
						
						
						Dev/client_koppe
See merge request progproj/gruppen-ht24/Gruppe-01!1 
						
						
					 
					
						2024-11-14 18:45:24 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix 
							
						 
					 
					
						
						
							
						
						c83baac763 
					 
					
						
						
							
							Fix error  
						
						 
						
						
						
						
					 
					
						2024-11-14 19:36:53 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix 
							
						 
					 
					
						
						
							
						
						6c7b58b415 
					 
					
						
						
							
							Add notification constructors  
						
						 
						
						
						
						
					 
					
						2024-11-14 19:33:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Benjamin Feyer 
							
						 
					 
					
						
						
							
						
						33dbbdbe5c 
					 
					
						
						
							
							initial test commit,  
						
						 
						
						... 
						
						
						
						added all testclasses except Playertest, Viewtest, Cameratest, SettingsTest, SoundTest, ReactionTest and ClientStateTest. And filled all created testclasses with empty testmethods, except ServerStateTest. 
						
						
					 
					
						2024-11-14 18:07:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Koppe 
							
						 
					 
					
						
						
							
						
						5693817f9b 
					 
					
						
						
							
							Add notifications  
						
						 
						
						
						
						
					 
					
						2024-11-14 17:56:43 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Koppe 
							
						 
					 
					
						
						
							
						
						94ee786dc8 
					 
					
						
						
							
							Minor work  
						
						 
						
						
						
						
					 
					
						2024-11-14 17:13:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Koppe 
							
						 
					 
					
						
						
							
						
						92941f903c 
					 
					
						
						
							
							Merge commit  
						
						 
						
						
						
						
					 
					
						2024-11-14 16:51:22 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						499da6a7ad 
					 
					
						
						
							
							added new jmonkey version  
						
						 
						
						
						
						
					 
					
						2024-11-14 16:25:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hanno Fleischer 
							
						 
					 
					
						
						
							
						
						9bafd749b6 
					 
					
						
						
							
							removed card and fixed codes style  
						
						 
						
						... 
						
						
						
						removed card because it was unnecessary and reworked all classes containing it to implement the change 
						
						
					 
					
						2024-11-14 15:49:22 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						b71449b7b4 
					 
					
						
						
							
							Merge branch 'view_assets' of  https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01  into view_assets  
						
						 
						
						
						
						
					 
					
						2024-11-14 15:44:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						dfcfe3351e 
					 
					
						
						
							
							asset  
						
						 
						
						
						
						
					 
					
						2024-11-14 15:37:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hanno Fleischer 
							
						 
					 
					
						
						
							
						
						c7b65d949a 
					 
					
						
						
							
							added java docs to model/game and wrote the remaining getter and setter  
						
						 
						
						
						
						
					 
					
						2024-11-14 15:32:27 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix 
							
						 
					 
					
						
						
							
						
						921933722a 
					 
					
						
						
							
							Minor work  
						
						 
						
						
						
						
					 
					
						2024-11-14 15:23:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix 
							
						 
					 
					
						
						
							
						
						7fa45f39c6 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/dev_client' into dev_client  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/Animation.java
#	Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/AnimationHandler.java 
						
						
					 
					
						2024-11-14 15:04:41 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix 
							
						 
					 
					
						
						
							
						
						6849a0a023 
					 
					
						
						
							
							Minor work on animation  
						
						 
						
						
						
						
					 
					
						2024-11-14 14:58:54 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Grigencha 
							
						 
					 
					
						
						
							
						
						e96cd40302 
					 
					
						
						
							
							improved code style  
						
						 
						
						
						
						
					 
					
						2024-11-14 14:51:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix 
							
						 
					 
					
						
						
							
						
						d9a827697d 
					 
					
						
						
							
							First steps  
						
						 
						
						
						
						
					 
					
						2024-11-13 19:52:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix 
							
						 
					 
					
						
						
							
						
						0f39ea0dcc 
					 
					
						
						
							
							Add files  
						
						 
						
						
						
						
					 
					
						2024-11-13 17:57:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix 
							
						 
					 
					
						
						
							
						
						6e844287dd 
					 
					
						
						
							
							Delete garbarge  
						
						 
						
						
						
						
					 
					
						2024-11-13 17:23:07 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix 
							
						 
					 
					
						
						
							
						
						3465cdaa19 
					 
					
						
						
							
							Merge branch 'view_assets' into dev_client  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	Projekte/mdga/client/build.gradle 
						
						
					 
					
						2024-11-13 17:21:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix 
							
						 
					 
					
						
						
							
						
						60adc39c8b 
					 
					
						
						
							
							Add run config  
						
						 
						
						
						
						
					 
					
						2024-11-13 17:12:02 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix 
							
						 
					 
					
						
						
							
						
						8502b97a95 
					 
					
						
						
							
							Merge main  
						
						 
						
						
						
						
					 
					
						2024-11-13 17:10:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix 
							
						 
					 
					
						
						
							
						
						0e90041209 
					 
					
						
						
							
							Add .gitattributes and move .gitignore  
						
						 
						
						
						
						
					 
					
						2024-11-13 17:09:05 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						8d02a144eb 
					 
					
						
						
							
							added screenshot and resources  
						
						 
						
						
						
						
					 
					
						2024-11-13 14:55:05 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Koppe 
							
						 
					 
					
						
						
							
						
						d1a343aaa9 
					 
					
						
						
							
							Add MdgaApp.java and run config  
						
						 
						
						
						
						
					 
					
						2024-11-13 11:55:09 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						80d70e9a45 
					 
					
						
						
							
							added structure for client View  
						
						 
						
						
						
						
					 
					
						2024-11-12 17:52:39 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						516c7ca303 
					 
					
						
						
							
							fixed gradle build  
						
						 
						
						
						
						
					 
					
						2024-11-12 17:41:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cedric Beck 
							
						 
					 
					
						
						
							
						
						a684405891 
					 
					
						
						
							
							added init for mdga with all states and messages  
						
						 
						
						
						
						
					 
					
						2024-11-12 17:26:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Grigencha 
							
						 
					 
					
						
						
							
						
						ef16a3f92b 
					 
					
						
						
							
							Revert main branch  
						
						 
						
						
						
						
					 
					
						2024-10-02 13:30:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Koppe 
							
						 
					 
					
						
						
							
						
						3a2f20e45c 
					 
					
						
						
							
							Fix ShipMap.remove  
						
						 
						
						
						
						
					 
					
						2024-10-02 08:21:32 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Minas 
							
						 
					 
					
						
						
							
						
						71a4ac8d12 
					 
					
						
						
							
							added contents  
						
						 
						
						
						
						
					 
					
						2024-09-18 17:04:31 +02:00