10 commits

Author	SHA1	Message	Date
sOlaris38	078e212929	ré&glages des confltis	2020-12-06 18:16:32 +01:00
sOlaris38	6ecd407aef	conflit transition	2020-12-06 17:57:27 +01:00
sOlaris38	5d2fc4f7f0	arme et room finale	2020-12-06 17:54:25 +01:00
sOlaris38	b10eeb3956	Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git	2020-12-06 17:29:04 +01:00
sOlaris38	39efb8c09f	transition modifié	2020-12-06 17:28:28 +01:00
Valsept	239add0c34	rooms x555	2020-12-06 17:27:28 +01:00
sOlaris38	f92fda29f9	carte fonctionnelle	2020-12-06 16:25:20 +01:00
sOlaris38	2a23798c85	correction transition	2020-12-06 14:59:53 +01:00
sOlaris38	e674951e22	objet transition	2020-12-06 14:34:06 +01:00
sOlaris38	54af0fd242	Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git ... Conflicts: sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy	2020-12-06 14:13:53 +01:00