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

Merge branch 'develop' into feature/Prototype_R_LEVEL

Browse Source 
# Conflicts:
#	godot/levels/Prototype.tscn
This commit is contained in:
Martin Araneda
2022-09-01 22:04:21 -04:00
parent bc572df9f9 615b2a0ba2
commit 346af5dd44
4 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
godot/levels/Prototype.tscn
View File

@@ -15,6 +15,7 @@
collision_layer = 5
[node name="Camera2D" type="Camera2D" parent="Player"]
current = true
limit_left = 0
limit_top = 0
limit_right = 512
@@ -51,9 +52,6 @@ script = ExtResource( 1 )
[node name="coin" parent="Coins" instance=ExtResource( 5 )]
position = Vector2( 72, 450 )
[node name="AnimatedSprite" parent="Coins/coin" index="1"]
frame = 0
[node name="coin2" parent="Coins" instance=ExtResource( 5 )]
position = Vector2( 234, 450 )