Hanno Fleischer
							
						 
					 | 
					
						
						
							
						
						3ba1c62685
					 | 
					
						
						
							
							Merge branch 'development2' into 'main'
						
						
						
						
						
						
						
						fixed Icons; edited smoke particles; removed test code
See merge request progproj/gruppen-ht24/Gruppe-01!43 
						
						
					 | 
					
						2024-12-14 09:14:59 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hanno Fleischer
							
						 
					 | 
					
						
						
							
						
						82aa9f6a51
					 | 
					
						
						
							
							fixed double copunting of played cards and now calculating correct travled nodes
						
						
						
						
						
						
					 | 
					
						2024-12-14 10:13:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						9c9702b2c5
					 | 
					
						
						
							
							fixed setIcons; edited smoke particles; removed test code
						
						
						
						
						
						
					 | 
					
						2024-12-14 01:28:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						a3e6db6573
					 | 
					
						
						
							
							deleted unused modules; converted music
						
						
						
						
						
						
					 | 
					
						2024-12-13 20:26:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						c7cba412fe
					 | 
					
						
						
							
							Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
						
						
						
						
						
						
					 | 
					
						2024-12-13 14:24:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						caa370fec2
					 | 
					
						
						
							
							added icon
						
						
						
						
						
						
					 | 
					
						2024-12-13 14:23:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hanno Fleischer
							
						 
					 | 
					
						
						
							
						
						5c61c8c263
					 | 
					
						
						
							
							Merge branch 'main' into 'development2'
						
						
						
						
						
						
						
						fixed failing test, due to wrong assertions or missing messages, as well as...
See merge request progproj/gruppen-ht24/Gruppe-01!41 
						
						
					 | 
					
						2024-12-13 13:05:31 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cedric Beck
							
						 
					 | 
					
						
						
							
						
						d8eefeb348
					 | 
					
						
						
							
							renamed boardHandler methods
						
						
						
						
						
						
					 | 
					
						2024-12-13 14:01:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hanno Fleischer
							
						 
					 | 
					
						
						
							
						
						3f07400cf8
					 | 
					
						
						
							
							fixed failing test, due to wrong assertions or missing messages, as well as rewriting the 'addBonusCards()' method in Game to not use duplicates
						
						
						
						
						
						
					 | 
					
						2024-12-13 14:00:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hanno Fleischer
							
						 
					 | 
					
						
						
							
						
						e3ec2aaba8
					 | 
					
						
						
							
							added leave button logic to interrupt state
						
						
						
						
						
						
					 | 
					
						2024-12-13 11:14:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Timo Brennförder
							
						 
					 | 
					
						
						
							
						
						70e31e15c7
					 | 
					
						
						
							
							added StartDialogTest and started PlayerTests
						
						
						
						
						
						
					 | 
					
						2024-12-13 10:58:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hanno Fleischer
							
						 
					 | 
					
						
						
							
						
						3658a91b7b
					 | 
					
						
						
							
							added possiblity to build jar file and override shutdown behavior when closing via alt-f4 or the close button of the window
						
						
						
						
						
						
					 | 
					
						2024-12-13 10:15:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						1e5c5bd5eb
					 | 
					
						
						
							
							added T016
						
						
						
						
						
						
					 | 
					
						2024-12-13 05:58:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						23d4bf31a7
					 | 
					
						
						
							
							added testcase T004
						
						
						
						
						
						
					 | 
					
						2024-12-13 05:49:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						5826d93be4
					 | 
					
						
						
							
							added test case T003
						
						
						
						
						
						
					 | 
					
						2024-12-13 05:47:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						9c3b949e5a
					 | 
					
						
						
							
							corrected javaDoc in GameTest
						
						
						
						
						
						
					 | 
					
						2024-12-13 05:24:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						81223653f9
					 | 
					
						
						
							
							added Piecetest T005/T006
						
						
						
						
						
						
					 | 
					
						2024-12-13 05:15:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						28c06c931e
					 | 
					
						
						
							
							added the game-test 6/7 (T008-T009)
						
						
						
						
						
						
					 | 
					
						2024-12-13 04:25:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						f93da332b3
					 | 
					
						
						
							
							added the game-test8 t010
						
						
						
						
						
						
					 | 
					
						2024-12-13 04:20:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						379e4bcec1
					 | 
					
						
						
							
							corrected a pieceTest
						
						
						
						
						
						
					 | 
					
						2024-12-13 04:08:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						dc7dae5db9
					 | 
					
						
						
							
							added some gameTests and reformatted ServerStateTests
						
						
						
						
						
						
					 | 
					
						2024-12-13 04:07:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						702154c018
					 | 
					
						
						
							
							fixed PieceTest18
						
						
						
						
						
						
					 | 
					
						2024-12-13 02:52:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						032cd76ec2
					 | 
					
						
						
							
							Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
						
						
						
						
						
						
					 | 
					
						2024-12-13 02:39:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						5c8dce0626
					 | 
					
						
						
							
							finished the serverStateTests
						
						
						
						
						
						
					 | 
					
						2024-12-13 02:39:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						911ab42101
					 | 
					
						
						
							
							edited some tests for the server
						
						
						
						
						
						
					 | 
					
						2024-12-13 02:18:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						ea3f4df636
					 | 
					
						
						
							
							aaded some tests!
						
						
						
						
						
						
					 | 
					
						2024-12-13 01:59:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Timo Brennförder
							
						 
					 | 
					
						
						
							
						
						065a626307
					 | 
					
						
						
							
							added Tests for LobbyStateTests
						
						
						
						
						
						
					 | 
					
						2024-12-13 00:44:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Timo Brennförder
							
						 
					 | 
					
						
						
							
						
						2ec9b3a246
					 | 
					
						
						
							
							added NetworkDialogClientTests
						
						
						
						
						
						
						
						testEnterIP -> passes
