Commit Graph

85 Commits

Author SHA1 Message Date
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
dukegoobler 2b021e2f43 Merge branch 'master' of https://git.sjkillen.ca/sjkillen/meat_madness_redux 2023-01-03 19:09:22 -07:00
dukegoobler ed199a6936 heart end scene for Jackie dialog 2023-01-03 19:08:45 -07:00
Spencer Killen 2bca815950
aaa 2023-01-03 18:45:00 -07:00
Spencer Killen 07d787e6c2
add madness 2023-01-03 18:16:48 -07:00
Spencer Killen f240651ef2
meat painting 2023-01-03 17:01:52 -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 1ac954e290
obelisk 2023-01-03 02:13:18 -07:00
Spencer Killen 6634319a8d
Merge branch 'spencer' 2023-01-03 01:55:13 -07:00
Spencer Killen d0405f4ef1
rename timelines and stuff 2023-01-03 01:54:59 -07:00
dukegoobler d0ae692a72 updated credits 2023-01-03 01:18:38 -07:00
dukegoobler 16b04d4b3c final obelisk 2023-01-03 01:09:35 -07:00
dukegoobler 720f010b61 obelisk drone 2023-01-03 01:08:11 -07:00
dukegoobler c271f98cc6 more dialog box tweaks 2023-01-03 00:26:38 -07:00
dukegoobler d6547d5d1f tweak dialog trigger box sizes 2023-01-03 00:24:30 -07:00
dukegoobler be54919d93 dialog trigger tweak 2023-01-03 00:20:41 -07:00
dukegoobler b7ebc03b0a dialog trigger fix 2023-01-03 00:16:38 -07:00
Spencer Killen ce3f9dd5e5
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/meat_madness_redux 2023-01-03 00:12:05 -07:00
Spencer Killen 274c6db5bd
a 2023-01-03 00:11:47 -07:00
dukegoobler bbcb4140bf obelisk 2023-01-03 00:07:33 -07:00
dukegoobler 2ef1742dc6 obelisk 2023-01-03 00:07:23 -07:00
Spencer Killen 22ac0db4aa
add float 2023-01-02 23:34:50 -07:00
dukegoobler 5782bbc2c3 elevator dialog 2023-01-02 23:21:46 -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 040186be38
Merge remote-tracking branch 'origin/master' into spencer 2023-01-02 22:40:02 -07:00
dukegoobler 4576c868d0 audio tweak to tentacle 2023-01-02 22:39:43 -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
dukegoobler afcb3bb146 flashlight and level tweaks
also added creak sfx for tentacles and cleaned up an obsolete script for moving platforms
2022-12-30 14:56:17 -07:00
Spencer Killen 539db63c44
Optimize platforms 2022-12-30 13:00:07 -07:00
Spencer Killen 2a65df8279
Add subtle bobbling to platforms 2022-12-30 12:49:08 -07:00
Spencer Killen 06542eed2c
Add debug tools for FPS 2022-12-30 11:56:41 -07:00
dukegoobler 5427050fb5 pause screen fix again
fixed a mouse capture issue with the overlays in Player plus other tweaks
2022-12-29 21:19:58 -07:00
dukegoobler 80d9ff93c5 animation/movement for meat creek platforms
added an animation for the platforms in meat creek to increase difficulty and add more life to map
2022-12-29 16:03:56 -07:00
Spencer Killen 0469bdcd6a
Merge remote-tracking branch 'origin/master' into spencer 2022-12-29 14:11:07 -07:00