Felix Koppe
							
						 
					 | 
					
						
						
							
						
						236d3db930
					 | 
					
						
						
							
							Add ambience
						
						
						
						
						
						
					 | 
					
						2024-12-06 18:10:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						29c6b13300
					 | 
					
						
						
							
							added MatrixAnimation
						
						
						
						
						
						
					 | 
					
						2024-12-06 17:09:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						6059e93276
					 | 
					
						
						
							
							Fix interruptDialog
						
						
						
						
						
						
					 | 
					
						2024-12-06 16:52:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						f2eeb6dab4
					 | 
					
						
						
							
							Fix logic error regarding cardSelection
						
						
						
						
						
						
					 | 
					
						2024-12-06 16:27:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						2ac2de645b
					 | 
					
						
						
							
							working on matrix-animation
						
						
						
						
						
						
					 | 
					
						2024-12-06 14:56:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						d39f85fbe9
					 | 
					
						
						
							
							Add some javaDoc to client
						
						
						
						
						
						
					 | 
					
						2024-12-06 14:26:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						960a57caba
					 | 
					
						
						
							
							Fix broken lose sound
						
						
						
						
						
						
					 | 
					
						2024-12-06 13:28:38 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						36631df2e9
					 | 
					
						
						
							
							Fix broken jet-sound
						
						
						
						
						
						
					 | 
					
						2024-12-06 13:26:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						df27c23cd5
					 | 
					
						
						
							
							Fix shadercode
						
						
						
						
						
						
					 | 
					
						2024-12-06 13:19:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						acd64d1507
					 | 
					
						
						
							
							Fix shadercode
						
						
						
						
						
						
					 | 
					
						2024-12-06 13:14:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						76f86c8a66
					 | 
					
						
						
							
							Improve audioSettings
						
						
						
						
						
						
					 | 
					
						2024-12-06 11:35:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						c4e7fb1d41
					 | 
					
						
						
							
							Fix logic in modelSyncronizer
						
						
						
						
						
						
					 | 
					
						2024-12-06 10:54:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						95635f5fb7
					 | 
					
						
						
							
							Fix ownColor in gameView
						
						
						
						
						
						
					 | 
					
						2024-12-06 09:59:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						e337b1f888
					 | 
					
						
						
							
							Fix card select issue
						
						
						
						
						
						
					 | 
					
						2024-12-06 09:57:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						0237bcc4be
					 | 
					
						
						
							
							Fix card select issue
						
						
						
						
						
						
					 | 
					
						2024-12-06 09:51:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						26836d16cc
					 | 
					
						
						
							
							Fix card select issue
						
						
						
						
						
						
					 | 
					
						2024-12-06 09:48:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						a6c8cc33f4
					 | 
					
						
						
							
							Make cardSelect trigger needCconfirm
						
						
						
						
						
						
					 | 
					
						2024-12-06 09:31:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						7f5f4b8c68
					 | 
					
						
						
							
							Fix broken sound
						
						
						
						
						
						
					 | 
					
						2024-12-06 09:24:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						7f3483aa6b
					 | 
					
						
						
							
							Add broken sound
						
						
						
						
						
						
					 | 
					
						2024-12-06 09:22:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						8422b7be1e
					 | 
					
						
						
							
							Merge branch 'development' into dev/client_koppe2
						
						
						
						
						
						
					 | 
					
						2024-12-06 09:11:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						f0b23ab9c2
					 | 
					
						
						
							
							Readd broken files
						
						
						
						
						
						
					 | 
					
						2024-12-06 09:10:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						78f1dbb3d3
					 | 
					
						
						
							
							Remove broken files
						
						
						
						
						
						
					 | 
					
						2024-12-06 09:08:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						9e758e4417
					 | 
					
						
						
							
							Merge branch 'dev/model' into dev/client_koppe2
						
						
						
						
						
						
					 | 
					
						2024-12-06 08:11:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hanno Fleischer
							
						 
					 | 
					
						
						
							
						
						f713e00c36
					 | 
					
						
						
							
							made all 'PowerCards' serializable
						
						
						
						
						
						
					 | 
					
						2024-12-06 02:30:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hanno Fleischer
							
						 
					 | 
					
						
						
							
						
						b601ff2cf7
					 | 
					
						
						
							
							renamed 'PossibleCardMEssage' to 'PossibleCardsMessage' and completed JavaDocs for method 'getPowerCardByType' in 'Player'
						
						
						
						
						
						
					 | 
					
						2024-12-06 00:36:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hanno Fleischer
							
						 
					 | 
					
						
						
							
						
						421231aa12
					 | 
					
						
						
							
							made BonusCard Serializable and added the method calls to display handcards during the intro
						
						
						
						
						
						
					 | 
					
						2024-12-05 22:46:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						587af466e8
					 | 
					
						
						
							
							Merge branch 'development' into dev/client_koppe2
						
						
						
						
						
						
						
						# Conflicts:
