Commit Graph

26 Commits

Author SHA1 Message Date
Spencer Killen d49a7ddaca
Merge branch 'spencer' 2023-01-03 23:20:44 -07:00
dukegoobler 31b4543fbb dialog fixes 2023-01-03 23:20:15 -07:00
Spencer Killen 9db476acf3
too much 2023-01-03 23:20:07 -07:00
Spencer Killen 410f9cbc7d
curve bridge 2023-01-03 22:43:26 -07:00
Spencer Killen 471e7017ca
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/meat_madness_redux 2023-01-03 22:36:38 -07:00
Spencer Killen 2694f5d213
new bridge 2023-01-03 22:35:52 -07:00
dukegoobler 717f1a90b2 level lee 2023-01-03 22:10:07 -07:00
dukegoobler b7623976a1 new tentacle sounds 2023-01-03 21:37:35 -07:00
Spencer Killen df39c04a87
Merge remote-tracking branch 'origin/master' into spencer 2023-01-03 21:07:53 -07:00
dukegoobler 5252bc759c spiral 2023-01-03 21:07:01 -07:00
Spencer Killen f05c027d94
2023-01-03 20:59:17 -07:00
Spencer Killen d252d4cfe6
sink blocks 2023-01-03 13:19:39 -07:00
Spencer Killen a0fbb8180f
2023-01-03 12:20:47 -07:00
Spencer Killen f7e82a2741
NPCs 2023-01-03 11:35:05 -07:00
Spencer Killen d0405f4ef1
rename timelines and stuff 2023-01-03 01:54:59 -07:00
Spencer Killen 274c6db5bd
a 2023-01-03 00:11:47 -07:00
Spencer Killen 2c2e5df6c7
Glide 2023-01-02 23:18:07 -07:00
Spencer Killen 303daf9f46
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/meat_madness_redux 2023-01-02 22:43:51 -07:00
Spencer Killen 379641a7cd
fix falling through level 2023-01-02 22:43:35 -07:00
dukegoobler 07824adc46 moved tentacles again lol 2023-01-02 22:41:12 -07:00
Spencer Killen 8fbe388ad3
Merge remote-tracking branch 'origin/master' into spencer 2023-01-02 22:38:54 -07:00
dukegoobler f23ba45db7 tentacles added to level.tscn 2023-01-02 22:37:54 -07:00
Spencer Killen e01cb357c8
Merge remote-tracking branch 'origin/master' into spencer 2023-01-02 22:36:14 -07:00
Spencer Killen d154e6abc2
NPCs 2023-01-02 22:35:37 -07:00
dukegoobler ffe2c7f19f chapter select + new end screen 2023-01-02 22:13:52 -07:00
Spencer Killen af78e7c2bc
start of main tunnel 2023-01-02 19:34:04 -07:00