testEnterPort -> can't be tested in model
testConnectToServer -> passes
testCantConnectToServer -> passes
testCancelJoining -> passes 
						
						
					 | 
					
						2024-12-12 20:53:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						48d6516073
					 | 
					
						
						
							
							fixed and added some tests
						
						
						
						
						
						
					 | 
					
						2024-12-12 15:01:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						0d4685f3c2
					 | 
					
						
						
							
							added some tests and corrected some tests and added logic for the tests like getter and setter
						
						
						
						
						
						
					 | 
					
						2024-12-12 13:46:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						d12b0b6a77
					 | 
					
						
						
							
							fixed some tests
						
						
						
						
						
						
					 | 
					
						2024-12-12 02:58:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						4dda9229b3
					 | 
					
						
						
							
							fixed some tests
						
						
						
						
						
						
					 | 
					
						2024-12-12 02:02:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						e6453b2f1b
					 | 
					
						
						
							
							Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
						
						
						
						
						
						
					 | 
					
						2024-12-12 01:03:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						af8ab21e5f
					 | 
					
						
						
							
							fixed some tests
						
						
						
						
						
						
					 | 
					
						2024-12-12 01:02:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hanno Fleischer
							
						 
					 | 
					
						
						
							
						
						d21e963d33
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/development2' into development2
						
						
						
						
						
						
					 | 
					
						2024-12-12 00:21:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hanno Fleischer
							
						 
					 | 
					
						
						
							
						
						1f3b07709c
					 | 
					
						
						
							
							added java docs to NoPieceState
						
						
						
						
						
						
					 | 
					
						2024-12-12 00:20:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						a6215b9986
					 | 
					
						
						
							
							Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
						
						
						
						
						
						
					 | 
					
						2024-12-12 00:03:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						6381d7b3b9
					 | 
					
						
						
							
							fixed some tests
						
						
						
						
						
						
					 | 
					
						2024-12-12 00:03:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hanno Fleischer
							
						 
					 | 
					
						
						
							
						
						176affa9c5
					 | 
					
						
						
							
							added java docs to view
						
						
						
						
						
						
					 | 
					
						2024-12-11 23:58:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						67ea9ede18
					 | 
					
						
						
							
							Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2
						
						
						
						
						
						
					 | 
					
						2024-12-11 23:32:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						173cbe31e5
					 | 
					
						
						
							
							fixed some tests
						
						
						
						
						
						
					 | 
					
						2024-12-11 23:32:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hanno Fleischer
							
						 
					 | 
					
						
						
							
						
						c13152bb29
					 | 
					
						
						
							
							added java docs to model
						
						
						
						
						
						
					 | 
					
						2024-12-11 23:31:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						a3d0056f7f
					 | 
					
						
						
							
							finished clientStateTests
						
						
						
						
						
						
					 | 
					
						2024-12-11 21:54:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						06dcc4c0e4
					 | 
					
						
						
							
							fixed buck
						
						
						
						
						
						
					 | 
					
						2024-12-11 20:19:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						61e168cefb
					 | 
					
						
						
							
							fixed buck
						
						
						
						
						
						
					 | 
					
						2024-12-11 20:08:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						cecd7e1a23
					 | 
					
						
						
							
							fixed buck
						
						
						
						
						
						
					 | 
					
						2024-12-11 19:59:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hanno Fleischer
							
						 
					 | 
					
						
						
							
						
						f9772732c4
					 | 
					
						
						
							
							added better network support and disconnecting doesnt clos the client who hosts the server now
						
						
						
						
						
						
					 | 
					
						2024-12-11 19:10:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						f09766eb42
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/development2' into development2
						
						
						
						
						
						
						
						# Conflicts:
#	Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/rolldice/FirstRollState.java
#	Projekte/mdga/model/src/test/java/pp/mdga/client/clientState/ClientStateTest.java
#	Projekte/mdga/model/src/test/java/pp/mdga/game/PieceTest.java 
						
						
					 | 
					
						2024-12-11 17:16:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Feyer
							
						 
					 | 
					
						
						
							
						
						62e3dd7932
					 | 
					
						
						
							
							fixed some tests
						
						
						
						
						
						
					 | 
					
						2024-12-11 17:13:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hanno Fleischer
							
						 
					 | 
					
						
						
							
						
						d80499a18a
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/development2' into development2
						
						
						
						
						
						
					 | 
					
						2024-12-11 16:50:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |