Merge branch 'develop' into feature/Coin

# Conflicts: # godot/Main.tscn
2022-08-01 14:17:05 -04:00
parent b24c9e8732 8cfa1d5cce
commit 2be22ceb68
49 changed files with 1056 additions and 34 deletions
--- a/godot/Main.tscn
+++ b/godot/Main.tscn
@@ -1,8 +1,11 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=4 format=2]

 [ext_resource path="res://Main.gdns" type="Script" id=1]
 [ext_resource path="res://levels/Prototype.tscn" type="PackedScene" id=2]
+[ext_resource path="res://monitor/Monitor.tscn" type="PackedScene" id=3]

 [node name="Main" type="Node"]
 script = ExtResource( 1 )
 level = ExtResource( 2 )
+
+[node name="Monitor" parent="." instance=ExtResource( 3 )]