4
0
Fork 0
Commit graph

153 commits

Author SHA1 Message Date
sOlaris38 1ba6c89ba2 r11 2020-12-06 19:08:59 +01:00
sOlaris38 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
sOlaris38 ef3cd366ac rWin 2020-12-06 19:00:27 +01:00
rick a7f8016809 Modification sprite et hitbox trouDetect 2020-12-06 18:59:42 +01:00
rick a9a93e8a6c Ajout sprite pour détection trou 2020-12-06 18:46:42 +01:00
rick d57e7fa9a6 Changement arborescence sprite 2020-12-06 18:46:31 +01:00
rick e2b5225744 Ajout d'un trou 2020-12-06 18:43:24 +01:00
rick 2e0e64b97e Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git 2020-12-06 18:42:12 +01:00
rick ff314eae3c Suppression code inutile 2020-12-06 18:41:39 +01:00
sOlaris38 e4665c4d1a r11 2020-12-06 18:37:38 +01:00
Valsept 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
Valsept 86bda350bc monster 2020-12-06 18:23:30 +01:00
sOlaris38 4472db8523 r11 2020-12-06 18:20:29 +01:00
sOlaris38 078e212929 ré&glages des confltis 2020-12-06 18:16:32 +01:00
sOlaris38 714f7d9cd6 Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git
Conflicts:
	objects/oTransition/oTransition.yy
2020-12-06 17:59:32 +01:00
sOlaris38 6ecd407aef conflit transition 2020-12-06 17:57:27 +01:00
sOlaris38 5d2fc4f7f0 arme et room finale 2020-12-06 17:54:25 +01:00
Valsept f8fbc29553 final room 2020-12-06 17:52:53 +01:00
Valsept ce9e1efa89 r6 2020-12-06 17:39:05 +01:00
sOlaris38 b10eeb3956 Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git 2020-12-06 17:29:04 +01:00
sOlaris38 39efb8c09f transition modifié 2020-12-06 17:28:28 +01:00
Valsept 239add0c34 rooms x555 2020-12-06 17:27:28 +01:00
sOlaris38 8134191c10 écran game over 2020-12-06 17:05:26 +01:00
sOlaris38 f92fda29f9 carte fonctionnelle 2020-12-06 16:25:20 +01:00
Valsept 5206649374 salles x2 2020-12-06 16:21:23 +01:00
rick eb57c2d7c9 Modification code attaque 2020-12-06 15:50:42 +01:00
rick eb831d9778 Ajout monstres et joueurs pour tests 2020-12-06 15:50:27 +01:00
rick c3325447c8 Modification point central sprite blob 2020-12-06 15:50:13 +01:00
sOlaris38 2a23798c85 correction transition 2020-12-06 14:59:53 +01:00
sOlaris38 8f2c476d6d rework des rooms 2020-12-06 14:45:39 +01:00
sOlaris38 e674951e22 objet transition 2020-12-06 14:34:06 +01:00
rick 3c8e8dfd6a Ajout code animation lors attaque joueur 2020-12-06 14:31:54 +01:00
rick d6c4b3411c Modification ordre animation attaque joueur 2020-12-06 14:31:42 +01:00
sOlaris38 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
sOlaris38 de727a58ae 2020-12-06 14:10:27 +01:00
rick c3cec50772 Patch bug attaque & remise du sprite d'attaque 2020-12-06 14:09:19 +01:00
sOlaris38 9ffe1aa046 room et timer 2020-12-06 14:02:23 +01:00
Valsept 9f203efdb7 trou2 + r10 2020-12-06 13:57:57 +01:00
sOlaris38 b1d8770ff1 grille de oGame 2020-12-06 13:17:04 +01:00
sOlaris38 2ec02f2fe3 Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git 2020-12-06 12:57:41 +01:00
Valsept d06b71f4b8 wodeen?bodx 2020-12-06 12:57:24 +01:00
sOlaris38 f9dffe68f1 profondeur des instances 2020-12-06 12:57:05 +01:00
sOlaris38 18dafe2f07 animation d'attaque de retour 2020-12-06 12:51:29 +01:00
rick f8f5f7952a Ajout recul sur monstre lors attaque joueur 2020-12-06 12:38:35 +01:00
Valsept 441845b52d sbox 2020-12-06 12:29:17 +01:00
Valsept 0029b6f6d1 Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git 2020-12-06 12:25:43 +01:00
rick 11c4ad3b32 Modification de la box de collision pour sPlayer er sPlayerRun 2020-12-06 12:23:41 +01:00
Valsept 00c4ba547e Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git 2020-12-06 12:16:38 +01:00
sOlaris38 ac6eb14426 animation d'attaque 2020-12-06 02:23:19 +01:00
Valsept e0edba8c58 debut de tableau 2020-12-06 01:04:50 +01:00