Compare commits

...

79 Commits

Author SHA1 Message Date
f2ea3067c1 Level: Fix collisions
* Fix oversized collisions with hall gasket
* Fix missing collisions on alt boxes
* Reimport everything I guess
2023-11-27 23:53:27 -08:00
akshay
028b4b4a21 Final commit for the jam 2022-08-21 16:08:48 -04:00
akshay
9f74ab447b Merge branch 'main' of https://git.mrdanielsnider.com/snider/project-dung 2022-08-21 15:32:54 -04:00
akshay
23dfc3bb72 Updated rover game with everything it needs 2022-08-21 15:32:47 -04:00
8c45591df9 Add circle timer 2022-08-21 12:07:27 -07:00
akshay
79f41e7a41 Updated the total time to play rover game 2022-08-21 14:52:32 -04:00
akshay
841dfa7722 Updated rover game timer UI 2022-08-21 14:51:34 -04:00
akshay
bb4da72c47 Added status lights on power station. Adjusted the crafting bench item holder positions 2022-08-21 14:42:40 -04:00
akshay
5fca5d0a04 Updated level asset. Moved books to correct places 2022-08-21 14:11:19 -04:00
akshay
ed4321243a Merge branch 'main' of https://git.mrdanielsnider.com/snider/project-dung 2022-08-21 14:02:10 -04:00
akshay
571a7b0676 Added a book scene that triggers dialogic events. Also added the end game dialogic 2022-08-21 14:02:00 -04:00
e2e780631a Lock camera rotation in center room 2022-08-21 10:50:03 -07:00
akshay
5d290b4b9b Added initial dialog when you enter the RTG area for the first time 2022-08-21 13:12:23 -04:00
akshay
782d6fb114 Updated the level assets. Updated pause menu to have the map 2022-08-21 12:37:14 -04:00
akshay
ba3c1b6055 Fixed bug with starve and day end dialogs stomping on each other 2022-08-21 12:13:33 -04:00
akshay
ef7a22a980 Added new intro and adjusted camera to start in the bedroom 2022-08-21 11:33:03 -04:00
akshay
ed794b26f2 Updated stomach texture 2022-08-21 11:16:53 -04:00
akshay
fc58d4590f Added new HUD for bed timer 2022-08-21 10:16:24 -04:00
akshay
2bd6bc1c4e Added new font. Created main menu and completed the game loop. Added bounce on item balloons 2022-08-21 01:53:37 -04:00
akshay
50ab2c2579 Update Rover rocks to have Geode mesh 2022-08-21 00:13:06 -04:00
akshay
8683916588 Updated item balloon asset and adjusted the item anchor on it 2022-08-20 23:37:31 -04:00
akshay
002ffef1e8 Added the item balloons to show on broken machines 2022-08-20 23:02:40 -04:00
akshay
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 2022-08-20 20:41:31 -04:00
akshay
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. 2022-08-20 19:19:03 -04:00
akshay
a2998810c1 Updated rover level with asset. Also made the arrow fade when player is certain distance away 2022-08-20 17:43:23 -04:00
akshay
2f8bbe57e2 Added exit trigger in rover game so you can leave before the timer runs out 2022-08-20 16:03:13 -04:00
akshay
cbbfe694ed Added a simple loot table and set the base data in rover game. Also fixed a bad assert in item_generator 2022-08-20 15:22:32 -04:00
akshay
073e2f74d6 Fixed pause screen defaulting to be up on game launch 2022-08-20 14:25:03 -04:00
a43ed5ccb2 Add item placement marker 2022-08-20 03:13:33 -07:00
akshay
d8cdc48c01 Added pause menu with recipes 2022-08-20 06:11:08 -04:00
akshay
1b389fc07a Updated dinner table code to allow for item in hold 2022-08-20 04:15:24 -04:00
akshay
7c31d9491a Renamed and redid icons 2022-08-20 03:37:33 -04:00
akshay
6db791b043 Imported new level. COLORS IN THE SCENE! 2022-08-20 02:46:05 -04:00
akshay
db720eb1ca Added dungee icon and updated export settings 2022-08-20 02:40:25 -04:00
akshay
e922975179 New items. new recipes. Balance changes. 2022-08-20 01:57:14 -04:00
akshay
4a715d9b6d Updated the level.glb with new asset. Updated comm station to match the new asset and added broken state to it 2022-08-19 23:11:22 -04:00
akshay
1534a9a216 Updated item generator to match the asset and updated main scene 2022-08-19 22:34:25 -04:00
akshay
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 2022-08-19 20:24:29 -04:00
373838d3e7 Add rover game and such 2022-08-19 05:38:23 -07:00
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
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
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
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
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
a22589b998 Update level glb 2022-08-18 19:17:03 -07:00
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
30f171f3d9 Add sleeping 2022-08-17 05:46:36 -07:00
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
3fb9fce92f Fix laggy activation 2022-08-16 12:35:42 -07:00
921ebc01f2 Make broken state for oven 2022-08-16 00:30:37 -07:00
df641d6c3d Move player item bone 2022-08-16 00:30:23 -07:00
b215e201e0 Add item_dump 2022-08-16 00:29:52 -07:00
9fc5043c7b Make gfx better 2022-08-16 00:29:23 -07:00
e992772612 Add cheat menu 2022-08-16 00:29:06 -07:00
6ffd1dedbd Add override.cfg stuff 2022-08-16 00:28:15 -07:00
e968fb923b Add status light scene 2022-08-16 00:07:49 -07:00
830b78cf77 "Fix debug message for oven state change") 2022-08-15 22:35:51 -07:00
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
297 changed files with 21001 additions and 599 deletions

28
.gitignore vendored
View File

