Commit Graph

184 Commits

Author SHA1 Message Date
Spencer Killen 46e8c96590
a 2023-01-04 20:16:12 -07:00
Spencer Killen 45710612b2
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/meat_madness_redux 2023-01-04 20:04:45 -07:00
Spencer Killen 4b477713d6
controller related bugs 2023-01-04 20:04:33 -07:00
dukegoobler d571475668 alexis tweak plus some end dialog 2023-01-04 20:03:05 -07:00
Spencer Killen 2f2894e656
NPC death 2023-01-04 19:25:46 -07:00
dukegoobler b54053507a level tweaks 2023-01-04 19:24:53 -07:00
Spencer Killen 2c2d7507bb
Merge remote-tracking branch 'origin/master' into spencer 2023-01-04 19:09:55 -07:00
Spencer Killen 28e4cf2129
intro scene 2023-01-04 19:00:50 -07:00
dukegoobler 619f18fde3 mouse focus dialog
new dialog choice buttons, mouse focus fix
2023-01-04 18:48:09 -07:00
dukegoobler 19391f2aca push 2023-01-04 18:18:46 -07:00
dukegoobler a3bbc7ea24 heaven dialog theme 2023-01-04 17:27:06 -07:00
dukegoobler e7fc4d3199 meat heaven and invis button 2023-01-04 16:52:23 -07:00
Spencer Killen 8c3d38b704
remove boot screen 2023-01-04 13:46:52 -07:00
Spencer Killen 4b39437d36
Merge branch 'spencer' 2023-01-04 13:39:37 -07:00
Spencer Killen ea7726efdc
foo 2023-01-04 13:39:28 -07:00
Spencer Killen 16e10fd007
Merge branch 'spencer' 2023-01-04 12:49:33 -07:00
Spencer Killen ccdde928fc
. 2023-01-04 12:49:31 -07:00
Spencer Killen 1db4c70dc5
. 2023-01-04 12:49:02 -07:00
Spencer Killen a0a559c4ca
. 2023-01-04 11:27:39 -07:00
Spencer Killen 3fc696591c
Add chapter 3 2023-01-04 10:23:03 -07:00
Spencer Killen 5b347ee250
alexis level 2023-01-04 10:10:01 -07:00
Spencer Killen 48f034a85c
_parameters 2023-01-04 02:31:56 -07:00
Spencer Killen 0e30685d8f
controls page 2023-01-04 01:43:35 -07:00
Spencer Killen 9bda7685a1
oob 2023-01-04 00:36:31 -07:00
Spencer Killen ce2677962e
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/meat_madness_redux 2023-01-04 00:27:54 -07:00
Spencer Killen 0945e9f3df
barriers 2023-01-04 00:27:24 -07:00
dukegoobler 72a2cd0ca4 more level tweaks 2023-01-04 00:27:20 -07:00
Spencer Killen 3431100b5f
barriers 2023-01-04 00:27:01 -07:00
dukegoobler a1c2ecb2fa all modules but alexis 2023-01-04 00:16:31 -07:00
Spencer Killen b92bfd33a3
Merge branch 'spencer' 2023-01-03 23:49:59 -07:00
Spencer Killen 0aa50e4ee1
j 2023-01-03 23:49:23 -07:00
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 00cafbf810
curve bridge 2023-01-03 22:44:38 -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 0e32845387
new bridge 2023-01-03 22:36:11 -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 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