Proyecto-Titulo/alai
2
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Merge branch 'develop' into feature/Coin

Browse Source 
# Conflicts:
#	godot/Main.tscn
#	godot/project.godot
This commit is contained in:
Chris Cromer
2022-08-26 13:54:25 -04:00
parent b74a8ce1aa 8321c8a610
commit a9f26a8408
33 changed files with 979 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
godot/Main.tscn
View File

@@ -1,11 +1,12 @@
[gd_scene load_steps=4 format=2]
[gd_scene load_steps=3 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"]
pause_mode = 2
script = ExtResource( 1 )
level = ExtResource( 2 )
[node name="Monitor" parent="." instance=ExtResource( 3 )]
[node name="Level" type="Node" parent="."]
pause_mode = 1