Commit Graph

47 Commits

Author SHA1 Message Date
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 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 f05c027d94
2023-01-03 20:59:17 -07:00
dukegoobler ed199a6936 heart end scene for Jackie dialog 2023-01-03 19:08:45 -07:00
Spencer Killen 1ac954e290
obelisk 2023-01-03 02:13:18 -07:00
dukegoobler 720f010b61 obelisk drone 2023-01-03 01:08:11 -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 2ef1742dc6 obelisk 2023-01-03 00:07:23 -07:00
Spencer Killen 22ac0db4aa
add float 2023-01-02 23:34:50 -07:00
dukegoobler 4576c868d0 audio tweak to tentacle 2023-01-02 22:39:43 -07:00
dukegoobler f23ba45db7 tentacles added to level.tscn 2023-01-02 22:37:54 -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 06542eed2c
Add debug tools for FPS 2022-12-30 11:56:41 -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
Spencer Killen 7f43cd00b3
Meddle with ground squish amounts 2022-12-29 14:09:36 -07:00
dukegoobler 322354d144 side_tunnel_1 black boxes moved
distributed the black boxes more evenly throughout the map plus other minor tweaks to level design
2022-12-29 00:38:09 -07:00
dukegoobler 81e5620cc1 tweaked test_titlescreen_planet
rotated planet so that texture seams are less visible, added new material and texture for meat planet render
2022-12-28 23:01:29 -07:00
dukegoobler b797c54f5d test title screen with meat planet 2022-12-28 20:24:20 -07:00
dukegoobler 25bb3fce36 tentacle clusters for decorating 2022-12-28 18:16:01 -07:00
dukegoobler 2ae781cc7d Merge branch 'master' of https://git.sjkillen.ca/sjkillen/meat_madness_redux 2022-12-28 17:55:50 -07:00
Spencer Killen 1f0663f39d
Fix focus order for buttons on end screen 2022-12-28 17:52:46 -07:00
dukegoobler 75f56c076a Second meat tentacle
added meat tentacle models with anims
2022-12-28 17:48:08 -07:00
Spencer Killen 6bd864eee4
Merge conflicts 2022-12-28 17:12:21 -07:00
dukegoobler 86c14e487c meat tentacle
meat tentacle models and anims
2022-12-28 17:05:22 -07:00
dukegoobler b1c1bd6810 meat tentacle
added meat tentacle model and animation
2022-12-28 16:58:56 -07:00
Spencer Killen 3cfb54c14f
meat creek 2022-12-28 16:53:17 -07:00
Spencer Killen ba02781ce0
sound design 2022-12-27 20:06:15 -07:00
Spencer Killen a63c8e03e9
various fixes 2022-12-27 13:24:35 -07:00
Spencer Killen 1e23547ab8
lessen the fog 2022-12-26 11:44:13 -07:00
Spencer Killen e28d880025
Work on meatcreek 2022-12-26 11:18:31 -07:00
dukegoobler cb4b147516 Finished cosmetic UI overhaul
New dialogic themes, choice buttons, and dialog tweaks for intro, credits, and controls boxes
2022-12-22 16:37:10 -07:00
Spencer Killen effbe7dc83
Fix walkie talkie screen 2022-12-05 09:46:58 -07:00
Spencer Killen 272fcc390f
Add some walkie talkie sounds 2022-12-04 19:20:58 -07:00
Spencer Killen 13c962b8f6
Add a walkie talkie 2022-12-04 18:23:46 -07:00
Spencer Killen c7f48f9fd3
port more things over from jam code 2022-11-27 19:55:11 -07:00
Spencer Killen 1ff01b01da
Polish meat elevator 2022-11-27 17:25:59 -07:00
Spencer Killen e19680de04
Reconfigure repo to use LFS 2022-11-27 13:31:09 -07:00