Commit Graph

76 Commits

Author SHA1 Message Date
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
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