Commit Graph

Select branches

Hide Pull Requests

main

wip/broken

wip/snider

Mono Color

• f2ea3067c1 Level: Fix collisions main snider 2023-11-27 23:53:27 -08:00
• 028b4b4a21 Final commit for the jam akshay 2022-08-21 16:08:48 -04:00
• 9f74ab447b Merge branch 'main' of https://git.mrdanielsnider.com/snider/project-dung akshay 2022-08-21 15:32:54 -04:00
• 23dfc3bb72 Updated rover game with everything it needs akshay 2022-08-21 15:32:47 -04:00
• 8c45591df9 Add circle timer snider 2022-08-21 12:07:27 -07:00
• 79f41e7a41 Updated the total time to play rover game akshay 2022-08-21 14:52:32 -04:00
• 841dfa7722 Updated rover game timer UI akshay 2022-08-21 14:51:34 -04:00
• bb4da72c47 Added status lights on power station. Adjusted the crafting bench item holder positions akshay 2022-08-21 14:42:40 -04:00
• 5fca5d0a04 Updated level asset. Moved books to correct places akshay 2022-08-21 14:11:19 -04:00
• ed4321243a Merge branch 'main' of https://git.mrdanielsnider.com/snider/project-dung akshay 2022-08-21 14:02:10 -04:00
• 571a7b0676 Added a book scene that triggers dialogic events. Also added the end game dialogic akshay 2022-08-21 14:02:00 -04:00
• e2e780631a Lock camera rotation in center room snider 2022-08-21 10:50:03 -07:00
• 5d290b4b9b Added initial dialog when you enter the RTG area for the first time akshay 2022-08-21 13:12:23 -04:00
• 782d6fb114 Updated the level assets. Updated pause menu to have the map akshay 2022-08-21 12:37:14 -04:00
• ba3c1b6055 Fixed bug with starve and day end dialogs stomping on each other akshay 2022-08-21 12:13:33 -04:00
• ef7a22a980 Added new intro and adjusted camera to start in the bedroom akshay 2022-08-21 11:33:03 -04:00
• ed794b26f2 Updated stomach texture akshay 2022-08-21 11:16:53 -04:00
• fc58d4590f Added new HUD for bed timer akshay 2022-08-21 10:16:24 -04:00
• 2bd6bc1c4e Added new font. Created main menu and completed the game loop. Added bounce on item balloons akshay 2022-08-21 01:53:37 -04:00
• 50ab2c2579 Update Rover rocks to have Geode mesh akshay 2022-08-21 00:13:06 -04:00
• 8683916588 Updated item balloon asset and adjusted the item anchor on it akshay 2022-08-20 23:37:31 -04:00
• 002ffef1e8 Added the item balloons to show on broken machines akshay 2022-08-20 23:02:40 -04:00
• 5e857e478e Updated item_generator code to emit gen started/finished signals. hooked up level to play drill animations though the anim player is missing the actual animation akshay 2022-08-20 20:41:31 -04:00
• e433f3851b Added new item assets and updated item holder placements. Also updated rover game loot table to only give Geodes but varying quantities. Big commit. my bad. akshay 2022-08-20 19:19:03 -04:00
• a2998810c1 Updated rover level with asset. Also made the arrow fade when player is certain distance away akshay 2022-08-20 17:43:23 -04:00
• 2f8bbe57e2 Added exit trigger in rover game so you can leave before the timer runs out akshay 2022-08-20 16:03:13 -04:00
• cbbfe694ed Added a simple loot table and set the base data in rover game. Also fixed a bad assert in item_generator akshay 2022-08-20 15:22:32 -04:00
• 073e2f74d6 Fixed pause screen defaulting to be up on game launch akshay 2022-08-20 14:25:03 -04:00
• a43ed5ccb2 Add item placement marker snider 2022-08-20 03:10:16 -07:00
• d8cdc48c01 Added pause menu with recipes akshay 2022-08-20 06:11:08 -04:00
• 1b389fc07a Updated dinner table code to allow for item in hold akshay 2022-08-20 04:15:24 -04:00
• 7c31d9491a Renamed and redid icons akshay 2022-08-20 03:37:33 -04:00
• 6db791b043 Imported new level. COLORS IN THE SCENE! akshay 2022-08-20 02:46:05 -04:00
• db720eb1ca Added dungee icon and updated export settings akshay 2022-08-20 02:40:25 -04:00
• e922975179 New items. new recipes. Balance changes. akshay 2022-08-20 01:57:14 -04:00
• 4a715d9b6d Updated the level.glb with new asset. Updated comm station to match the new asset and added broken state to it akshay 2022-08-19 23:11:22 -04:00
• 1534a9a216 Updated item generator to match the asset and updated main scene akshay 2022-08-19 22:34:25 -04:00
• dfd6fe9bb4 Updatd crafting station to have the output be right on the table on one of the slots. Also added a ready state to the crafting station akshay 2022-08-19 20:24:29 -04:00
• 373838d3e7 Add rover game and such snider 2022-08-19 05:38:23 -07:00
• e80cd37534 Merge branch 'main' of https://git.mrdanielsnider.com/snider/project-dung akshay 2022-08-19 01:27:19 -04:00
• de19a4c32d fixed bug with set_hp in damageable object akshay 2022-08-19 01:27:06 -04:00
• 9a9c5ef65c Fix hunger timer issues snider 2022-08-18 22:20:07 -07:00
• 30b488094a some more number updates akshay 2022-08-19 01:15:45 -04:00
• 469813f534 Update stomach ui snider 2022-08-18 21:59:09 -07:00
• 3047245eae Merge branch 'main' of https://git.mrdanielsnider.com/snider/project-dung akshay 2022-08-19 00:57:53 -04:00
• 26b7c6f017 Added advanced repari kit item and recipe. Updated crafting station repair cost akshay 2022-08-19 00:57:45 -04:00
• 2cc144229f Add wipe to stomachs snider 2022-08-18 21:56:17 -07:00
• b7542cd706 Merge branch 'main' of https://git.mrdanielsnider.com/snider/project-dung akshay 2022-08-19 00:19:23 -04:00
• 24ea0f314e Fixing issue with hydropnic station's item dump requirements having an empty item akshay 2022-08-19 00:19:14 -04:00
• 3c76ce09c0 Fix bedroom snider 2022-08-18 21:19:04 -07:00
• db7ecf5ed1 Updated main scene with all the stations akshay 2022-08-19 00:15:03 -04:00
• a22589b998 Update level glb snider 2022-08-18 19:15:26 -07:00
• c63377c1dc Add wip rover game snider 2022-08-18 19:14:35 -07:00
• 8974f0cc56 Updated oven to extend Damageable and updated code to override base class properly akshay 2022-08-18 21:30:21 -04:00
• b10ad40552 Fixed bug with item generator crying when item is removed while its broken akshay 2022-08-18 21:03:23 -04:00
• ef4b8bd7cf Added broken state to hydroponic station and fixed a bug with all the brokens tates where they wouldn't heal the object back up on repair akshay 2022-08-18 20:31:07 -04:00
• 6e6da14975 Updated item_generator to have states. Also made it extend Damageable class and added a broken state akshay 2022-08-18 03:26:58 -04:00
• 14eb5b24de Resetting the starting Run scene to main.tscn akshay 2022-08-18 01:58:17 -04:00
• 7289eba670 Added Damageable class that crating_station inherits from. Added new broken state to crafting_station with status light akshay 2022-08-18 01:56:07 -04:00
• 63c0199d77 Added the bed to dev-akshay scene. Also updated the input mapping to map action button on the controller akshay 2022-08-17 21:32:07 -04:00
• 22dafb6ab2 Updated dev-akshay with new level akshay 2022-08-17 19:39:48 -04:00
• 30f171f3d9 Add sleeping snider 2022-08-17 05:46:36 -07:00
• 22e2fc0067 Lerp camera fov snider 2022-08-17 05:45:28 -07:00
• 3a72e066ea Added comms array akshay 2022-08-17 00:04:04 -04:00
• eeb34f9372 Added a game timer and put it on the game manager to handle day end events akshay 2022-08-16 21:11:02 -04:00
• 8d313b8a71 Updated dinner table to allow player to consume valid food akshay 2022-08-16 20:31:51 -04:00
• c6da4e0aa2 Added hunger tick damage akshay 2022-08-16 19:56:48 -04:00
• 3fb9fce92f Fix laggy activation snider 2022-08-16 12:35:42 -07:00
• 921ebc01f2 Make broken state for oven snider 2022-08-16 00:30:37 -07:00
• df641d6c3d Move player item bone snider 2022-08-16 00:30:23 -07:00
• b215e201e0 Add item_dump snider 2022-08-16 00:29:52 -07:00
• 9fc5043c7b Make gfx better snider 2022-08-16 00:29:23 -07:00
• e992772612 Add cheat menu snider 2022-08-16 00:29:06 -07:00
• 6ffd1dedbd Add override.cfg stuff snider 2022-08-16 00:28:15 -07:00
• e968fb923b Add status light scene snider 2022-08-16 00:07:49 -07:00
• 830b78cf77 "Fix debug message for oven state change") snider 2022-08-14 23:54:06 -07:00
• 92a9d4664d Make good graphics snider 2022-08-15 22:32:47 -07:00
• 69c3a4e9ea Merge branch 'main' of https://git.mrdanielsnider.com/snider/project-dung akshay 2022-08-16 01:13:13 -04:00
• e7cba76959 Updated dev-akshay scene to have the galley and hydroponics room akshay 2022-08-16 01:12:56 -04:00
• 4c8a337a2d wip wip/broken snider 2022-08-15 21:36:34 -07:00
• 83fc7e5924 "Fix debug message for oven state change") snider 2022-08-14 23:54:06 -07:00
• 8d0ed8c98f Add activation animation to Dungee snider 2022-08-15 21:21:14 -07:00
• 383e868b2b Updated crafting_station to have states akshay 2022-08-15 23:47:01 -04:00
• a4c7dcf21a Updated power station to export current holding var. Allows us to start with charges akshay 2022-08-15 20:21:17 -04:00
• 63d247bd3a Updated dev scene with new cameras and testing machine placements akshay 2022-08-15 20:17:39 -04:00
• fef1b2bcea Trying an item in his hand snider 2022-08-15 14:00:51 -07:00
• a62d187626 Animate dungman snider 2022-08-15 13:24:09 -07:00
• 18925d3969 Fix collision layers and masks snider 2022-08-14 22:50:56 -07:00
• 1030891b8d Add camera system snider 2022-08-14 18:47:18 -07:00
• 337f18f9d6 Add camera system wip/snider snider 2022-08-14 18:47:18 -07:00
• a5567a8132 Added generic item_generator scene. using it as the ore conveyor in dev_akshay for testing akshay 2022-08-14 21:23:41 -04:00
• 11826ef9d5 Updated power station to not use coin_machine and cleaned up some of my mess akshay 2022-08-14 19:45:00 -04:00
• e16d192ba0 Merge branch 'main' of https://git.mrdanielsnider.com/snider/project-dung akshay 2022-08-14 19:29:25 -04:00
• 01e57c169c Updated crafting machine code to check for valid recipe when deciding to enable/disable the coin machine akshay 2022-08-14 19:29:17 -04:00
• f1cb0ba83c Add whitebox level and main scene snider 2022-08-14 16:23:13 -07:00
• b437727461 Add more dungman snider 2022-08-14 14:56:47 -07:00
• 46817025a6 Updated RecipesDB to store an array of tem_type resources instead of hardcoded slots akshay 2022-08-14 17:56:29 -04:00
• a336411c84 Added Crafting Machine akshay 2022-08-14 17:28:32 -04:00
• d20642e267 Add food and yam interaction snider 2022-08-14 05:40:14 -07:00
• 2874c11658 Merge branch 'main' of https://git.mrdanielsnider.com/snider/project-dung akshay 2022-08-14 04:57:32 -04:00