Rémi Heredero
							
						 
					 | 
					
						
						
							
						
						2934236281
					 | 
					
						
						
							
							Merge branch 'master' into change
						
						
						
						
						
						
					 | 
					
						2022-06-14 05:31:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b13b19c3fb
					 | 
					
						
						
							
							fix "
						
						
						
						
						
						
					 | 
					
						2022-06-14 04:13:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3e4e32fd10
					 | 
					
						
						
							
							add 2 and a door
						
						
						
						
						
						
					 | 
					
						2022-06-14 03:56:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						ccf38809b9
					 | 
					
						
						
							
							change the world
						
						
						
						
						
						
					 | 
					
						2022-06-14 01:14:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						260515519e
					 | 
					
						
						
							
							add one
						
						
						
						
						
						
					 | 
					
						2022-06-13 22:33:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a66677e0ca
					 | 
					
						
						
							
							some adds
						
						
						
						
						
						
					 | 
					
						2022-06-13 20:30:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rémi Heredero
							
						 
					 | 
					
						
						
							
						
						6d71baa535
					 | 
					
						
						
							
							Merge pull request #23 from Klagarge/add-maps
						
						
						
						
						
						
						
						Add maps 
						
						
					 | 
					
						2022-06-13 18:28:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						93688eb1c2
					 | 
					
						
						
							
							add 3 maps
						
						
						
						
						
						
					 | 
					
						2022-06-13 18:06:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						de2746de40
					 | 
					
						
						
							
							21N3
						
						
						
						
						
						
					 | 
					
						2022-06-12 18:47:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						295a3349d9
					 | 
					
						
						
							
							Merge pull request #21 from Klagarge/professor
						
						
						
						
						
						
						
						add attack + answer 
						
						
					 | 
					
						2022-06-12 16:42:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						45fdbf41d0
					 | 
					
						
						
							
							add attack + answer
						
						
						
						
						
						
					 | 
					
						2022-06-12 17:42:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rémi Heredero
							
						 
					 | 
					
						
						
							
						
						23fe6f1ad9
					 | 
					
						
						
							
							Merge pull request #19 from Klagarge:add-maps
						
						
						
						
						
						
						
						create png 
						
						
					 | 
					
						2022-06-12 16:43:50 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						7cdedc2438
					 | 
					
						
						
							
							add prof
						
						
						
						
						
						
					 | 
					
						2022-06-12 15:19:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						447919fbca
					 | 
					
						
						
							
							create png
						
						
						
						
						
						
					 | 
					
						2022-06-12 14:43:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rémi Heredero
							
						 
					 | 
					
						
						
							
						
						52abcf1c02
					 | 
					
						
						
							
							Merge branch 'master' into dialog-screen-battle
						
						
						
						
						
						
					 | 
					
						2022-06-10 19:41:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						0fe608e183
					 | 
					
						
						
							
							dialog ok
						
						
						
						
						
						
					 | 
					
						2022-06-10 19:33:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						56d57ca17c
					 | 
					
						
						
							
							enemy integration done, but big bug when move
						
						
						
						
						
						
					 | 
					
						2022-06-10 16:39:50 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1466ba041a
					 | 
					
						
						
							
							detect enemy
						
						
						
						
						
						
					 | 
					
						2022-06-09 21:07:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8991c6efb9
					 | 
					
						
						
							
							Merge branch 'master' into dialog
						
						
						
						
						
						
					 | 
					
						2022-06-09 18:21:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						aaeb151c43
					 | 
					
						
						
							
							avancée sur la base de donnée des attaques et discours
						
						
						
						
						
						
					 | 
					
						2022-06-08 23:30:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rémi Heredero
							
						 
					 | 
					
						
						
							
						
						659096b3e2
					 | 
					
						
						
							
							Merge branch 'master' into more-entities
						
						
						
						
						
						
					 | 
					
						2022-06-08 20:19:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4843f5d1d8
					 | 
					
						
						
							
							near to done
						
						
						
						
						
						
					 | 
					
						2022-06-08 20:08:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						0e4780ba43
					 | 
					
						
						
							
							add fight data at enemy
						
						
						
						
						
						
					 | 
					
						2022-06-08 20:04:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						88519adaf2
					 | 
					
						
						
							
							add fight data
						
						
						
						
						
						
					 | 
					
						2022-06-08 19:04:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						d522fff056
					 | 
					
						
						
							
							battleScreen and testYann
						
						
						
						
						
						
					 | 
					
						2022-06-08 09:53:51 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4e28801b38
					 | 
					
						
						
							
							done
						
						
						
						
						
						
					 | 
					
						2022-06-07 21:35:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ce9ff7ca53
					 | 
					
						
						
							
							add ressources
						
						
						
						
						
						
					 | 
					
						2022-06-06 14:10:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						622e072481
					 | 
					
						
						
							
							convert with lib
						
						
						
						
						
						
					 | 
					
						2022-06-06 13:48:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |