52 Commits

Author	SHA1	Message	Date
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
Rémi Heredero	b5f0cebfe1	done	2022-06-13 22:35:15 +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	2d2095a65a	fonctionniert	2022-06-13 21:38:00 +02:00
Rémi Heredero	ceb71643b1	fix done	2022-06-13 21:08:11 +02:00
Fastium	ba7694528f	should work	2022-06-13 20:53:09 +02:00
Rémi Heredero	e71d23dd81	fix bug !!! (hallelujah)	2022-06-13 19:26:52 +02:00
Rémi Heredero	6d71baa535	Merge pull request #23 from Klagarge/add-maps ... Add maps	2022-06-13 18:28:23 +02:00
Rémi Heredero	93688eb1c2	add 3 maps	2022-06-13 18:06:38 +02:00
Fastium	7633d81737	finish	2022-06-13 11:41:24 +02:00
Rémi Heredero	317aae0432	polish done	2022-06-12 17:02:27 +02:00
Rémi Heredero	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
Fastium	6248936e5a	d	2022-06-12 14:26:02 +02:00
Rémi Heredero	32636500d0	Merge pull request #14 from Klagarge:polish ... Polish	2022-06-12 12:37:39 +02:00
Rémi Heredero	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	f21a8c7482	Update ScreenBattle.java	2022-06-11 19:32:43 +02:00
Fastium	ba0f36625e	a	2022-06-11 19:18:10 +02:00
Fastium	05e9e4d7ef	change the problem	2022-06-10 21:47:37 +02:00
Rémi Heredero	b7704c1e79	clean	2022-06-10 19:46:59 +02:00
Rémi Heredero	52abcf1c02	Merge branch 'master' into dialog-screen-battle	2022-06-10 19:41:27 +02:00
Rémi Heredero	74956e5e0b	first pass	2022-06-10 19:36:22 +02:00
Fastium	0fe608e183	dialog ok	2022-06-10 19:33:24 +02:00
Rémi Heredero	91fda1acee	reset camera	2022-06-10 18:59:59 +02:00
Rémi Heredero	697c9e659f	switch screen	2022-06-10 18:49:02 +02:00
Rémi Heredero	56d57ca17c	enemy integration done, but big bug when move	2022-06-10 16:39:50 +02:00
Rémi Heredero	1466ba041a	detect enemy	2022-06-09 21:07:13 +02:00
Rémi Heredero	876cc9192e	poslish of polish	2022-06-09 19:20:43 +02:00
Rémi Heredero	419c8ed93f	all merge done without error	2022-06-09 19:15:11 +02:00
Rémi Heredero	33be740b3d	small change	2022-06-09 18:24:25 +02:00
Rémi Heredero	8991c6efb9	Merge branch 'master' into dialog	2022-06-09 18:21:27 +02:00
Rémi Heredero	3d05c1e5fa	done	2022-06-09 17:32:47 +02:00
Fastium	0fc97ac683	new vector to display speech	2022-06-09 06:58:49 +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
Rémi Heredero	cd64313dec	add enemy but no interaction	2022-06-08 20:18:22 +02:00
Rémi Heredero	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	07e104fa88	finish implement screen	2022-06-08 18:47:33 +02:00
Fastium	d522fff056	battleScreen and testYann	2022-06-08 09:53:51 +02:00