#	Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java 
						
						
					 | 
					
						2024-12-05 22:17:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						8d398450f1
					 | 
					
						
						
							
							Minor changes
						
						
						
						
						
						
					 | 
					
						2024-12-05 22:15:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						0a96dd6f9f
					 | 
					
						
						
							
							Repair sounds
						
						
						
						
						
						
					 | 
					
						2024-12-05 22:07:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						e8a556de27
					 | 
					
						
						
							
							Add missle
						
						
						
						
						
						
					 | 
					
						2024-12-05 22:02:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						a399b14291
					 | 
					
						
						
							
							Improve interrupt
						
						
						
						
						
						
					 | 
					
						2024-12-05 18:11:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						9d21e2ce87
					 | 
					
						
						
							
							Merge commit
						
						
						
						
						
						
					 | 
					
						2024-12-05 18:00:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						2255bfd648
					 | 
					
						
						
							
							Remove test binding
						
						
						
						
						
						
					 | 
					
						2024-12-05 18:00:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hanno Fleischer
							
						 
					 | 
					
						
						
							
						
						74194d8514
					 | 
					
						
						
							
							Merge branch 'development' into 'dev/model'
						
						
						
						
						
						
						
						Development
See merge request progproj/gruppen-ht24/Gruppe-01!34 
						
						
					 | 
					
						2024-12-05 16:58:50 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						f3816cb2a5
					 | 
					
						
						
							
							added particle_cir.png
						
						
						
						
						
						
					 | 
					
						2024-12-05 17:49:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						997c4c589e
					 | 
					
						
						
							
							removed setOwnColor
						
						
						
						
						
						
					 | 
					
						2024-12-05 17:23:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						d14a0aef86
					 | 
					
						
						
							
							fixed ownColor sync problem
						
						
						
						
						
						
					 | 
					
						2024-12-05 17:22:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						ac5d7ed74b
					 | 
					
						
						
							
							Add sounds
						
						
						
						
						
						
					 | 
					
						2024-12-05 17:11:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						fc4a357e9e
					 | 
					
						
						
							
							Merge branch 'dev/model' into dev/client_koppe2
						
						
						
						
						
						
					 | 
					
						2024-12-05 16:25:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						a8b02faa96
					 | 
					
						
						
							
							Merge branch 'development' into dev/client_koppe2
						
						
						
						
						
						
						
						# Conflicts:
#	Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java 
						
						
					 | 
					
						2024-12-05 16:25:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						4a7c23708c
					 | 
					
						
						
							
							Add jetAnimation
						
						
						
						
						
						
					 | 
					
						2024-12-05 16:21:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						0e6a2499b7
					 | 
					
						
						
							
							Fix fullscreen issue
						
						
						
						
						
						
					 | 
					
						2024-12-04 18:38:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						00d86c5c10
					 | 
					
						
						
							
							Improve ceremonyView
						
						
						
						
						
						
					 | 
					
						2024-12-04 15:33:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						990e476753
					 | 
					
						
						
							
							Add Q/E rotation
						
						
						
						
						
						
					 | 
					
						2024-12-04 15:27:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						71fc08a05c
					 | 
					
						
						
							
							Add interrupt
						
						
						
						
						
						
					 | 
					
						2024-12-04 15:11:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						9e1ca584c7
					 | 
					
						
						
							
							Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development
						
						
						
						
						
						
					 | 
					
						2024-12-04 13:56:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						9199fbffd8
					 | 
					
						
						
							
							removed tests, fixed null exception in CardLayer
						
						
						
						
						
						
					 | 
					
						2024-12-04 13:56:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						5c71531277
					 | 
					
						
						
							
							Merge branch 'development' into dev/client_koppe2
						
						
						
						
						
						
					 | 
					
						2024-12-04 13:43:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						6f7c5346d2
					 | 
					
						
						
							
							Merge commit
						
						
						
						
						
						
					 | 
					
						2024-12-04 13:34:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						ef1ce63db6
					 | 
					
						
						
							
							Try to make server stop on leave
						
						
						
						
						
						
					 | 
					
						2024-12-04 13:33:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |