Merge branch 'master' of https://git.sjkillen.ca/sjkillen/meat_madness_redux

godot/.import/obelisk_ring.glb-23cec88061010a2a84ea2ff41cc3a54a.md5

@@ -0,0 +1,3 @@
+source_md5="2fc9b0fb03d32a81f0f05fa6e4e88917"
+dest_md5="1100d1e9cf38ee19a81fa58b862694fa"
+

godot/.import/obelisk_ring2.glb-ed61c6c02eb75a79f12993d812c42f2a.md5

@@ -0,0 +1,3 @@
+source_md5="cceeb5729d9d2aee46d8cc8fe6b07999"
+dest_md5="b65f50f6ec9ac579c6bced3620bdcdd6"
+

godot/assets/meat_bore/StaticBody.gd

@@ -0,0 +1,16 @@
+extends StaticBody
+
+
+# Declare member variables here. Examples:
+# var a = 2
+# var b = "text"
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	pass # Replace with function body.
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+#func _process(delta):
+#	pass

godot/assets/meat_bore/level.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=15 format=2]
+[gd_scene load_steps=16 format=2]
 
 [ext_resource path="res://assets/meat_bore/meat_tunnel_top.tscn" type="PackedScene" id=1]
 [ext_resource path="res://assets/meat_bore/meat_module/level_wally.tscn" type="PackedScene" id=2]
@@ -13,6 +13,7 @@
 [ext_resource path="res://assets/models/heart/Heart_2.tscn" type="PackedScene" id=11]
 [ext_resource path="res://assets/models/meat_tentacle_small.tscn" type="PackedScene" id=12]
 [ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=13]
+[ext_resource path="res://assets/meat_bore/obelisk_ring.tscn" type="PackedScene" id=14]
 
 [sub_resource type="Environment" id=3]
 background_mode = 2
@@ -46,7 +47,7 @@ glow_bloom = 1.0
 [node name="meat_tunnel_top" parent="." instance=ExtResource( 1 )]
 
 [node name="Player" parent="." instance=ExtResource( 3 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 21.3374, 30.1915 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.51511, 88.4606 )
 
 [node name="shader" parent="." instance=ExtResource( 5 )]
 
@@ -129,4 +130,7 @@ transform = Transform( -0.452271, 0.189509, 0.236865, -0.0433815, 0.487985, -0.3
 [node name="MeatSinkParameters" parent="." instance=ExtResource( 6 )]
 
 [node name="Heart_2" parent="." instance=ExtResource( 11 )]
-transform = Transform( -95.0824, 0, 30.9731, 0, 100, 0, -30.9731, 0, -95.0824, 0.00217056, 31.5978, 83.3354 )
+transform = Transform( -95.0824, 0, 30.9731, 0, 100, 0, -30.9731, 0, -95.0824, 0.00217056, 31.5978, 170.072 )
+
+[node name="obelisk_ring" parent="." instance=ExtResource( 14 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.746, 0 )