 akshay
|
e80cd37534
|
Merge branch 'main' of https://git.mrdanielsnider.com/snider/project-dung
|
2022-08-19 01:27:19 -04:00 |
|
|
akshay
|
de19a4c32d
|
fixed bug with set_hp in damageable object
|
2022-08-19 01:27:06 -04:00 |
|
 snider
|
9a9c5ef65c
|
Fix hunger timer issues
|
2022-08-18 22:20:27 -07:00 |
|
|
akshay
|
30b488094a
|
some more number updates
|
2022-08-19 01:15:45 -04:00 |
|
|
snider
|
469813f534
|
Update stomach ui
|
2022-08-18 21:59:43 -07:00 |
|
|
akshay
|
3047245eae
|
Merge branch 'main' of https://git.mrdanielsnider.com/snider/project-dung
|
2022-08-19 00:57:53 -04:00 |
|
|
akshay
|
26b7c6f017
|
Added advanced repari kit item and recipe. Updated crafting station repair cost
|
2022-08-19 00:57:45 -04:00 |
|
|
snider
|
2cc144229f
|
Add wipe to stomachs
|
2022-08-18 21:56:34 -07:00 |
|
|
akshay
|
b7542cd706
|
Merge branch 'main' of https://git.mrdanielsnider.com/snider/project-dung
|
2022-08-19 00:19:23 -04:00 |
|
|
akshay
|
24ea0f314e
|
Fixing issue with hydropnic station's item dump requirements having an empty item
|
2022-08-19 00:19:14 -04:00 |
|
|
snider
|
3c76ce09c0
|
Fix bedroom
|
2022-08-18 21:19:04 -07:00 |
|
|
akshay
|
db7ecf5ed1
|
Updated main scene with all the stations
|
2022-08-19 00:15:03 -04:00 |
|
|
snider
|
a22589b998
|
Update level glb
|
2022-08-18 19:17:03 -07:00 |
|
|
snider
|
c63377c1dc
|
Add wip rover game
|
2022-08-18 19:17:02 -07:00 |
|
|
akshay
|
8974f0cc56
|
Updated oven to extend Damageable and updated code to override base class properly
|
2022-08-18 21:30:21 -04:00 |
|
|
akshay
|
b10ad40552
|
Fixed bug with item generator crying when item is removed while its broken
|
2022-08-18 21:03:23 -04:00 |
|
|
akshay
|
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
|
2022-08-18 20:31:07 -04:00 |
|
|
akshay
|
6e6da14975
|
Updated item_generator to have states. Also made it extend Damageable class and added a broken state
|
2022-08-18 03:26:58 -04:00 |
|
|
akshay
|
14eb5b24de
|
Resetting the starting Run scene to main.tscn
|
2022-08-18 01:58:17 -04:00 |
|
|
akshay
|
7289eba670
|
Added Damageable class that crating_station inherits from. Added new broken state to crafting_station with status light
|
2022-08-18 01:56:07 -04:00 |
|
|
akshay
|
63c0199d77
|
Added the bed to dev-akshay scene. Also updated the input mapping to map action button on the controller
|
2022-08-17 21:32:07 -04:00 |
|
|
akshay
|
22dafb6ab2
|
Updated dev-akshay with new level
|
2022-08-17 19:39:48 -04:00 |
|
|
snider
|
30f171f3d9
|
Add sleeping
|
2022-08-17 05:46:36 -07:00 |
|
|
snider
|
22e2fc0067
|
Lerp camera fov
|
2022-08-17 05:45:28 -07:00 |
|
|
akshay
|
3a72e066ea
|
Added comms array
|
2022-08-17 00:04:04 -04:00 |
|
|
akshay
|
eeb34f9372
|
Added a game timer and put it on the game manager to handle day end events
|
2022-08-16 21:11:02 -04:00 |
|
|
akshay
|
8d313b8a71
|
Updated dinner table to allow player to consume valid food
|
2022-08-16 20:31:51 -04:00 |
|
|
akshay
|
c6da4e0aa2
|
Added hunger tick damage
|
2022-08-16 19:56:48 -04:00 |
|
|
snider
|
3fb9fce92f
|
Fix laggy activation
|
2022-08-16 12:35:42 -07:00 |
|
|
snider
|
921ebc01f2
|
Make broken state for oven
|
2022-08-16 00:30:37 -07:00 |
|
|
snider
|
df641d6c3d
|
Move player item bone
|
2022-08-16 00:30:23 -07:00 |
|
|
snider
|
b215e201e0
|
Add item_dump
|
2022-08-16 00:29:52 -07:00 |
|
|
snider
|
9fc5043c7b
|
Make gfx better
|
2022-08-16 00:29:23 -07:00 |
|
|
snider
|
e992772612
|
Add cheat menu
|
2022-08-16 00:29:06 -07:00 |
|
|
snider
|
6ffd1dedbd
|
Add override.cfg stuff
|
2022-08-16 00:28:15 -07:00 |
|
|
snider
|
e968fb923b
|
Add status light scene
|
2022-08-16 00:07:49 -07:00 |
|
|
snider
|
830b78cf77
|
"Fix debug message for oven state change")
|
2022-08-15 22:35:51 -07:00 |
|
|
snider
|
92a9d4664d
|
Make good graphics
|
2022-08-15 22:34:01 -07:00 |
|
|
akshay
|
69c3a4e9ea
|
Merge branch 'main' of https://git.mrdanielsnider.com/snider/project-dung
|
2022-08-16 01:13:13 -04:00 |
|
|
akshay
|
e7cba76959
|
Updated dev-akshay scene to have the galley and hydroponics room
|
2022-08-16 01:12:56 -04:00 |
|
|
snider
|
8d0ed8c98f
|
Add activation animation to Dungee
|
2022-08-15 21:21:14 -07:00 |
|
|
akshay
|
383e868b2b
|
Updated crafting_station to have states
|
2022-08-15 23:47:01 -04:00 |
|
|
akshay
|
a4c7dcf21a
|
Updated power station to export current holding var. Allows us to start with charges
|
2022-08-15 20:21:17 -04:00 |
|
|
akshay
|
63d247bd3a
|
Updated dev scene with new cameras and testing machine placements
|
2022-08-15 20:17:39 -04:00 |
|
|
snider
|
fef1b2bcea
|
Trying an item in his hand
|
2022-08-15 14:00:51 -07:00 |
|
|
snider
|
a62d187626
|
Animate dungman
|
2022-08-15 13:24:09 -07:00 |
|
|
snider
|
18925d3969
|
Fix collision layers and masks
|
2022-08-14 22:50:56 -07:00 |
|
|
snider
|
1030891b8d
|
Add camera system
|
2022-08-14 22:04:36 -07:00 |
|
|
akshay
|
a5567a8132
|
Added generic item_generator scene. using it as the ore conveyor in dev_akshay for testing
|
2022-08-14 21:23:41 -04:00 |
|
|
akshay
|
11826ef9d5
|
Updated power station to not use coin_machine and cleaned up some of my mess
|
2022-08-14 19:45:00 -04:00 |
|