Commit Graph

121 Commits

Author SHA1 Message Date
Spencer Killen 842d58ad22
Merge branch 'spencer' 2023-01-03 02:14:00 -07:00
Spencer Killen 97b5e2e17b
elevator dialogue 2023-01-03 02:13:53 -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 84d97e8ae5 obelisk theme 2023-01-03 00:32:44 -07:00
dukegoobler 6010118331 obelisk theme update 2023-01-03 00:32:05 -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 3e7b767dff
NPCs 2023-01-02 23:50:59 -07:00
Spencer Killen d795e6efd8
flashlight_seconds 2023-01-02 23:48:46 -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
dukegoobler bd9afc4a3e Voss and Gravin, menu changes 2023-01-02 21:23:51 -07:00
Spencer Killen 5edabdea9a
Merge remote-tracking branch 'origin/master' into spencer 2023-01-02 19:34:34 -07:00
Spencer Killen af78e7c2bc
start of main tunnel 2023-01-02 19:34:04 -07:00
dukegoobler 624e4f9dab alexis manos dialog 2023-01-02 17:38:39 -07:00
dukegoobler 521c516f73 dialogic push 2023-01-02 17:16:32 -07:00
dukegoobler c9081e1990 ending dialog tweak 2023-01-01 23:53:35 -07:00
dukegoobler ddf845e2ff blackbox dialog and meat creek brimley 2023-01-01 23:51:36 -07:00
dukegoobler 47f94bac1c updated controller input for walkie 2023-01-01 19:00:36 -07:00
dukegoobler dad272afc4 intro dialog fix plus ending dialog
also includes tweaks to controls, credits
2023-01-01 16:55:01 -07:00
dukegoobler 1c65f5724d new intro dialog
revised intro
2023-01-01 15:57:47 -07:00
dukegoobler a35dffc622 subtle flashlight flicker 2022-12-30 15:17:26 -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
Spencer Killen d9e5ce4a61
Undo transform on sink block 2022-12-30 11:42:12 -07:00
dukegoobler 57113f8c6d controls dialog tweak 2022-12-29 23:24:59 -07:00