Merge remote-tracking branch 'origin/master' into spencer

This commit is contained in:
Spencer Killen 2023-01-03 21:07:53 -07:00
commit df39c04a87
Signed by: sjkillen
GPG Key ID: F307025B65C860BA
9 changed files with 1095 additions and 3 deletions

View File

@ -0,0 +1,3 @@
source_md5="45bab22367bc4690c21a47311db389b8"
dest_md5="b70cd328ea2b1ddcac3c7ca99eb3ab08"

View File

@ -0,0 +1,3 @@
source_md5="45bab22367bc4690c21a47311db389b8"
dest_md5="59deaaee39c151cd8cbd1a027f5d08ba"

BIN
godot/assets/meat_bore/SpiralSlop.material (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -2,10 +2,12 @@
[ext_resource path="res://assets/meat_bore/meat_module/meat_module.tscn" type="PackedScene" id=1]
[ext_resource path="res://assets/meat_bore/meat_module/meat_module_outside_walls_1.png" type="Texture" id=2]
[ext_resource path="res://assets/meat_bore/meat_module/meat_module.gd" type="Script" id=3]
[ext_resource path="res://assets/meat_bore/meat_spiral.tscn" type="PackedScene" id=3]
[node name="level_lee" type="Spatial"]
[node name="meat_module_1" type="Spatial" parent="." instance=ExtResource( 1 )]
script = ExtResource( 3 )
[node name="meat_module_1" parent="." instance=ExtResource( 1 )]
texture = ExtResource( 2 )
[node name="meat_spiral" parent="." instance=ExtResource( 3 )]
transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1.1, 0, 1, -4.80825e-08, 0, -123.038, 0 )

BIN
godot/assets/meat_bore/meat_spiral.glb (Stored with Git LFS) Normal file

Binary file not shown.

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long