@ -1,11 +1,17 @@
# Godot-specific ignores
.import/
export.cfg
export_presets.cfg
# Imported translations (automatically generated from CSV files)
*.translation
# Mono-specific ignores
.mono/
data_*/
# Godot-specific ignores
.import/
export.cfg
export_presets.cfg
# Imported translations (automatically generated from CSV files)
*.translation
# Mono-specific ignores
.mono/
data_*/
# Binaries
bin/
# Local settings
override.cfg

Binary file not shown.

BIN
assets/UI/Icon_Stomach.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

View File

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/Icon_Stomach.png-ef46cca6dfcb43524b88fb3b81c668c9.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/UI/Icon_Stomach.png"
dest_files=[ "res://.import/Icon_Stomach.png-ef46cca6dfcb43524b88fb3b81c668c9.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

BIN
assets/UI/Menu_Map.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 352 KiB

View File

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/Menu_Map.png-af77eb6266496e0be2636e84fb856a78.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/UI/Menu_Map.png"
dest_files=[ "res://.import/Menu_Map.png-af77eb6266496e0be2636e84fb856a78.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

BIN
assets/UI/Menu_Recipes.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 420 KiB

View File

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/Menu_Recipes.png-bafc812259ffc5e37891cc8023a7e6bd.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/UI/Menu_Recipes.png"
dest_files=[ "res://.import/Menu_Recipes.png-bafc812259ffc5e37891cc8023a7e6bd.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

View File

@ -0,0 +1,37 @@
[remap]
importer="texture"
type="StreamTexture"
path.s3tc="res://.import/Meter_Completion.png-784a759a14eb89b22a4a7dcdbcc5f68b.s3tc.stex"
path.etc="res://.import/Meter_Completion.png-784a759a14eb89b22a4a7dcdbcc5f68b.etc.stex"
metadata={
"imported_formats": [ "s3tc", "etc" ],
"vram_texture": true
}
[deps]
source_file="res://assets/UI/Meter_Completion.png"
dest_files=[ "res://.import/Meter_Completion.png-784a759a14eb89b22a4a7dcdbcc5f68b.s3tc.stex", "res://.import/Meter_Completion.png-784a759a14eb89b22a4a7dcdbcc5f68b.etc.stex" ]
[params]
compress/mode=2
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=true
flags/filter=true
flags/mipmaps=true
flags/anisotropic=false
flags/srgb=1
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0

BIN
assets/UI/Timers.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

View File

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/Timers.png-f1d89b18b8787e509a7ff5d60f99da61.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/UI/Timers.png"
dest_files=[ "res://.import/Timers.png-f1d89b18b8787e509a7ff5d60f99da61.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

Binary file not shown.

BIN
assets/book/book.glb Normal file

Binary file not shown.

1065
assets/book/book.glb.import Normal file

File diff suppressed because it is too large Load Diff

36
assets/book/book.tscn Normal file

File diff suppressed because one or more lines are too long

Binary file not shown.

BIN
assets/chip/Board.material Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
assets/chip/chip.glb Normal file

Binary file not shown.

1065
assets/chip/chip.glb.import Normal file

File diff suppressed because it is too large Load Diff

5
assets/chip/chip.tscn Normal file
View File

@ -0,0 +1,5 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://assets/chip/chip.glb" type="PackedScene" id=1]
[node name="chip" instance=ExtResource( 1 )]

Binary file not shown.

Binary file not shown.

BIN
assets/crystal/crystal.glb Normal file

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,5 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://assets/crystal/crystal.glb" type="PackedScene" id=1]
[node name="crystal" instance=ExtResource( 1 )]

Binary file not shown.

BIN
assets/gem/gem.glb Normal file

Binary file not shown.

1065
assets/gem/gem.glb.import Normal file

File diff suppressed because it is too large Load Diff

5
assets/gem/gem.tscn Normal file
View File

@ -0,0 +1,5 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://assets/gem/gem.glb" type="PackedScene" id=1]
[node name="gem" instance=ExtResource( 1 )]

Binary file not shown.

BIN
assets/geode/Rocky.material Normal file

Binary file not shown.

BIN
assets/geode/geode.glb Normal file

Binary file not shown.

File diff suppressed because it is too large Load Diff

5
assets/geode/geode.tscn Normal file
View File

@ -0,0 +1,5 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://assets/geode/geode.glb" type="PackedScene" id=1]
[node name="geode" instance=ExtResource( 1 )]

BIN
assets/icons/icon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 156 KiB

BIN
assets/icons/icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 191 KiB

View File

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/icon.png-816117353ba57afc3af521f78eedcc3c.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/icons/icon.png"
dest_files=[ "res://.import/icon.png-816117353ba57afc3af521f78eedcc3c.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

BIN
assets/ingot/Metal.material Normal file

Binary file not shown.

BIN
assets/ingot/ingot.glb Normal file

Binary file not shown.

File diff suppressed because it is too large Load Diff

5
assets/ingot/ingot.tscn Normal file
View File

@ -0,0 +1,5 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://assets/ingot/ingot.glb" type="PackedScene" id=1]
[node name="ingot" instance=ExtResource( 1 )]

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
assets/level/Level.glb Normal file

Binary file not shown.

File diff suppressed because it is too large Load Diff

14
assets/level/Level.tscn Normal file
View File

@ -0,0 +1,14 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://assets/level/Level.glb" type="PackedScene" id=1]
[ext_resource path="res://scripts/Level.gd" type="Script" id=2]
[sub_resource type="CylinderShape" id=1]
height = 6.30212
radius = 2.14679
[node name="Level" instance=ExtResource( 1 )]
script = ExtResource( 2 )
[node name="CollisionShape" type="CollisionShape" parent="RTG" index="0"]
shape = SubResource( 1 )

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
assets/level/Rock.material Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More