148 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	edd8e028d4	Merge pull request #35 from Klagarge:xp-modifiaction ... Xp-modifiaction	2022-06-16 07:26:38 +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
Rémi Heredero	782ddbcfd5	Merge pull request #34 from Klagarge:add-21N1 ... add 21N1 + change both stairs	2022-06-15 18:34:28 +02:00
Rémi Heredero	5217932eba	add 21N1 + change both stairs	2022-06-15 18:33:50 +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	fee27ebbab	Merge pull request #33 from Klagarge:add-enemies ... finish to add enemy	2022-06-15 16:50:38 +02:00
Rémi Heredero	907ae78eec	finish to add enemy	2022-06-15 16:49:33 +02:00
Rémi Heredero	62ebdf6248	Merge pull request #32 from Klagarge/add-maps ... Add maps	2022-06-15 16:06:47 +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	c1ed41fdbe	Merge pull request #31 from Klagarge:change ... Change	2022-06-14 05:31:22 +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	b13b19c3fb	fix "	2022-06-14 04:13:07 +02:00
Rémi Heredero	a6bc99cfdd	Merge pull request #30 from Klagarge:addmaps ... Addmaps	2022-06-14 04:01:15 +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
Fastium	08e2a1eed2	xp modifiaction	2022-06-13 23:12:12 +02:00
Fastium	744b160542	xp modification	2022-06-13 23:11:17 +02:00
Rémi Heredero	b4a899bdcd	Merge pull request #29 from Klagarge:fix-for-yann ... done	2022-06-13 22:35:48 +02:00
Rémi Heredero	b5f0cebfe1	done	2022-06-13 22:35:15 +02:00
Rémi Heredero	260515519e	add one	2022-06-13 22:33:58 +02:00
Fastium	27ea0b2f05	sad change	2022-06-13 22:03:18 +02:00
Fastium	4d38088397	change screen battle	2022-06-13 21:58:24 +02:00
Fastium	7a5cdf9f2d	change screen battle	2022-06-13 21:58:13 +02:00
Fastium	2b630e1b45	adjust screen battle	2022-06-13 21:57:14 +02:00
Fastium	f53db05cc9	adjust screenbattle	2022-06-13 21:57:01 +02:00
Fastium	0d2748abb0	Merge branch 'master' of https://github.com/Klagarge/PokeMudry	2022-06-13 21:54:10 +02:00
Fastium	b3b02c4f06	change screenBattleOn	2022-06-13 21:54:05 +02:00
Fastium	5a8cfeef4e	change screenBattleOn	2022-06-13 21:52:49 +02:00
Fastium	67ccb8cca4	Merge pull request #28 from Klagarge:win-game ... fonctionniert	2022-06-13 20:41:50 +01:00
Fastium	2d2095a65a	fonctionniert	2022-06-13 21:38:00 +02:00
Rémi Heredero	47b86dd6c8	Merge pull request #27 from Klagarge:fix-merge ... fix done	2022-06-13 21:10:05 +02:00
Rémi Heredero	ceb71643b1	fix done	2022-06-13 21:08:11 +02:00
Rémi Heredero	50760ddfd5	Merge pull request #26 from Klagarge/check-answer ... should work	2022-06-13 20:57:17 +02:00
Rémi Heredero	1ecb376a55	Merge pull request #25 from Klagarge/add-maps ... some adds	2022-06-13 20:53:50 +02:00