|
b3c996cc58
|
Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git
Conflicts:
Surprise Dungeon.yyp
sprites/sTrou/sTrou.yy
|
2020-12-06 19:03:44 +01:00 |
|
|
ef3cd366ac
|
rWin
|
2020-12-06 19:00:27 +01:00 |
|
|
d57e7fa9a6
|
Changement arborescence sprite
|
2020-12-06 18:46:31 +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 |
|
|
5b62c52bf9
|
troumod
|
2020-12-06 00:08:57 +01:00 |
|
|
80aa694705
|
finaltrou
|
2020-12-05 23:52:23 +01:00 |
|
|
266776c871
|
vrai true
|
2020-12-05 23:35:36 +01:00 |
|