Fastium
							
						 
					 | 
					
						
						
							
						
						3e96178c0f
					 | 
					
						
						
							
							oublier de mettre à 1600 pv le prof de math
						
						
						
						
						
						
					 | 
					
						2022-06-16 20:01:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						baff97fa03
					 | 
					
						
						
							
							display the pv of enemy ok
						
						
						
						
						
						
					 | 
					
						2022-06-16 19:30:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						aac7ba69f6
					 | 
					
						
						
							
							ok
						
						
						
						
						
						
					 | 
					
						2022-06-16 19:21:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						ab3292314d
					 | 
					
						
						
							
							Merge pull request #43 from Klagarge:end-game
						
						
						
						
						
						
						
						finsh text end 
						
						
					 | 
					
						2022-06-16 19:15:25 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						b283460840
					 | 
					
						
						
							
							finsh text end
						
						
						
						
						
						
					 | 
					
						2022-06-16 19:14:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6197599f6b
					 | 
					
						
						
							
							equilibrage done
						
						
						
						
						
						
					 | 
					
						2022-06-16 17:43:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b808af6adc
					 | 
					
						
						
							
							add pv for player
						
						
						
						
						
						
					 | 
					
						2022-06-16 16:59:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						220298c6d4
					 | 
					
						
						
							
							bug
						
						
						
						
						
						
					 | 
					
						2022-06-16 16:09:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rémi Heredero
							
						 
					 | 
					
						
						
							
						
						2d6e572583
					 | 
					
						
						
							
							Merge pull request #38 from Klagarge:add-prof
						
						
						
						
						
						
						
						first step 
						
						
					 | 
					
						2022-06-16 16:03:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bcd37fe183
					 | 
					
						
						
							
							first step
						
						
						
						
						
						
					 | 
					
						2022-06-16 15:52:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rémi Heredero
							
						 
					 | 
					
						
						
							
						
						e590224acd
					 | 
					
						
						
							
							Merge branch 'master' into battlescreen-display
						
						
						
						
						
						
					 | 
					
						2022-06-16 15:49:47 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						cad32fde7d
					 | 
					
						
						
							
							add xp and pv on display
						
						
						
						
						
						
					 | 
					
						2022-06-16 15:46:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						20a4356f69
					 | 
					
						
						
							
							finish to add time
						
						
						
						
						
						
					 | 
					
						2022-06-16 14:24:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						429a3316d9
					 | 
					
						
						
							
							polish merge
						
						
						
						
						
						
					 | 
					
						2022-06-16 07:38:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rémi Heredero
							
						 
					 | 
					
						
						
							
						
						4063f505a4
					 | 
					
						
						
							
							Merge branch 'master' into xp-modifiaction
						
						
						
						
						
						
					 | 
					
						2022-06-16 07:25:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						907ae78eec
					 | 
					
						
						
							
							finish to add enemy
						
						
						
						
						
						
					 | 
					
						2022-06-15 16:49:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						b944d9be51
					 | 
					
						
						
							
							xp modification
						
						
						
						
						
						
					 | 
					
						2022-06-15 09:53:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						da998e0862
					 | 
					
						
						
							
							some maps and fix turn, display and new sprite
						
						
						
						
						
						
					 | 
					
						2022-06-15 09:23:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						997f303567
					 | 
					
						
						
							
							a
						
						
						
						
						
						
					 | 
					
						2022-06-15 08:20:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						26a8b0280b
					 | 
					
						
						
							
							xp modification
						
						
						
						
						
						
					 | 
					
						2022-06-14 12:51:47 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						ccf38809b9
					 | 
					
						
						
							
							change the world
						
						
						
						
						
						
					 | 
					
						2022-06-14 01:14:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						744b160542
					 | 
					
						
						
							
							xp modification
						
						
						
						
						
						
					 | 
					
						2022-06-13 23:11:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						2b630e1b45
					 | 
					
						
						
							
							adjust screen battle
						
						
						
						
						
						
					 | 
					
						2022-06-13 21:57:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						2d2095a65a
					 | 
					
						
						
							
							fonctionniert
						
						
						
						
						
						
					 | 
					
						2022-06-13 21:38:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ceb71643b1
					 | 
					
						
						
							
							fix done
						
						
						
						
						
						
					 | 
					
						2022-06-13 21:08:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						ba7694528f
					 | 
					
						
						
							
							should work
						
						
						
						
						
						
					 | 
					
						2022-06-13 20:53:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e71d23dd81
					 | 
					
						
						
							
							fix bug !!! (hallelujah)
						
						
						
						
						
						
					 | 
					
						2022-06-13 19:26:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						317aae0432
					 | 
					
						
						
							
							polish done
						
						
						
						
						
						
					 | 
					
						2022-06-12 17:02:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						150cb3ab11
					 | 
					
						
						
							
							done
						
						
						
						
						
						
					 | 
					
						2022-06-12 16:33:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rémi Heredero
							
						 
					 | 
					
						
						
							
						
						ac5ce35a19
					 | 
					
						
						
							
							Merge branch 'master' into battle-game
						
						
						
						
						
						
					 | 
					
						2022-06-12 14:33:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5008b6e18a
					 | 
					
						
						
							
							polish and bug fix
						
						
						
						
						
						
					 | 
					
						2022-06-12 12:35:08 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						c121320a04
					 | 
					
						
						
							
							c
						
						
						
						
						
						
					 | 
					
						2022-06-12 12:10:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						d33945ccf4
					 | 
					
						
						
							
							b
						
						
						
						
						
						
					 | 
					
						2022-06-11 21:45:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						ba0f36625e
					 | 
					
						
						
							
							a
						
						
						
						
						
						
					 | 
					
						2022-06-11 19:18:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						74956e5e0b
					 | 
					
						
						
							
							first pass
						
						
						
						
						
						
					 | 
					
						2022-06-10 19:36:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						91fda1acee
					 | 
					
						
						
							
							reset camera
						
						
						
						
						
						
					 | 
					
						2022-06-10 18:59:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						697c9e659f
					 | 
					
						
						
							
							switch screen
						
						
						
						
						
						
					 | 
					
						2022-06-10 18:49:02 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						876cc9192e
					 | 
					
						
						
							
							poslish of polish
						
						
						
						
						
						
					 | 
					
						2022-06-09 19:20:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						419c8ed93f
					 | 
					
						
						
							
							all merge done without error
						
						
						
						
						
						
					 | 
					
						2022-06-09 19:15:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fastium
							
						 
					 | 
					
						
						
							
						
						aaeb151c43
					 | 
					
						
						
							
							avancée sur la base de donnée des attaques et discours
						
						
						
						
						
						
					 | 
					
						2022-06-08 23:30:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |