|
|
311f369d66
|
|
2020-12-05 19:01:32 +01:00 |
|
|
|
3dfd9f55eb
|
Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git
|
2020-12-05 18:57:02 +01:00 |
|
|
|
786c38a825
|
|
2020-12-05 18:56:49 +01:00 |
|
|
|
86db94616f
|
Ajout invisibilité
|
2020-12-05 18:56:12 +01:00 |
|
|
|
185f274df4
|
Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020 into dev
|
2020-12-05 18:34:54 +01:00 |
|
|
|
eea02a27db
|
player run
|
2020-12-05 18:34:33 +01:00 |
|
|
|
c2f0c452ae
|
Ajout du pushback et de la perte de hp quand on touche un monstre
|
2020-12-05 18:19:03 +01:00 |
|
|
|
758f4e760a
|
sPlayerRun
|
2020-12-05 18:04:50 +01:00 |
|
|
|
c5a4ff1558
|
les monstres rebondissent contre les murs
|
2020-12-05 17:42:18 +01:00 |
|
|
|
47feaf0ccf
|
Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git
|
2020-12-05 17:28:47 +01:00 |
|
|
|
2891311aea
|
|
2020-12-05 17:28:35 +01:00 |
|
|
|
148ea2197b
|
ajout fonction check rectangle et détection d'un ennemi lors de l'attaque
|
2020-12-05 17:19:25 +01:00 |
|
|
|
e672b38824
|
room test
|
2020-12-05 17:16:51 +01:00 |
|
|
|
d3959e5f66
|
wall
|
2020-12-05 17:11:08 +01:00 |
|
|
|
d46229d418
|
Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git
|
2020-12-05 17:07:13 +01:00 |
|
|
|
e5f557c82b
|
|
2020-12-05 17:07:07 +01:00 |
|
|
|
abf1d34f18
|
maudit
|
2020-12-05 16:58:33 +01:00 |
|
|
|
1ed3e19775
|
maudit
|
2020-12-05 16:44:09 +01:00 |
|
|
|
767ebe9000
|
Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git
|
2020-12-05 16:43:22 +01:00 |
|
|
|
2fad000d4c
|
|
2020-12-05 16:41:46 +01:00 |
|
|
|
f785497372
|
Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git
|
2020-12-05 16:38:25 +01:00 |
|
|
|
ce95876b6d
|
Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git
|
2020-12-05 16:34:01 +01:00 |
|
|
|
84e62290c1
|
deplacement monstre
|
2020-12-05 16:33:57 +01:00 |
|
|
|
9cd6412cac
|
sword
|
2020-12-05 16:18:24 +01:00 |
|
|
|
2ea0418857
|
Ajout détection sprite attaque corps à corps
|
2020-12-05 16:09:52 +01:00 |
|
|
|
bd7a1411f9
|
wall
|
2020-12-05 16:07:22 +01:00 |
|
|
|
ec004c8fa2
|
orge + bougie
|
2020-12-05 15:48:34 +01:00 |
|
|
|
ab6aeb60e5
|
sword horizontal
|
2020-12-05 15:28:20 +01:00 |
|
|
|
ebf8eb9287
|
monstre melee
|
2020-12-05 14:48:00 +01:00 |
|
|
|
af7eb764a1
|
Suppression de fichiers inutiles
|
2020-12-05 14:29:38 +01:00 |
|
|
|
0d01432fc6
|
Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git
|
2020-12-05 14:28:26 +01:00 |
|
|
|
3e16da1598
|
direction joueur
|
2020-12-05 14:27:37 +01:00 |
|
|
|
7d551643b1
|
Suppression des doublons walla ça marche
|
2020-12-05 14:19:17 +01:00 |
|
|
|
4e98986533
|
Création de la branch dev et remise des sprites banane et sword
|
2020-12-05 14:10:32 +01:00 |
|
|
|
b103671109
|
|
2020-12-05 13:31:48 +01:00 |
|
|
|
44cadb81c6
|
Merge branch 'master' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020
|
2020-12-05 12:58:35 +01:00 |
|
|
|
79efb791dd
|
banana
|
2020-12-05 12:58:28 +01:00 |
|
|
|
4bfd9c8491
|
Merge branch 'master' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git
Conflicts:
objects/oPlayer/Step_0.gml
objects/oPlayer/oPlayer.yy
sprites/Purple/Purple.yy
sprites/sSword/sSword.yy
|
2020-12-05 12:56:55 +01:00 |
|
|
|
652d9e66ff
|
|
2020-12-05 12:50:56 +01:00 |
|
|
|
b1ffe3d0d7
|
|
2020-12-05 12:48:37 +01:00 |
|
|
|
219052f07c
|
sword
|
2020-12-05 12:45:29 +01:00 |
|
|
|
e11a6cc641
|
|
2020-12-04 23:09:24 +01:00 |
|
|
|
761f85dec4
|
|
2020-12-04 23:00:11 +01:00 |
|
|
|
9ffb57b99d
|
Objet Joueur
|
2020-12-04 22:55:36 +01:00 |
|
|
|
252b4353dc
|
|
2020-12-04 22:42:01 +01:00 |
|
|
|
91087c4956
|
|
2020-12-04 22:29:16 +01:00 |
|
|
|
3fe1624ea6
|
Test commit
|
2020-12-04 22:27:17 +01:00 |
|
|
|
48e2a92709
|
Merge branch 'master' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git
|
2020-12-04 22:23:05 +01:00 |
|
|
|
4139bc0e3c
|
test script
|
2020-12-04 22:23:03 +01:00 |
|
|
|
5b90d5529c
|
Test modif
|
2020-12-04 22:22:43 +01:00 |
|
