Commit Graph

151 Commits

Author SHA1 Message Date
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
dukegoobler 67e2c63ad3 added meat madness icon, dialogic tweaks 2022-12-29 22:29:31 -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 a7d3815a07
Merge branch 'master' into spencer 2022-12-29 14:11:15 -07:00
Spencer Killen 0469bdcd6a
Merge remote-tracking branch 'origin/master' into spencer 2022-12-29 14:11:07 -07:00
Spencer Killen 1331322d8a
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/meat_madness_redux 2022-12-29 14:10:24 -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 096cd17393 pause screen fix
pause screen pause overlay was unusable with mouse, changed pause mode to process to fix
2022-12-28 23:17:44 -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 a1412c198e repeat of last 2022-12-28 18:37:20 -07:00
dukegoobler 3f004e1746 meat cluster tweaks for meat creek 2022-12-28 18:31:34 -07:00
dukegoobler c8fd449e14 added meat tentacle clusters to meat creek 2022-12-28 18:24:25 -07:00
dukegoobler 25bb3fce36 tentacle clusters for decorating 2022-12-28 18:16:01 -07:00
dukegoobler 436c929524 update side tunnel 1
trying to push again
2022-12-28 18:00:35 -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