Commit Graph

115 Commits

Author SHA1 Message Date
Victor Turgeon
0ff57d48cb Merge branch 'main' of https://github.com/MarcEricMartel/Game-Jam-A23 2023-10-10 18:29:08 -04:00
Victor Turgeon
0f501386d4 BING CHILLING 2023-10-10 18:29:06 -04:00
MarcEricMartel
4de4f43753 Merge branch 'main' of github.com:MarcEricMartel/Game-Jam-A23 2023-10-10 18:27:33 -04:00
MarcEricMartel
b244f8f08e Happy? 2023-10-10 18:27:21 -04:00
David Belisle
58bdfcfd73 Merge branch 'main' of https://github.com/MarcEricMartel/Game-Jam-A23 2023-10-10 18:17:35 -04:00
David Belisle
e62df11250 d_chandel 2023-10-10 18:17:33 -04:00
MarcEricMartel
ebb2adcc2e lol 2023-10-10 18:00:02 -04:00
MarcEricMartel
8505d6180f Stalined the comments 2023-10-10 17:29:14 -04:00
MarcEricMartel
eaf2a0f200 Merge branch 'main' of github.com:MarcEricMartel/Game-Jam-A23 2023-10-10 17:26:58 -04:00
MarcEricMartel
4d5ee6c1cd Update enemy.tscn 2023-10-10 17:26:55 -04:00
MarcEricMartel
18ac847d0f I am disabled. 2023-10-10 17:26:13 -04:00
Victor Turgeon
90e33b6728 Merge branch 'main' of https://github.com/MarcEricMartel/Game-Jam-A23 2023-10-10 17:21:41 -04:00
Victor Turgeon
17f73d9535 Bing chiLLINGIIGNGI@!!! 2023-10-10 17:21:39 -04:00
MarcEricMartel
057009acc9 Update Enemy.gd 2023-10-10 17:20:44 -04:00
MarcEricMartel
0da0aaadf0 Kniggit used double attack! 2023-10-10 17:13:43 -04:00
MarcEricMartel
94d63cd764 ubuntu? 2023-10-10 17:07:02 -04:00
MarcEricMartel
8114b979b4 se faire taper dessus et pu être en fullscreen 2023-10-10 17:03:49 -04:00
MarcEricMartel
74fa828082 Merge branch 'main' of github.com:MarcEricMartel/Game-Jam-A23 2023-10-10 16:49:44 -04:00
MarcEricMartel
014d8af7d6 FOE 2023-10-10 16:49:30 -04:00
David Belisle
f257c1f88d Merge branch 'main' of https://github.com/MarcEricMartel/Game-Jam-A23 2023-10-10 16:40:04 -04:00
David Belisle
84909f3f53 Update tileset_1.tscn 2023-10-10 16:39:56 -04:00
MarcEricMartel
bef6ae8f4e Update Enemy.gd 2023-10-10 16:32:28 -04:00
MarcEricMartel
febe1b5577 Merge branch 'main' of github.com:MarcEricMartel/Game-Jam-A23 2023-10-10 16:32:18 -04:00
MarcEricMartel
df2759ffb4 là là là 2023-10-10 16:27:06 -04:00
David Belisle
2a333b24c2 Merge branch 'main' of https://github.com/MarcEricMartel/Game-Jam-A23 2023-10-10 16:24:57 -04:00
David Belisle
9a3da23ee7 candle_begin 2023-10-10 16:24:55 -04:00
Victor Turgeon
4553419e04 Update template_spawnable.tscn 2023-10-10 15:09:24 -04:00
Victor Turgeon
abb28405da Merge branch 'main' of https://github.com/MarcEricMartel/Game-Jam-A23 2023-10-10 15:07:40 -04:00
Victor Turgeon
e393e2608c bigger bat attack 2023-10-10 15:07:35 -04:00
MarcEricMartel
85d6d620b8 Merge branch 'main' of github.com:MarcEricMartel/Game-Jam-A23 2023-10-10 15:02:53 -04:00
Victor Turgeon
6ffda00bb4 Update template_spawnable.gd 2023-10-10 15:02:48 -04:00
MarcEricMartel
6312babee0 Update Enemy.gd 2023-10-10 15:02:43 -04:00
Victor Turgeon
de268f1784 resized 2023-10-10 14:58:14 -04:00
Victor Turgeon
490964d841 Merge branch 'main' of https://github.com/MarcEricMartel/Game-Jam-A23 2023-10-10 14:54:23 -04:00
Victor Turgeon
2687a2fdfe some workable stuff 2023-10-10 14:54:21 -04:00
MarcEricMartel
7ade36434c Update Enemy.gd 2023-10-10 14:54:19 -04:00
MarcEricMartel
e69ba54126 Update Enemy.gd 2023-10-10 14:35:20 -04:00
MarcEricMartel
f64f56e88c Update enemy.tscn 2023-10-10 14:28:19 -04:00
MarcEricMartel
72f796e5c9 get_wreckd 2023-10-10 14:24:19 -04:00
Victor Turgeon
b763efc1f6 fromage de la baguette 2023-10-10 13:47:38 -04:00
Victor Turgeon
024ae6d984 Merge branch 'main' of https://github.com/MarcEricMartel/Game-Jam-A23 2023-10-10 13:36:00 -04:00
Victor Turgeon
3c9c5e0e40 bing chilling 2023-10-10 13:35:54 -04:00
David Belisle
cadd195f3a Merge branch 'main' of https://github.com/MarcEricMartel/Game-Jam-A23 2023-10-10 13:35:45 -04:00
David Belisle
886e6a3a7a bin tabarouette 2023-10-10 13:35:38 -04:00
MarcEricMartel
0f1f7802a5 Merge branch 'main' of github.com:MarcEricMartel/Game-Jam-A23 2023-10-10 13:34:36 -04:00
MarcEricMartel
30566dc395 Love thy enemy 2023-10-10 13:34:26 -04:00
Victor Turgeon
913a9992c4 Merge branch 'main' of https://github.com/MarcEricMartel/Game-Jam-A23 2023-10-10 13:30:25 -04:00
Victor Turgeon
7d2d562969 Basic bat maybe? 2023-10-10 13:30:23 -04:00
David Belisle
2b4e1854a9 Merge branch 'main' of https://github.com/MarcEricMartel/Game-Jam-A23 2023-10-10 13:14:33 -04:00
David Belisle
f9b743eee7 Level1_collision 2023-10-10 13:14:26 -04:00