Hegedus Fanni 
							
						 
					 
					
						
						
							
						
						70fd002f47 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/bokrosbalint/cicaprojekt  
						
						 
						
						
						
						
					 
					
						2016-04-25 21:48:28 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hegedus Fanni 
							
						 
					 
					
						
						
							
						
						56c58ffcde 
					 
					
						
						
							
							added testBoxes test in Tester.java  
						
						 
						
						
						
						
					 
					
						2016-04-25 21:40:22 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						00fba129e4 
					 
					
						
						
							
							added getters & setters to Tile.x and Tile.y attributes  
						
						 
						
						
						
						
					 
					
						2016-04-25 21:33:54 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ericnerdo 
							
						 
					 
					
						
						
							
						
						41b132df46 
					 
					
						
						
							
							boolean rotationTest() added to Tester  
						
						 
						
						
						
						
					 
					
						2016-04-25 21:27:10 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ericnerdo 
							
						 
					 
					
						
						
							
						
						1dfe318b10 
					 
					
						
						
							
							boolean timeUpTest() added to Tester  
						
						 
						
						
						
						
					 
					
						2016-04-25 21:22:05 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hegedus Fanni 
							
						 
					 
					
						
						
							
						
						19ff22905d 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/bokrosbalint/cicaprojekt  
						
						 
						
						
						
						
					 
					
						2016-04-25 21:19:39 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hegedus Fanni 
							
						 
					 
					
						
						
							
						
						518fdd0586 
					 
					
						
						
							
							fixed typos in testExtraZPMs and testReplicatorPosition in Tester.java  
						
						 
						
						
						
						
					 
					
						2016-04-25 21:16:05 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bokros Bálint 
							
						 
					 
					
						
						
							
						
						6810ec02bc 
					 
					
						
						
							
							Implemented rotate  
						
						 
						
						
						
						
					 
					
						2016-04-25 21:15:24 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ericnerdo 
							
						 
					 
					
						
						
							
						
						fbdb7ba867 
					 
					
						
						
							
							fixed fucked up merge  
						
						 
						
						
						
						
					 
					
						2016-04-25 21:11:37 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ericnerdo 
							
						 
					 
					
						
						
							
						
						934c358da8 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/bokrosbalint/cicaprojekt  
						
						 
						
						... 
						
						
						
						boolean ZPMTest() added to Tester 
						
						
					 
					
						2016-04-25 21:08:52 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hegedus Fanni 
							
						 
					 
					
						
						
							
						
						806c6ae37c 
					 
					
						
						
							
							added replicatorPosition test in Tester.java  
						
						 
						
						
						
						
					 
					
						2016-04-25 21:05:24 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ericnerdo 
							
						 
					 
					
						
						
							
						
						0a240e59f9 
					 
					
						
						
							
							boolean ZPMTest() added to Tester  
						
						 
						
						
						
						
					 
					
						2016-04-25 21:02:52 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bokros Bálint 
							
						 
					 
					
						
						
							
						
						1b2c8c8478 
					 
					
						
						
							
							Implemented shootONeillsGun  
						
						 
						
						
						
						
					 
					
						2016-04-25 21:02:30 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						339df6af13 
					 
					
						
						
							
							Dungeon.buildDungeon() now properly initializes Gaps & the Replicator  
						
						 
						
						
						
						
					 
					
						2016-04-25 20:59:28 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hegedus Fanni 
							
						 
					 
					
						
						
							
						
						328107adb8 
					 
					
						
						
							
							fixed extraZPMs test in Tester.java  
						
						 
						
						
						
						
					 
					
						2016-04-25 20:55:28 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ericnerdo 
							
						 
					 
					
						
						
							
						
						689e7c6324 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/bokrosbalint/cicaprojekt  
						
						 
						
						
						
						
					 
					
						2016-04-25 20:50:42 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ericnerdo 
							
						 
					 
					
						
						
							
						
						712f35f245 
					 
					
						
						
							
							boolean gapTest() added to Tester  
						
						 
						
						
						
						
					 
					
						2016-04-25 20:49:01 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bokros Bálint 
							
						 
					 
					
						
						
							
						
						cf356806c5 
					 
					
						
						
							
							Implemented move in Tester  
						
						 
						
						
						
						
					 
					
						2016-04-25 20:44:22 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ericnerdo 
							
						 
					 
					
						
						
							
						
						9e2a21f967 
					 
					
						
						
							
							boolean testScalesAndGates() added to Tester  
						
						 
						
						
						
						
					 
					
						2016-04-25 20:40:56 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hegedus Fanni 
							
						 
					 
					
						
						
							
						
						68c0dd96e3 
					 
					
						
						
							
							added extraZPMs test to Tester.java  
						
						 
						
						
						
						
					 
					
						2016-04-25 20:32:58 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ericnerdo 
							
						 
					 
					
						
						
							
						
						1bf5df9b08 
					 
					
						
						
							
							boolean moveTest() modified, boolean testStargates() added to Tester  
						
						 
						
						
						
						
					 
					
						2016-04-25 20:21:11 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bokros Bálint 
							
						 
					 
					
						
						
							
						
						d61be1d967 
					 
					
						
						
							
							Players are now properly initialized  
						
						 
						
						
						
						
					 
					
						2016-04-25 20:02:48 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ericnerdo 
							
						 
					 
					
						
						
							
						
						9f5c310e12 
					 
					
						
						
							
							boolean moveTest() was added to Test  
						
						 
						
						
						
						
					 
					
						2016-04-25 19:55:09 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e8bdc59081 
					 
					
						
						
							
							implemented Tester.runAllTests() and @Test annotation  
						
						 
						
						
						
						
					 
					
						2016-04-25 19:35:32 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bokros Bálint 
							
						 
					 
					
						
						
							
						
						43653de8c9 
					 
					
						
						
							
							Implemented listPlayers  
						
						 
						
						
						
						
					 
					
						2016-04-25 19:18:22 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bokros Bálint 
							
						 
					 
					
						
						
							
						
						c26b3ae75f 
					 
					
						
						
							
							Added toString to PlayerBase  
						
						 
						
						
						
						
					 
					
						2016-04-25 19:14:54 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bokros Bálint 
							
						 
					 
					
						
						
							
						
						c577bb1471 
					 
					
						
						
							
							Added coords and toString to Tile  
						
						 
						
						
						
						
					 
					
						2016-04-25 19:14:08 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bokros Bálint 
							
						 
					 
					
						
						
							
						
						7b531fecdd 
					 
					
						
						
							
							Refactored Player and PlayerBase ctors  
						
						 
						
						
						
						
					 
					
						2016-04-25 13:56:41 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bokros Bálint 
							
						 
					 
					
						
						
							
						
						1a23abbe47 
					 
					
						
						
							
							Added Tester class  
						
						 
						
						
						
						
					 
					
						2016-04-25 13:02:45 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						82394cdca4 
					 
					
						
						
							
							fixed parts of Dungeon.buildDungeon() fucked up by ericnerdo  
						
						 
						
						
						
						
					 
					
						2016-04-24 23:29:10 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bokros Bálint 
							
						 
					 
					
						
						
							
						
						1ab13398bb 
					 
					
						
						
							
							reformatted code  
						
						 
						
						
						
						
					 
					
						2016-04-24 23:01:34 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d0d656452c 
					 
					
						
						
							
							implemented PlayerBase.pickZPM() (former pickItem()) callback method  
						
						 
						
						
						
						
					 
					
						2016-04-24 22:50:49 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ericnerdo 
							
						 
					 
					
						
						
							
						
						69a2384160 
					 
					
						
						
							
							Wall - finished  
						
						 
						
						
						
						
					 
					
						2016-04-24 22:37:27 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ericnerdo 
							
						 
					 
					
						
						
							
						
						1c8566d96c 
					 
					
						
						
							
							Scale - finished  
						
						 
						
						
						
						
					 
					
						2016-04-24 22:36:54 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ericnerdo 
							
						 
					 
					
						
						
							
						
						fd64fd9165 
					 
					
						
						
							
							Gate - finished  
						
						 
						
						
						
						
					 
					
						2016-04-24 22:36:20 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ericnerdo 
							
						 
					 
					
						
						
							
						
						cbd196532f 
					 
					
						
						
							
							Gap - finished  
						
						 
						
						
						
						
					 
					
						2016-04-24 22:28:09 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ericnerdo 
							
						 
					 
					
						
						
							
						
						a276a9e6e1 
					 
					
						
						
							
							Field - finished  
						
						 
						
						
						
						
					 
					
						2016-04-24 22:27:30 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ericnerdo 
							
						 
					 
					
						
						
							
						
						924a5acc26 
					 
					
						
						
							
							Tile refactored  
						
						 
						
						... 
						
						
						
						Every setItemOnTile call were replaced. 
						
						
					 
					
						2016-04-24 22:25:20 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ericnerdo 
							
						 
					 
					
						
						
							
						
						0a4b00aad3 
					 
					
						
						
							
							Tile-attributes changed  
						
						 
						
						... 
						
						
						
						Tile.itemOnTile no longer exists, it was replaced by boxStack and zpmOnTile. Getter-Setter methods were added. 
						
						
					 
					
						2016-04-24 21:19:35 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						4f81192938 
					 
					
						
						
							
							added scale-gate references to dungeon files and their parser  
						
						 
						
						
						
						
					 
					
						2016-04-24 20:44:17 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bokros Bálint 
							
						 
					 
					
						
						
							
						
						794378a919 
					 
					
						
						
							
							Removed unneeded 'cicaprojekt.'-s from the project  
						
						 
						
						
						
						
					 
					
						2016-04-24 20:44:10 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bokros Bálint 
							
						 
					 
					
						
						
							
						
						b32fec8c52 
					 
					
						
						
							
							Stargate's isSpawned attribute is now properly initialized  
						
						 
						
						
						
						
					 
					
						2016-04-24 20:10:31 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bokros Bálint 
							
						 
					 
					
						
						
							
						
						c6a0b984eb 
					 
					
						
						
							
							Added red and green Stargates  
						
						 
						
						
						
						
					 
					
						2016-04-24 20:09:53 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bokros Bálint 
							
						 
					 
					
						
						
							
						
						708ad09c5e 
					 
					
						
						
							
							Cosmetic fixes in Stargate  
						
						 
						
						
						
						
					 
					
						2016-04-24 20:09:02 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ericnerdo 
							
						 
					 
					
						
						
							
						
						73c42991eb 
					 
					
						
						
							
							OnEntry/OnExit changed  
						
						 
						
						... 
						
						
						
						The argument of these methods were changed from void to PlayerBase playerBase. 
						
						
					 
					
						2016-04-24 19:49:27 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ericnerdo 
							
						 
					 
					
						
						
							
						
						64e6aec176 
					 
					
						
						
							
							Implemented onExit in Wall  
						
						 
						
						
						
						
					 
					
						2016-04-24 18:38:39 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ericnerdo 
							
						 
					 
					
						
						
							
						
						6b11456b7a 
					 
					
						
						
							
							Abstract class finished  
						
						 
						
						... 
						
						
						
						Method-calling texts were removed and methods were implemented. 
						
						
					 
					
						2016-04-24 18:27:36 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								muskenum 
							
						 
					 
					
						
						
							
						
						13a8adec82 
					 
					
						
						
							
							Deleted echoes from all classes  
						
						 
						
						
						
						
					 
					
						2016-04-24 18:21:01 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e041576547 
					 
					
						
						
							
							made cosmetic changes to most of the files: unified coding style  
						
						 
						
						
						
						
					 
					
						2016-04-23 17:15:19 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						7eeeefa3e2 
					 
					
						
						
							
							finished implementing map parser (Dungeon.buildDungeon())  
						
						 
						
						... 
						
						
						
						the parser now sets up references between adjecent Tiles, however a team
consultation is needed regarding the Gates/Scales on the map. note that
the part of the parser that sets the references up is still untested. 
						
						
					 
					
						2016-04-23 17:08:32 +02:00