21 Commits

Author	SHA1	Message	Date
Rémi Heredero	c94e170a30	add version	2022-06-19 23:29:02 +02:00
Rémi Heredero	0813fd5254	file in jar	2022-06-19 17:39:41 +02:00
Rémi Heredero	adf854d15c	change dela for change map	2022-06-19 13:08:33 +02:00
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	3f0e963366	add pokemon for enemy	2022-06-17 07:37:07 +02:00
Fastium	790fd9d4ec	ok	2022-06-16 23:29:36 +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	4061053c56	fix accents	2022-06-16 18:59:45 +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
Fastium	ccf38809b9	change the world	2022-06-14 01:14:54 +02:00
Fastium	ba7694528f	should work	2022-06-13 20:53:09 +02:00
Fastium	7633d81737	finish	2022-06-13 11:41:24 +02:00
Fastium	c121320a04	c	2022-06-12 12:10:57 +02:00
Fastium	0fe608e183	dialog ok	2022-06-10 19:33:24 +02:00
Rémi Heredero	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
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