daniel/Embodiment
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing more merge conflicts

Browse Source
This commit is contained in:
Jasmine Hyder
2021-12-09 21:26:42 -06:00
parent 1fd6eeac95
commit ad704f9350
6 changed files with 65 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Levels/Level 3.tscn
View File

@@ -127,23 +127,31 @@ position = Vector2( 250.562, 86.6365 )
[node name="Enemies" type="YSort" parent="YSort"]
[node name="Snowman 1" parent="YSort/Enemies" groups=["enemies"] instance=ExtResource( 4 )]
[node name="Snowman 1" parent="YSort/Enemies" groups=[
"enemies",
] instance=ExtResource( 4 )]
position = Vector2( 268.977, 221.859 )
collision_layer = 4
collision_mask = 5
[node name="Snowman 2" parent="YSort/Enemies" groups=["enemies"] instance=ExtResource( 4 )]
[node name="Snowman 2" parent="YSort/Enemies" groups=[
"enemies",
] instance=ExtResource( 4 )]
position = Vector2( 124.417, 123.977 )
collision_layer = 4
collision_mask = 5
[node name="Blue Snowman 1" parent="YSort/Enemies" groups=["enemies"] instance=ExtResource( 6 )]
[node name="Blue Snowman 1" parent="YSort/Enemies" groups=[
"enemies",
] instance=ExtResource( 6 )]
position = Vector2( 252.747, 40.9419 )
collision_layer = 4
collision_mask = 5
script = ExtResource( 7 )
[node name="Blue Snowman 2" parent="YSort/Enemies" groups=["enemies"] instance=ExtResource( 6 )]
[node name="Blue Snowman 2" parent="YSort/Enemies" groups=[
"enemies",
] instance=ExtResource( 6 )]
position = Vector2( 105.053, 195.4 )
collision_layer = 4
collision_mask = 5

18
Levels/Level 4.tscn
View File

File diff suppressed because one or more lines are too long