Commit Graph

107 Commits

Author SHA1 Message Date
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
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 728f37803b
Merge branch 'spencer' 2022-12-28 16:53:42 -07:00
Spencer Killen 3cfb54c14f
meat creek 2022-12-28 16:53:17 -07:00
Spencer Killen 729f122b35
Add bottom to creek platform 2022-12-28 11:21:26 -07:00
Spencer Killen fc8c1e47b6
Merge branch 'spencer' 2022-12-28 10:37:55 -07:00
Spencer Killen 7bd52b4507
Add ground gravity 2022-12-28 10:37:27 -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 dc5fbbcde0 Merge pull request 'spencer' (#7) from spencer into master
Reviewed-on: #7
2022-12-26 18:45:24 +00:00
Spencer Killen d8dc798a7b
2022-12-26 11:45:02 -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
Spencer Killen 36d4d61c89
meat creek work 2022-12-22 20:33:55 -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
dukegoobler a6f07dad9a New UI theme and menu tweaks
Added new button assets and reskinned the default UI theme. Pause menu has its own theme also.
2022-12-20 14:50:01 -07:00
Spencer Killen 60f2ccd4f9
Fix meat creek mesh and pause screen path 2022-12-20 13:27:51 -07:00
dukegoobler 36794b13f0 Merge branch 'master' of https://git.sjkillen.ca/sjkillen/meat_madness_redux 2022-12-20 13:16:32 -07:00
Spencer Killen 9b8ebcdc84 Update REAMDE.md 2022-12-20 20:01:17 -07:00
vengefulcartographer b5df884dcb Pause Screen
Added the old pause screen overlay to the Player scene, dialogic functionality not yet smoothed out
2022-12-20 12:16:37 -07:00
Spencer Killen fd50b67fa8
work on meat creek 2022-12-17 11:21:28 -07:00
Spencer Killen d9e466b9ac
work on meat creek 2022-12-16 23:08:50 -07:00
Spencer Killen 85c1a8b5f6
add downscaled meatpics 2022-12-16 22:24:45 -07:00
Spencer Killen 50734cc9be
Draft a level design 2022-12-11 19:27:42 -07:00
Spencer Killen 103b3bf74a
Fix FOV and sink block 2022-12-11 18:07:05 -07:00
Spencer Killen dc7e309ef2
fixup 2022-12-11 17:18:29 -07:00
Spencer Killen 04cec5149a
!fixup 2022-12-11 17:10:07 -07:00
Spencer Killen 98c0177df2
Tuning player controller 2022-12-11 17:02:57 -07:00
Spencer Killen ec8dd43b1f
improve player controls 2022-12-11 12:59:18 -07:00
Spencer Killen 48e807f7cd
player movement tuning 2022-12-11 12:23:58 -07:00
Spencer Killen aef8a4b09c
2022-12-06 22:42:02 -07:00
ncusimano 8eb9326dbd Lol 2022-12-05 17:38:39 -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 cee84f3999
adjust npc scale 2022-12-04 13:01:53 -07:00
Spencer Killen 857b14450d
Add va_shader_example.txt 2022-12-03 14:23:32 -07:00
Spencer Killen 32ec76562b
Add wall struggler 2022-12-03 14:15:53 -07:00
Spencer Killen b121134119
Mark LFS files as lockable 2022-12-02 19:40:12 -07:00
Spencer Killen c2109aed47
play around with stuck in wall animation 2022-12-02 19:31:05 -07:00
Spencer Killen 16128e4f8f
Add npcs.blend 2022-12-01 20:02:09 -07:00
Spencer Killen b7cb807510
Ignore useless file 2022-11-29 18:57:53 -07:00
Spencer Killen 70d88bb040
Add shader for backfaces of sink blocks 2022-11-29 18:18:57 -07:00
Spencer Killen c5df54cab5
Add falling test 2022-11-27 21:06:36 -07:00