Merge branch 'master' into feature/sticker
This commit is contained in:
commit
ba06aacff2
2 changed files with 4 additions and 2 deletions
|
@ -8,13 +8,12 @@ atlas = ExtResource("1_lvitw")
|
||||||
region = Rect2(72, 1392, 216, 272)
|
region = Rect2(72, 1392, 216, 272)
|
||||||
|
|
||||||
[node name="WoodenBridge" type="Sprite2D"]
|
[node name="WoodenBridge" type="Sprite2D"]
|
||||||
position = Vector2(1955, -525)
|
|
||||||
scale = Vector2(5.71296, 5.71296)
|
scale = Vector2(5.71296, 5.71296)
|
||||||
texture = SubResource("AtlasTexture_nkyhf")
|
texture = SubResource("AtlasTexture_nkyhf")
|
||||||
|
|
||||||
[node name="BridgeNode" parent="." instance=ExtResource("2_te8ug")]
|
[node name="BridgeNode" parent="." instance=ExtResource("2_te8ug")]
|
||||||
position = Vector2(1788, 788)
|
position = Vector2(1788, 788)
|
||||||
collision_layer = 0
|
collision_layer = 2
|
||||||
|
|
||||||
[node name="PlayerDetection" type="CollisionPolygon2D" parent="BridgeNode"]
|
[node name="PlayerDetection" type="CollisionPolygon2D" parent="BridgeNode"]
|
||||||
position = Vector2(-623.92, 0)
|
position = Vector2(-623.92, 0)
|
||||||
|
@ -22,6 +21,8 @@ scale = Vector2(0.650499, 1)
|
||||||
polygon = PackedVector2Array(-1875.9, -847.689, -1878.05, -681.225, -1699.64, -682.976, -1706.37, -847.689)
|
polygon = PackedVector2Array(-1875.9, -847.689, -1878.05, -681.225, -1699.64, -682.976, -1706.37, -847.689)
|
||||||
|
|
||||||
[node name="StaticBody2D" type="StaticBody2D" parent="."]
|
[node name="StaticBody2D" type="StaticBody2D" parent="."]
|
||||||
|
collision_layer = 3
|
||||||
|
input_pickable = true
|
||||||
|
|
||||||
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="StaticBody2D"]
|
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="StaticBody2D"]
|
||||||
polygon = PackedVector2Array(-84.7196, -115.177, -83.3193, 112.026, -58.9886, 111.851, -59.1637, -113.951)
|
polygon = PackedVector2Array(-84.7196, -115.177, -83.3193, 112.026, -58.9886, 111.851, -59.1637, -113.951)
|
||||||
|
|
|
@ -100,6 +100,7 @@ mouse_right={
|
||||||
[layer_names]
|
[layer_names]
|
||||||
|
|
||||||
2d_physics/layer_1="Player"
|
2d_physics/layer_1="Player"
|
||||||
|
2d_physics/layer_2="Stickers"
|
||||||
|
|
||||||
[rendering]
|
[rendering]
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue