|
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 |
|
|
5d2fc4f7f0
|
arme et room finale
|
2020-12-06 17:54:25 +01:00 |
|
|
239add0c34
|
rooms x555
|
2020-12-06 17:27:28 +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 |
|
|
000e34f223
|
roomTye a accouché de 10 enfants
|
2020-12-05 22:44:27 +01:00 |
|
|
551dda3528
|
ajout d'un layer sur les rooms
|
2020-12-05 21:49:53 +01:00 |
|
|
3578b1c993
|
ajout des rooms à customiser
|
2020-12-05 21:40:36 +01:00 |
|