102 Commits

Author	SHA1	Message	Date
Rémi Heredero	769adeeeca	fix error of merge	2022-06-17 09:05:22 +02:00
Rémi Heredero	2ab5739649	Merge branch 'master' into add-FabLab	2022-06-17 08:56:31 +02:00
Rémi Heredero	82e2a0c059	comment	2022-06-17 08:48:57 +02:00
Rémi Heredero	42ddda4ae4	remove testYann	2022-06-17 07:44:47 +02:00
Rémi Heredero	3f0e963366	add pokemon for enemy	2022-06-17 07:37:07 +02:00
Fastium	790fd9d4ec	ok	2022-06-16 23:29:36 +02:00
Rémi Heredero	bb02aa00f9	polish	2022-06-16 22:09:17 +02:00
Rémi Heredero	12ccf3f58a	FabLab added	2022-06-16 21:08:31 +02:00
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
Rémi Heredero	d47a0acc8b	Merge pull request #42 from Klagarge:equilibrage ... Equilibrage	2022-06-16 19:14:11 +02:00
Rémi Heredero	4061053c56	fix accents	2022-06-16 18:59:45 +02:00
Rémi Heredero	6197599f6b	equilibrage done	2022-06-16 17:43:33 +02:00
Fastium	6794501109	ok end battle	2022-06-16 17:15:59 +02:00
Rémi Heredero	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
Rémi Heredero	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
Fastium	a5c3c8bac5	enemy on battle	2022-06-16 15:02:20 +02:00
Rémi Heredero	20a4356f69	finish to add time	2022-06-16 14:24:20 +02:00
Fastium	e748f763a8	add format dialog	2022-06-16 12:23:33 +02:00
Fastium	f15d40d62a	modif text enemy	2022-06-16 11:57:05 +02:00
Rémi Heredero	ada69759d5	move data	2022-06-16 10:26:51 +02:00
Rémi Heredero	77ace754ff	remove useless sound	2022-06-16 09:48:07 +02:00
Rémi Heredero	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
Fastium	5d0d638275	finish format text	2022-06-15 22:54:18 +02:00
Fastium	83fc312efb	add format speech	2022-06-15 22:29:34 +02:00
Rémi Heredero	2f59cef9c0	add 21N1	2022-06-15 22:07:17 +02:00
Fastium	8c8c59411d	a	2022-06-15 19:52:31 +02:00
Fastium	24774190b6	new font	2022-06-15 18:20:40 +02:00
Fastium	045329d8f6	new font	2022-06-15 18:19:14 +02:00
Rémi Heredero	907ae78eec	finish to add enemy	2022-06-15 16:49:33 +02:00
Rémi Heredero	6f5ba042ac	done maps	2022-06-15 16:05:51 +02:00
Rémi Heredero	be69fa5705	some add	2022-06-15 14:32:09 +02:00
Rémi Heredero	52bc6e9f22	fix map	2022-06-15 11:42:23 +02:00
Fastium	b944d9be51	xp modification	2022-06-15 09:53:54 +02:00
Rémi Heredero	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
Rémi Heredero	2934236281	Merge branch 'master' into change	2022-06-14 05:31:06 +02:00
Rémi Heredero	66cb496cf7	bug fix done	2022-06-14 05:28:43 +02:00
Rémi Heredero	dee8cad542	Merge branch 'master' into addmaps	2022-06-14 04:01:05 +02:00
Rémi Heredero	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