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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |