4
0
Fork 0
Commit graph

85 commits

Author SHA1 Message Date
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
a7f8016809 Modification sprite et hitbox trouDetect 2020-12-06 18:59:42 +01:00
a9a93e8a6c Ajout sprite pour détection trou 2020-12-06 18:46:42 +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
5d2fc4f7f0 arme et room finale 2020-12-06 17:54:25 +01:00
c3325447c8 Modification point central sprite blob 2020-12-06 15:50:13 +01:00
e674951e22 objet transition 2020-12-06 14:34:06 +01:00
d6c4b3411c Modification ordre animation attaque joueur 2020-12-06 14:31:42 +01:00
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
de727a58ae 2020-12-06 14:10:27 +01:00
c3cec50772 Patch bug attaque & remise du sprite d'attaque 2020-12-06 14:09:19 +01:00
9ffe1aa046 room et timer 2020-12-06 14:02:23 +01:00
9f203efdb7 trou2 + r10 2020-12-06 13:57:57 +01:00
b1d8770ff1 grille de oGame 2020-12-06 13:17:04 +01:00
2ec02f2fe3 Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git 2020-12-06 12:57:41 +01:00
d06b71f4b8 wodeen?bodx 2020-12-06 12:57:24 +01:00
f9dffe68f1 profondeur des instances 2020-12-06 12:57:05 +01:00
18dafe2f07 animation d'attaque de retour 2020-12-06 12:51:29 +01:00
441845b52d sbox 2020-12-06 12:29:17 +01:00
11c4ad3b32 Modification de la box de collision pour sPlayer er sPlayerRun 2020-12-06 12:23:41 +01:00
ac6eb14426 animation d'attaque 2020-12-06 02:23:19 +01:00
2f601cea92 sprite attack 2020-12-06 01:03:17 +01:00
7a22bb7d44 vitesse du joueur 2020-12-06 00:28:12 +01:00
bacd9b26d1 la meme en mieux x.x 2020-12-06 00:27:05 +01:00
44508b72a5 bo coffreee 2020-12-06 00:24:43 +01:00
fa5b340660 coffre 2020-12-06 00:18:05 +01:00
d4cad1a99e oPlayer 2020-12-06 00:12:53 +01:00
5b62c52bf9 troumod 2020-12-06 00:08:57 +01:00
60f3b0b010 Changement d'emplacement dans l'arborescence pour sMaudit 2020-12-06 00:01:28 +01:00
96632440e9 Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git 2020-12-05 23:54:29 +01:00
3749e832e8 sprites améliorés 2020-12-05 23:54:06 +01:00
80aa694705 finaltrou 2020-12-05 23:52:23 +01:00
a94e2e1dae Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020 into dev 2020-12-05 23:37:10 +01:00
266776c871 vrai true 2020-12-05 23:35:36 +01:00
d3f18e1d72 sprite blob 2020-12-05 23:29:50 +01:00
b896f86547 sprite des mosntres 2020-12-05 23:11:49 +01:00
db80dcc29e Modification de la box de collision 2020-12-05 22:12:19 +01:00
3578b1c993 ajout des rooms à customiser 2020-12-05 21:40:36 +01:00
73db500901 feufinal 2020-12-05 21:24:41 +01:00
be78b81622 sWalls 2020-12-05 21:22:53 +01:00
0f2ac16467 fire 2020-12-05 21:05:45 +01:00
1fd5afbd66 realfinalstone 2020-12-05 20:41:40 +01:00
49b691aad3 tileset 2020-12-05 20:37:31 +01:00
ef84361045 Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git 2020-12-05 20:28:34 +01:00
6fd26b6ff7 tileset 2020-12-05 20:28:12 +01:00
2fb4d23e18 stonefinal 2020-12-05 20:27:31 +01:00
66afe0d3df stone 2020-12-05 20:23:24 +01:00