4
0
Fork 0
Commit graph

75 commits

Author SHA1 Message Date
966f6e37d4 Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020 into dev 2020-12-06 20:39:12 +01:00
27d8fccf19 rooms 2020-12-06 20:37:08 +01:00
1a50760b59 Patch Son et modification hit (knockback doit etre ajouté manuellement) 2020-12-06 20:33:37 +01:00
5f043ff63e Ajout du sprite spécial sur le sprite des flammes 2020-12-06 20:11:41 +01:00
b42dd58782 Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git
Conflicts:
	Surprise Dungeon.yyp
2020-12-06 20:01:54 +01:00
762161ef85 sons 2020-12-06 19:58:53 +01:00
5fbfcfb355 Création d'un objet pour gérer le contact des flammes avec le joueur 2020-12-06 19:57:10 +01:00
338c224824 Modification arborescence objet 2020-12-06 19:56:12 +01:00
3d5da905be ajout coffre 2020-12-06 19:15:50 +01:00
1ba6c89ba2 r11 2020-12-06 19:08:59 +01:00
a9a93e8a6c Ajout sprite pour détection trou 2020-12-06 18:46:42 +01:00
e2b5225744 Ajout d'un trou 2020-12-06 18:43:24 +01:00
e4665c4d1a r11 2020-12-06 18:37:38 +01:00
86bda350bc monster 2020-12-06 18:23:30 +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
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
9ffe1aa046 room et timer 2020-12-06 14:02:23 +01:00
9f203efdb7 trou2 + r10 2020-12-06 13:57:57 +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
00c4ba547e Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git 2020-12-06 12:16:38 +01:00
e0edba8c58 debut de tableau 2020-12-06 01:04:50 +01:00
2f601cea92 sprite attack 2020-12-06 01:03:17 +01:00
0efb42d426 ogame 2020-12-06 00:44:46 +01:00
fa5b340660 coffre 2020-12-06 00:18:05 +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
000e34f223 roomTye a accouché de 10 enfants 2020-12-05 22:44:27 +01:00
9e7fdc05f4 Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git 2020-12-05 22:20:47 +01:00
3079018adf 2020-12-05 22:20:44 +01:00
87a140a052 oGame est de retour 2020-12-05 22:16:08 +01:00
3578b1c993 ajout des rooms à customiser 2020-12-05 21:40:36 +01:00
be78b81622 sWalls 2020-12-05 21:22:53 +01:00
0f2ac16467 fire 2020-12-05 21:05:45 +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
66afe0d3df stone 2020-12-05 20:23:24 +01:00
90e7d081f8 Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git 2020-12-05 20:06:13 +01:00
f691201874 Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git 2020-12-05 20:04:50 +01:00
ce19e17f4a Ajout du fichier pour les macros 2020-12-05 20:04:35 +01:00
c541c67f73 Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git 2020-12-05 19:56:22 +01:00