4
0
Fork 0
Commit graph

7 commits

Author SHA1 Message Date
e4665c4d1a r11 2020-12-06 18:37:38 +01:00
772b3fcce5 Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git
Conflicts:
	Surprise Dungeon.yyp
	rooms/r7/r7.yy
2020-12-06 18:24:05 +01:00
078e212929 ré&glages des confltis 2020-12-06 18:16:32 +01:00
eb831d9778 Ajout monstres et joueurs pour tests 2020-12-06 15:50:27 +01:00
2a23798c85 correction transition 2020-12-06 14:59:53 +01:00
8f2c476d6d rework des rooms 2020-12-06 14:45:39 +01:00
9ffe1aa046 room et timer 2020-12-06 14:02:23 +01:00