Cedric Beck
							
						 
					 | 
					
						
						
							
						
						c7a05011ff
					 | 
					
						
						
							
							Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
						
						
						
						
						
						
					 | 
					
						2024-12-09 04:34:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						15b7aa9e8c
					 | 
					
						
						
							
							fixed 2 dicenow notification
						
						
						
						
						
						
					 | 
					
						2024-12-09 04:34:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						84a50ec215
					 | 
					
						
						
							
							Fix something
						
						
						
						
						
						
					 | 
					
						2024-12-09 04:33:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						e05b057190
					 | 
					
						
						
							
							reenvented the wheel (; , rewrite the canMove-logic, etc
						
						
						
						
						
						
					 | 
					
						2024-12-09 04:32:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						9ea6837e89
					 | 
					
						
						
							
							Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
						
						
						
						
						
						
					 | 
					
						2024-12-09 04:21:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						a26a3d171f
					 | 
					
						
						
							
							99,99 IQ
						
						
						
						
						
						
					 | 
					
						2024-12-09 04:26:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						a2e85cebc9
					 | 
					
						
						
							
							99,9 IQ
						
						
						
						
						
						
					 | 
					
						2024-12-09 04:25:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						3fe2d90d75
					 | 
					
						
						
							
							added toString
						
						
						
						
						
						
					 | 
					
						2024-12-09 04:21:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						4181456598
					 | 
					
						
						
							
							Adjust delay
						
						
						
						
						
						
					 | 
					
						2024-12-09 04:13:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						6f34b1fe33
					 | 
					
						
						
							
							Adjust delay
						
						
						
						
						
						
					 | 
					
						2024-12-09 04:10:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						659fef6c50
					 | 
					
						
						
							
							Add bonus sounds
						
						
						
						
						
						
					 | 
					
						2024-12-09 04:07:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						9c7a13c568
					 | 
					
						
						
							
							fixed bug
						
						
						
						
						
						
					 | 
					
						2024-12-09 03:57:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						14699e3edf
					 | 
					
						
						
							
							fixed bug
						
						
						
						
						
						
					 | 
					
						2024-12-09 03:55:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						961da990ce
					 | 
					
						
						
							
							fixed no broadcast bug
						
						
						
						
						
						
					 | 
					
						2024-12-09 03:46:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fleischer Hanno
							
						 
					 | 
					
						
						
							
						
						be8d4b2d6e
					 | 
					
						
						
							
							made turbo flag work with only one flag
						
						
						
						
						
						
					 | 
					
						2024-12-09 03:39:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						38687b6d25
					 | 
					
						
						
							
							added turboflag
						
						
						
						
						
						
					 | 
					
						2024-12-09 03:37:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						c038073bad
					 | 
					
						
						
							
							Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
						
						
						
						
						
						
					 | 
					
						2024-12-09 03:23:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						5bccee96a2
					 | 
					
						
						
							
							working on turbo not
						
						
						
						
						
						
					 | 
					
						2024-12-09 03:23:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fleischer Hanno
							
						 
					 | 
					
						
						
							
						
						ecb751824c
					 | 
					
						
						
							
							created two flags to be able to determine if a turbo card has been played
						
						
						
						
						
						
					 | 
					
						2024-12-09 03:20:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						a7969d7a68
					 | 
					
						
						
							
							Minor change+
						
						
						
						
						
						
					 | 
					
						2024-12-09 03:25:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						3a1b17ed01
					 | 
					
						
						
							
							Merge commit
						
						
						
						
						
						
					 | 
					
						2024-12-09 03:17:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						3dd6fc9f37
					 | 
					
						
						
							
							Add DEBUG_MULTIPLIER
						
						
						
						
						
						
					 | 
					
						2024-12-09 03:17:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						3ae9028b82
					 | 
					
						
						
							
							Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
						
						
						
						
						
						
					 | 
					
						2024-12-09 03:11:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						536c14bf7c
					 | 
					
						
						
							
							working on turbocard
						
						
						
						
						
						
					 | 
					
						2024-12-09 03:11:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fleischer Hanno
							
						 
					 | 
					
						
						
							
						
						fb3a663db1
					 | 
					
						
						
							
							added overwrite of dicemodifier when receiving PlayCard Turbo message
						
						
						
						
						
						
					 | 
					
						2024-12-09 03:07:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						b91d448ee6
					 | 
					
						
						
							
							Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
						
						
						
						
						
						
					 | 
					
						2024-12-09 02:55:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						935577462b
					 | 
					
						
						
							
							added shieldRing move
						
						
						
						
						
						
					 | 
					
						2024-12-09 02:55:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						f79d590620
					 | 
					
						
						
							
							Merge commit
						
						
						
						
						
						
					 | 
					
						2024-12-09 02:50:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						69d160d0fd
					 | 
					
						
						
							
							Java23
						
						
						
						
						
						
					 | 
					
						2024-12-09 02:50:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						de592cfa48
					 | 
					
						
						
							
							Move receive DrawCardMessage to GameState
						
						
						
						
						
						
					 | 
					
						2024-12-09 02:43:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fleischer Hanno
							
						 
					 | 
					
						
						
							
						
						8922cb8f1c
					 | 
					
						
						
							
							added removeshield notification
						
						
						
						
						
						
					 | 
					
						2024-12-09 02:41:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						f10df60ad3
					 | 
					
						
						
							
							Merge commit
						
						
						
						
						
						
					 | 
					
						2024-12-09 02:40:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						1c87b566e9
					 | 
					
						
						
							
							Add DrawCardMessage logic
						
						
						
						
						
						
					 | 
					
						2024-12-09 02:40:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						6ecf5a66bf
					 | 
					
						
						
							
							added animation end in playCardNotification
						
						
						
						
						
						
					 | 
					
						2024-12-09 02:30:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						3f93d6e569
					 | 
					
						
						
							
							Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
						
						
						
						
						
						
					 | 
					
						2024-12-09 02:18:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						cc72b82be9
					 | 
					
						
						
							
							added shield Messages
						
						
						
						
						
						
					 | 
					
						2024-12-09 02:18:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fleischer Hanno
							
						 
					 | 
					
						
						
							
						
						41ac04f69d
					 | 
					
						
						
							
							added in can infield move to return false when occupant is shielded
						
						
						
						
						
						
					 | 
					
						2024-12-09 02:15:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						cb60cb1c42
					 | 
					
						
						
							
							Add bonus node logic
						
						
						
						
						
						
					 | 
					
						2024-12-09 02:19:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fleischer Hanno
							
						 
					 | 
					
						
						
							
						
						61d67fd833
					 | 
					
						
						
							
							Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
						
						
						
						
						
						
					 | 
					
						2024-12-09 02:04:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						4ca7c38170
					 | 
					
						
						
							
							Minor change in notification processing
						
						
						
						
						
						
					 | 
					
						2024-12-09 02:09:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fleischer Hanno
							
						 
					 | 
					
						
						
							
						
						e457fe23d4
					 | 
					
						
						
							
							added a reset for the dice modifier in the server
						
						
						
						
						
						
					 | 
					
						2024-12-09 02:03:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						b86aeb63e6
					 | 
					
						
						
							
							Merge commit
						
						
						
						
						
						
					 | 
					
						2024-12-09 01:53:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						daa8c0bf9d
					 | 
					
						
						
							
							500IQ
						
						
						
						
						
						
					 | 
					
						2024-12-09 01:53:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						6487bafed1
					 | 
					
						
						
							
							Merge commit
						
						
						
						
						
						
					 | 
					
						2024-12-09 01:47:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						8af3b2d9d4
					 | 
					
						
						
							
							Fix uuid serialisation error
						
						
						
						
						
						
					 | 
					
						2024-12-09 01:47:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						d38690ea48
					 | 
					
						
						
							
							merge
						
						
						
						
						
						
					 | 
					
						2024-12-09 01:43:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						daa7d31bdd
					 | 
					
						
						
							
							working on shield
						
						
						
						
						
						
					 | 
					
						2024-12-09 01:42:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fleischer Hanno
							
						 
					 | 
					
						
						
							
						
						5e79a4a64c
					 | 
					
						
						
							
							added remove handcard
						
						
						
						
						
						
					 | 
					
						2024-12-09 01:35:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						8e2fc6c1a1
					 | 
					
						
						
							
							Merge commit
						
						
						
						
						
						
					 | 
					
						2024-12-09 01:18:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Felix Koppe
							
						 
					 | 
					
						
						
							
						
						5a12d8e96f
					 | 
					
						
						
							
							Fix dice more than once error
						
						
						
						
						
						
					 | 
					
						2024-12-09 01:18:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |