Commit graph

129 commits

Author SHA1 Message Date
471e7017ca
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/meat_madness_redux 2023-01-03 22:36:38 -07:00
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
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
f05c027d94
2023-01-03 20:59:17 -07:00
1d020b5be4
FOV 2023-01-03 20:39:51 -07:00
dukegoobler
87f7a1b4c8 music for end screens 2023-01-03 19:40:21 -07:00
dukegoobler
2343a4ac4a end dialog fixed 2023-01-03 19:30:14 -07:00
dukegoobler
49c50c0baa escape ending 2023-01-03 19:24:58 -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
2bca815950
aaa 2023-01-03 18:45:00 -07:00
07d787e6c2
add madness 2023-01-03 18:16:48 -07:00
c984f0f21e
revamp shader 2023-01-03 17:48:25 -07:00
dukegoobler
ba1409217c gameover screen and end screen edit 2023-01-03 17:08:43 -07:00
f240651ef2
meat painting 2023-01-03 17:01:52 -07:00
9d9c7cd868
Guy float 2023-01-03 16:40:35 -07:00
b33b754954
Merge remote-tracking branch 'origin/master' into spencer 2023-01-03 16:34:47 -07:00
ff268061d9
floating 2023-01-03 16:32:59 -07:00
dukegoobler
83381f8311 glider dialog meat bore 2023-01-03 15:34:24 -07:00
f201a2182c
a 2023-01-03 14:35:40 -07:00
d252d4cfe6
sink blocks 2023-01-03 13:19:39 -07:00
a0fbb8180f
2023-01-03 12:20:47 -07:00
f7e82a2741
NPCs 2023-01-03 11:35:05 -07:00
1ac954e290
obelisk 2023-01-03 02:13:18 -07:00
6634319a8d
Merge branch 'spencer' 2023-01-03 01:55:13 -07:00
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
ce3f9dd5e5
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/meat_madness_redux 2023-01-03 00:12:05 -07:00
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
d795e6efd8
flashlight_seconds 2023-01-02 23:48:46 -07:00
22ac0db4aa
add float 2023-01-02 23:34:50 -07:00
dukegoobler
5782bbc2c3 elevator dialog 2023-01-02 23:21:46 -07:00
2c2e5df6c7
Glide 2023-01-02 23:18:07 -07:00
303daf9f46
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/meat_madness_redux 2023-01-02 22:43:51 -07:00
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
040186be38
Merge remote-tracking branch 'origin/master' into spencer 2023-01-02 22:40:02 -07:00