Browse Source

platformer2d: disable filter and fix stage tilemap

Rémi Verschelde 8 years ago
parent
commit
00f2097972

+ 2 - 2
2d/platformer/bullet.png.import

@@ -11,7 +11,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
@@ -20,4 +20,4 @@ process/premult_alpha=false
 process/HDR_as_SRGB=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false

+ 15 - 21
2d/platformer/bullet.tscn

@@ -3,23 +3,16 @@
 [ext_resource path="res://bullet.gd" type="Script" id=1]
 [ext_resource path="res://bullet.png" type="Texture" id=2]
 
-[sub_resource type="CircleShape2D" id=1]
-
-custom_solver_bias = 0.0
-radius = 10.0
-
-[sub_resource type="CanvasItemMaterial" id=2]
+[sub_resource type="CanvasItemMaterial" id=1]
 
 blend_mode = 0
 light_mode = 0
 
-[sub_resource type="GradientTexture" id=3]
+[sub_resource type="GradientTexture" id=2]
 
 width = 2048
-offsets = PoolFloatArray( 0, 1 )
-colors = PoolColorArray( 1, 1, 1, 1, 1, 1, 1, 0 )
 
-[sub_resource type="ParticlesMaterial" id=4]
+[sub_resource type="ParticlesMaterial" id=3]
 
 trail_divisor = 1
 emission_shape = 0
@@ -47,7 +40,7 @@ angle = 0.0
 angle_random = 0.0
 scale = 1.0
 scale_random = 0.0
-color_ramp = SubResource( 3 )
+color_ramp = SubResource( 2 )
 hue_variation = 0.0
 hue_variation_random = 0.0
 anim_speed = 0.0
@@ -56,6 +49,11 @@ anim_offset = 0.0
 anim_offset_random = 0.0
 anim_loop = false
 
+[sub_resource type="CircleShape2D" id=4]
+
+custom_solver_bias = 0.0
+radius = 10.0
+
 [sub_resource type="Animation" id=5]
 
 length = 1.5
@@ -100,9 +98,6 @@ tracks/2/keys = {
 [node name="bullet" type="RigidBody2D"]
 
 input_pickable = false
-shapes/0/shape = SubResource( 1 )
-shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-shapes/0/trigger = false
 collision_layer = 1
 collision_mask = 1
 mode = 0
@@ -125,20 +120,21 @@ script = ExtResource( 1 )
 [node name="particles" type="Particles2D" parent="."]
 
 modulate = Color( 1, 1, 1, 0.244784 )
-material = SubResource( 2 )
+material = SubResource( 1 )
 emitting = true
 amount = 50
 lifetime = 0.1
+one_shot = false
 preprocess = 0.0
 speed_scale = 1.0
 explosiveness = 0.0
 randomness = 0.0
-visibility_rect = Rect2( -100, -100, 200, 200 )
-local_coords = false
 fixed_fps = 0
 fract_delta = true
+visibility_rect = Rect2( -100, -100, 200, 200 )
+local_coords = false
 draw_order = 0
-process_material = SubResource( 4 )
+process_material = SubResource( 3 )
 texture = ExtResource( 2 )
 normal_map = null
 h_frames = 1
@@ -151,9 +147,7 @@ texture = ExtResource( 2 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 
-shape = SubResource( 1 )
-trigger = false
-_update_shape_index = -1
+shape = SubResource( 4 )
 
 [node name="Timer" type="Timer" parent="."]
 

+ 2 - 2
2d/platformer/coin.png.import

@@ -11,7 +11,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
@@ -20,4 +20,4 @@ process/premult_alpha=false
 process/HDR_as_SRGB=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false

+ 13 - 19
2d/platformer/coin.tscn

@@ -5,12 +5,7 @@
 [ext_resource path="res://sound_coin.wav" type="AudioStream" id=3]
 [ext_resource path="res://bullet.png" type="Texture" id=4]
 
-[sub_resource type="CircleShape2D" id=1]
-
-custom_solver_bias = 0.0
-radius = 10.0
-
-[sub_resource type="Animation" id=2]
+[sub_resource type="Animation" id=1]
 
 resource_name = "spin"
 length = 1.5
@@ -28,7 +23,7 @@ tracks/0/keys = {
 "values": [ 0, 1, 2, 3, 2, 1, 0 ]
 }
 
-[sub_resource type="Animation" id=3]
+[sub_resource type="Animation" id=2]
 
 length = 8.0
 loop = false
@@ -91,6 +86,11 @@ tracks/4/keys = {
 "values": [ true ]
 }
 
+[sub_resource type="CircleShape2D" id=3]
+
+custom_solver_bias = 0.0
+radius = 10.0
+
 [sub_resource type="CanvasItemMaterial" id=4]
 
 blend_mode = 1
@@ -99,8 +99,6 @@ light_mode = 0
 [sub_resource type="GradientTexture" id=5]
 
 width = 2048
-offsets = PoolFloatArray( 0, 0.338633, 0.578696, 0.991256, 1 )
-colors = PoolColorArray( 1, 1, 1, 1, 1, 1, 1, 0.515898, 1, 1, 1, 0.0155017, 1, 1, 1, 0.0068208, 1, 1, 1, 0 )
 
 [sub_resource type="ParticlesMaterial" id=6]
 
@@ -143,9 +141,6 @@ anim_loop = false
 [node name="coin" type="Area2D"]
 
 input_pickable = true
-shapes/0/shape = SubResource( 1 )
-shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-shapes/0/trigger = false
 gravity_vec = Vector2( 0, 1 )
 gravity = 98.0
 linear_damp = 0.1
@@ -164,8 +159,8 @@ hframes = 4
 playback_process_mode = 1
 playback_default_blend_time = 0.0
 root_node = NodePath("..")
-anims/spin = SubResource( 2 )
-anims/taken = SubResource( 3 )
+anims/spin = SubResource( 1 )
+anims/taken = SubResource( 2 )
 playback/active = true
 playback/speed = 3.0
 blend_times = [  ]
@@ -173,9 +168,7 @@ autoplay = "spin"
 
 [node name="collision" type="CollisionShape2D" parent="."]
 
-shape = SubResource( 1 )
-trigger = false
-_update_shape_index = -1
+shape = SubResource( 3 )
 
 [node name="sound" type="AudioStreamPlayer2D" parent="."]
 
@@ -193,14 +186,15 @@ material = SubResource( 4 )
 emitting = false
 amount = 8
 lifetime = 2.0
+one_shot = false
 preprocess = 0.0
 speed_scale = 1.0
 explosiveness = 1.0
 randomness = 0.0
-visibility_rect = Rect2( -100, -100, 200, 200 )
-local_coords = true
 fixed_fps = 0
 fract_delta = true
+visibility_rect = Rect2( -100, -100, 200, 200 )
+local_coords = true
 draw_order = 65793
 process_material = SubResource( 6 )
 texture = ExtResource( 4 )

+ 2 - 2
2d/platformer/enemy.png.import

@@ -11,7 +11,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
@@ -20,4 +20,4 @@ process/premult_alpha=false
 process/HDR_as_SRGB=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false

+ 17 - 23
2d/platformer/enemy.tscn

@@ -6,13 +6,7 @@
 [ext_resource path="res://sound_hit.wav" type="AudioStream" id=4]
 [ext_resource path="res://sound_explode.wav" type="AudioStream" id=5]
 
-[sub_resource type="CapsuleShape2D" id=1]
-
-custom_solver_bias = 0.0
-radius = 13.4556
-height = 14.2002
-
-[sub_resource type="Animation" id=2]
+[sub_resource type="Animation" id=1]
 
 resource_name = "explode"
 length = 3.0
@@ -98,7 +92,7 @@ tracks/6/keys = {
 "values": [ false, true ]
 }
 
-[sub_resource type="Animation" id=3]
+[sub_resource type="Animation" id=2]
 
 length = 6.75
 loop = true
@@ -115,7 +109,7 @@ tracks/0/keys = {
 "values": [ 5, 6, 5, 6, 5, 6, 7, 6, 7, 5 ]
 }
 
-[sub_resource type="Animation" id=4]
+[sub_resource type="Animation" id=3]
 
 resource_name = "walk"
 length = 1.25
@@ -133,11 +127,15 @@ tracks/0/keys = {
 "values": [ 0, 1, 2, 3, 4, 0 ]
 }
 
+[sub_resource type="CapsuleShape2D" id=4]
+
+custom_solver_bias = 0.0
+radius = 13.4556
+height = 14.2002
+
 [sub_resource type="GradientTexture" id=5]
 
 width = 2048
-offsets = PoolFloatArray( 0, 1 )
-colors = PoolColorArray( 1, 1, 1, 1, 1, 1, 1, 0 )
 
 [sub_resource type="ParticlesMaterial" id=6]
 
@@ -180,12 +178,9 @@ anim_loop = false
 [node name="enemy" type="KinematicBody2D"]
 
 input_pickable = false
-shapes/0/shape = SubResource( 1 )
-shapes/0/transform = Transform2D( -4.37114e-08, -1, 1, -4.37114e-08, -0.00525069, -0.727495 )
-shapes/0/trigger = false
 collision_layer = 1
 collision_mask = 1
-collision/margin = 0.08
+collision/safe_margin = 0.08
 script = ExtResource( 1 )
 
 [node name="enabler" type="VisibilityEnabler2D" parent="."]
@@ -205,9 +200,9 @@ fixed_process_parent = false
 playback_process_mode = 1
 playback_default_blend_time = 0.0
 root_node = NodePath("..")
-anims/explode = SubResource( 2 )
-anims/idle = SubResource( 3 )
-anims/walk = SubResource( 4 )
+anims/explode = SubResource( 1 )
+anims/idle = SubResource( 2 )
+anims/walk = SubResource( 3 )
 playback/active = true
 playback/speed = 3.0
 blend_times = [  ]
@@ -224,9 +219,7 @@ frame = 4
 
 position = Vector2( -0.00525069, -0.727495 )
 rotation = -1.5708
-shape = SubResource( 1 )
-trigger = false
-_update_shape_index = 0
+shape = SubResource( 4 )
 
 [node name="detect_floor_left" type="RayCast2D" parent="."]
 
@@ -271,14 +264,15 @@ type_mask = 15
 emitting = false
 amount = 8
 lifetime = 1.0
+one_shot = false
 preprocess = 0.0
 speed_scale = 1.0
 explosiveness = 0.8
 randomness = 0.0
-visibility_rect = Rect2( -100, -100, 200, 200 )
-local_coords = true
 fixed_fps = 0
 fract_delta = true
+visibility_rect = Rect2( -100, -100, 200, 200 )
+local_coords = true
 draw_order = 215832976
 process_material = SubResource( 6 )
 texture = ExtResource( 3 )

+ 2 - 2
2d/platformer/icon.png.import

@@ -11,7 +11,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
@@ -20,4 +20,4 @@ process/premult_alpha=false
 process/HDR_as_SRGB=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false

+ 2 - 2
2d/platformer/moving_platform.png.import

@@ -11,7 +11,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
@@ -20,4 +20,4 @@ process/premult_alpha=false
 process/HDR_as_SRGB=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false

+ 2 - 12
2d/platformer/moving_platform.tscn

@@ -1,13 +1,8 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://moving_platform.gd" type="Script" id=1]
 [ext_resource path="res://moving_platform.png" type="Texture" id=2]
 
-[sub_resource type="ConvexPolygonShape2D" id=1]
-
-custom_solver_bias = 0.0
-points = PoolVector2Array( -88, -24, 88, -24, 88, 24, -88, 24 )
-
 [node name="moving_platform" type="Node2D"]
 
 script = ExtResource( 1 )
@@ -17,12 +12,9 @@ cycle = 1.0
 [node name="platform" type="KinematicBody2D" parent="."]
 
 input_pickable = false
-shapes/0/shape = SubResource( 1 )
-shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-shapes/0/trigger = false
 collision_layer = 1
 collision_mask = 1
-collision/margin = 0.08
+collision/safe_margin = 0.08
 
 [node name="Sprite" type="Sprite" parent="platform"]
 
@@ -32,7 +24,5 @@ texture = ExtResource( 2 )
 
 build_mode = 0
 polygon = PoolVector2Array( -88, -24, 88, -24, 88, 24, -88, 24 )
-shape_range = Vector2( 0, 0 )
-trigger = false
 
 

+ 2 - 2
2d/platformer/one_way_platform.png.import

@@ -11,7 +11,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
@@ -20,4 +20,4 @@ process/premult_alpha=false
 process/HDR_as_SRGB=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false

+ 2 - 2
2d/platformer/osb_fire.png.import

@@ -11,7 +11,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
@@ -20,4 +20,4 @@ process/premult_alpha=false
 process/HDR_as_SRGB=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false

+ 2 - 2
2d/platformer/osb_jump.png.import

@@ -11,7 +11,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
@@ -20,4 +20,4 @@ process/premult_alpha=false
 process/HDR_as_SRGB=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false

+ 2 - 2
2d/platformer/osb_left.png.import

@@ -11,7 +11,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
@@ -20,4 +20,4 @@ process/premult_alpha=false
 process/HDR_as_SRGB=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false

+ 2 - 2
2d/platformer/osb_right.png.import

@@ -11,7 +11,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
@@ -20,4 +20,4 @@ process/premult_alpha=false
 process/HDR_as_SRGB=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false

+ 9 - 3
2d/platformer/parallax_bg.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=14 format=2]
+[gd_scene load_steps=7 format=2]
 
 [ext_resource path="res://scroll_bg_sky.png" type="Texture" id=1]
 [ext_resource path="res://scroll_bg_cloud_1.png" type="Texture" id=2]
@@ -23,6 +23,7 @@ scroll_ignore_camera_zoom = false
 [node name="sky" type="ParallaxLayer" parent="."]
 
 motion_scale = Vector2( 1, 1 )
+motion_offset = Vector2( 0, 0 )
 motion_mirroring = Vector2( 800, 0 )
 
 [node name="Sprite" type="Sprite" parent="sky"]
@@ -34,6 +35,7 @@ centered = false
 [node name="clouds" type="ParallaxLayer" parent="."]
 
 motion_scale = Vector2( 0.1, 1 )
+motion_offset = Vector2( 0, 0 )
 motion_mirroring = Vector2( 800, 0 )
 
 [node name="Sprite" type="Sprite" parent="clouds"]
@@ -75,6 +77,7 @@ centered = false
 [node name="mount_ 2" type="ParallaxLayer" parent="."]
 
 motion_scale = Vector2( 0.2, 1 )
+motion_offset = Vector2( 0, 0 )
 motion_mirroring = Vector2( 800, 0 )
 
 [node name="Sprite" type="Sprite" parent="mount_ 2"]
@@ -82,12 +85,13 @@ motion_mirroring = Vector2( 800, 0 )
 position = Vector2( 0, 225 )
 texture = ExtResource( 5 )
 centered = false
-region = true
+region_enabled = true
 region_rect = Rect2( 0, 0, 800, 256 )
 
 [node name="mount_1" type="ParallaxLayer" parent="."]
 
 motion_scale = Vector2( 0.4, 1 )
+motion_offset = Vector2( 0, 0 )
 motion_mirroring = Vector2( 800, 0 )
 
 [node name="Sprite" type="Sprite" parent="mount_1"]
@@ -95,5 +99,7 @@ motion_mirroring = Vector2( 800, 0 )
 position = Vector2( 0, 225 )
 texture = ExtResource( 6 )
 centered = false
-region = true
+region_enabled = true
 region_rect = Rect2( 0, 0, 800, 256 )
+
+

+ 31 - 33
2d/platformer/player.tscn

@@ -9,13 +9,7 @@
 [ext_resource path="res://osb_jump.png" type="Texture" id=7]
 [ext_resource path="res://osb_fire.png" type="Texture" id=8]
 
-[sub_resource type="CapsuleShape2D" id=1]
-
-custom_solver_bias = 0.0
-radius = 10.0
-height = 44.4787
-
-[sub_resource type="Animation" id=2]
+[sub_resource type="Animation" id=1]
 
 resource_name = "crouch"
 length = 0.01
@@ -33,7 +27,7 @@ tracks/0/keys = {
 "values": [ 22 ]
 }
 
-[sub_resource type="Animation" id=3]
+[sub_resource type="Animation" id=2]
 
 resource_name = "falling"
 length = 0.01
@@ -51,7 +45,7 @@ tracks/0/keys = {
 "values": [ 21 ]
 }
 
-[sub_resource type="Animation" id=4]
+[sub_resource type="Animation" id=3]
 
 resource_name = "falling_weapon"
 length = 0.5
@@ -69,7 +63,7 @@ tracks/0/keys = {
 "values": [ 26 ]
 }
 
-[sub_resource type="Animation" id=5]
+[sub_resource type="Animation" id=4]
 
 length = 7.0
 loop = true
@@ -86,7 +80,7 @@ tracks/0/keys = {
 "values": [ 16, 17, 18, 16, 19, 20, 19, 16 ]
 }
 
-[sub_resource type="Animation" id=6]
+[sub_resource type="Animation" id=5]
 
 length = 0.5
 loop = true
@@ -103,7 +97,7 @@ tracks/0/keys = {
 "values": [ 25 ]
 }
 
-[sub_resource type="Animation" id=7]
+[sub_resource type="Animation" id=6]
 
 length = 0.5
 loop = true
@@ -120,7 +114,7 @@ tracks/0/keys = {
 "values": [ 23, 24, 23 ]
 }
 
-[sub_resource type="Animation" id=8]
+[sub_resource type="Animation" id=7]
 
 length = 0.5
 loop = true
@@ -137,7 +131,7 @@ tracks/0/keys = {
 "values": [ 26 ]
 }
 
-[sub_resource type="Animation" id=9]
+[sub_resource type="Animation" id=8]
 
 length = 1.25
 loop = true
@@ -154,7 +148,7 @@ tracks/0/keys = {
 "values": [ 0, 1, 2, 3, 4, 0 ]
 }
 
-[sub_resource type="Animation" id=10]
+[sub_resource type="Animation" id=9]
 
 length = 1.25
 loop = true
@@ -171,7 +165,7 @@ tracks/0/keys = {
 "values": [ 5, 6, 7, 8, 9, 5 ]
 }
 
-[sub_resource type="Animation" id=11]
+[sub_resource type="Animation" id=10]
 
 length = 1.25
 loop = true
@@ -188,15 +182,18 @@ tracks/0/keys = {
 "values": [ 10, 11, 12, 13, 14, 5 ]
 }
 
+[sub_resource type="CapsuleShape2D" id=11]
+
+custom_solver_bias = 0.0
+radius = 10.0
+height = 44.4787
+
 [node name="player" type="KinematicBody2D"]
 
 input_pickable = false
-shapes/0/shape = SubResource( 1 )
-shapes/0/transform = Transform2D( 1, 0, 0, 1, 0.291992, -0.835023 )
-shapes/0/trigger = false
 collision_layer = 1
 collision_mask = 1
-collision/margin = 0.08
+collision/safe_margin = 0.08
 script = ExtResource( 1 )
 
 [node name="sprite" type="Sprite" parent="."]
@@ -220,16 +217,16 @@ position = Vector2( 30.6589, 6.13176 )
 playback_process_mode = 1
 playback_default_blend_time = 0.0
 root_node = NodePath("..")
-anims/crouch = SubResource( 2 )
-anims/falling = SubResource( 3 )
-anims/falling_weapon = SubResource( 4 )
-anims/idle = SubResource( 5 )
-anims/idle_weapon = SubResource( 6 )
-anims/jumping = SubResource( 7 )
-anims/jumping_weapon = SubResource( 8 )
-anims/run = SubResource( 9 )
-anims/run_weapon = SubResource( 10 )
-anims/standing_weapon_ready = SubResource( 11 )
+anims/crouch = SubResource( 1 )
+anims/falling = SubResource( 2 )
+anims/falling_weapon = SubResource( 3 )
+anims/idle = SubResource( 4 )
+anims/idle_weapon = SubResource( 5 )
+anims/jumping = SubResource( 6 )
+anims/jumping_weapon = SubResource( 7 )
+anims/run = SubResource( 8 )
+anims/run_weapon = SubResource( 9 )
+anims/standing_weapon_ready = SubResource( 10 )
 playback/active = true
 playback/speed = 2.0
 blend_times = [  ]
@@ -254,13 +251,14 @@ drag_margin_left = 0.2
 drag_margin_top = 0.2
 drag_margin_right = 0.2
 drag_margin_bottom = 0.2
+editor_draw_screen = true
+editor_draw_limits = false
+editor_draw_drag_margin = false
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 
 position = Vector2( 0.291992, -0.835023 )
-shape = SubResource( 1 )
-trigger = false
-_update_shape_index = 0
+shape = SubResource( 11 )
 
 [node name="sound_jump" type="AudioStreamPlayer2D" parent="."]
 

+ 2 - 2
2d/platformer/robot_demo.png.import

@@ -11,7 +11,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
@@ -20,4 +20,4 @@ process/premult_alpha=false
 process/HDR_as_SRGB=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false

+ 2 - 2
2d/platformer/scroll_bg_cloud_1.png.import

@@ -11,7 +11,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
@@ -20,4 +20,4 @@ process/premult_alpha=false
 process/HDR_as_SRGB=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false

+ 2 - 2
2d/platformer/scroll_bg_cloud_2.png.import

@@ -11,7 +11,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
@@ -20,4 +20,4 @@ process/premult_alpha=false
 process/HDR_as_SRGB=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false

+ 2 - 2
2d/platformer/scroll_bg_cloud_3.png.import

@@ -11,7 +11,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
@@ -20,4 +20,4 @@ process/premult_alpha=false
 process/HDR_as_SRGB=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false

+ 2 - 2
2d/platformer/scroll_bg_fg_1.png.import

@@ -11,7 +11,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
@@ -20,4 +20,4 @@ process/premult_alpha=false
 process/HDR_as_SRGB=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false

+ 2 - 2
2d/platformer/scroll_bg_fg_2.png.import

@@ -11,7 +11,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
@@ -20,4 +20,4 @@ process/premult_alpha=false
 process/HDR_as_SRGB=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false

+ 2 - 2
2d/platformer/scroll_bg_sky.png.import

@@ -11,7 +11,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
@@ -20,4 +20,4 @@ process/premult_alpha=false
 process/HDR_as_SRGB=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false

File diff suppressed because it is too large
+ 0 - 0
2d/platformer/stage.tscn


+ 2 - 2
2d/platformer/tiles_demo.png.import

@@ -11,7 +11,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
@@ -20,4 +20,4 @@ process/premult_alpha=false
 process/HDR_as_SRGB=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false

+ 71 - 39
2d/platformer/tileset.tres

@@ -5,17 +5,17 @@
 [sub_resource type="ConvexPolygonShape2D" id=1]
 
 custom_solver_bias = 0.0
-points = PoolVector2Array( -32, -24, 32, -24, 32, 32, -32, 32 )
+points = PoolVector2Array( 32, -24, 32, 32, -32, 32, -32, -24 )
 
 [sub_resource type="ConvexPolygonShape2D" id=2]
 
 custom_solver_bias = 0.0
-points = PoolVector2Array( -32, 32, -32, -24, 24, -24, 24, 32 )
+points = PoolVector2Array( -32, -24, 24, -24, 24, 32, -32, 32 )
 
 [sub_resource type="ConvexPolygonShape2D" id=3]
 
 custom_solver_bias = 0.0
-points = PoolVector2Array( -32, -32, 32, -32, 32, 32, -32, 32 )
+points = PoolVector2Array( 32, -32, 32, 32, -32, 32, -32, -32 )
 
 [sub_resource type="ConvexPolygonShape2D" id=4]
 
@@ -25,42 +25,42 @@ points = PoolVector2Array( -32, -56, 32, 8, 32, 64, -32, 64 )
 [sub_resource type="ConvexPolygonShape2D" id=5]
 
 custom_solver_bias = 0.0
-points = PoolVector2Array( -32, 32, -32, -32, 24, -32, 24, 32 )
+points = PoolVector2Array( -32, -32, 24, -32, 24, 32, -32, 32 )
 
 [sub_resource type="ConvexPolygonShape2D" id=6]
 
 custom_solver_bias = 0.0
-points = PoolVector2Array( -32, -24, 32, -24, 32, 24, -32, 24 )
+points = PoolVector2Array( 32, -24, 32, 24, -32, 24, -32, -24 )
 
 [sub_resource type="ConvexPolygonShape2D" id=7]
 
 custom_solver_bias = 0.0
-points = PoolVector2Array( -32, -24, 24, -24, 24, 24, -32, 24 )
+points = PoolVector2Array( 24, -24, 24, 24, -32, 24, -32, -24 )
 
 [sub_resource type="ConvexPolygonShape2D" id=8]
 
 custom_solver_bias = 0.0
-points = PoolVector2Array( -32, 32, -32, -32, 24, -32, 24, 32 )
+points = PoolVector2Array( -32, -32, 24, -32, 24, 32, -32, 32 )
 
 [sub_resource type="ConvexPolygonShape2D" id=9]
 
 custom_solver_bias = 0.0
-points = PoolVector2Array( -64, 32, -64, -32, -8, -32, -8, 32 )
+points = PoolVector2Array( -64, -32, -8, -32, -8, 32, -64, 32 )
 
 [sub_resource type="ConvexPolygonShape2D" id=10]
 
 custom_solver_bias = 0.0
-points = PoolVector2Array( -32, 32, -32, -32, 24, -32, 32, -24, 32, 32 )
+points = PoolVector2Array( -32, -32, 24, -32, 32, -24, 32, 32, -32, 32 )
 
 [sub_resource type="ConvexPolygonShape2D" id=11]
 
 custom_solver_bias = 0.0
-points = PoolVector2Array( -32, 32, -32, -24, 32, -24, 32, 32 )
+points = PoolVector2Array( -32, -24, 32, -24, 32, 32, -32, 32 )
 
 [sub_resource type="ConvexPolygonShape2D" id=12]
 
 custom_solver_bias = 0.0
-points = PoolVector2Array( -32, 32, -32, -24, 32, -24, 32, 32 )
+points = PoolVector2Array( -32, -24, 32, -24, 32, 32, -32, 32 )
 
 [resource]
 
@@ -71,8 +71,11 @@ points = PoolVector2Array( -32, 32, -32, -24, 32, -24, 32, 32 )
 0/region = Rect2( 0, 0, 64, 64 )
 0/occluder_offset = Vector2( 32, 32 )
 0/navigation_offset = Vector2( 32, 32 )
-0/shape_offset = Vector2( 32, 32 )
-0/shapes = [ SubResource( 1 ) ]
+0/shapes = [ {
+"one_way": false,
+"shape": SubResource( 1 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 32, 32 )
+} ]
 1/name = "edge"
 1/texture = ExtResource( 1 )
 1/tex_offset = Vector2( 0, 0 )
@@ -80,8 +83,11 @@ points = PoolVector2Array( -32, 32, -32, -24, 32, -24, 32, 32 )
 1/region = Rect2( 64, 0, 64, 64 )
 1/occluder_offset = Vector2( 32, 32 )
 1/navigation_offset = Vector2( 32, 32 )
-1/shape_offset = Vector2( 32, 32 )
-1/shapes = [ SubResource( 2 ) ]
+1/shapes = [ {
+"one_way": false,
+"shape": SubResource( 2 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 32, 32 )
+} ]
 2/name = "wall"
 2/texture = ExtResource( 1 )
 2/tex_offset = Vector2( 0, 0 )
@@ -89,8 +95,11 @@ points = PoolVector2Array( -32, 32, -32, -24, 32, -24, 32, 32 )
 2/region = Rect2( 64, 64, 64, 64 )
 2/occluder_offset = Vector2( 32, 32 )
 2/navigation_offset = Vector2( 32, 32 )
-2/shape_offset = Vector2( 32, 32 )
-2/shapes = [ SubResource( 8 ) ]
+2/shapes = [ {
+"one_way": false,
+"shape": SubResource( 8 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 32, 32 )
+} ]
 3/name = "wall_deco"
 3/texture = ExtResource( 1 )
 3/tex_offset = Vector2( 0, 0 )
@@ -98,8 +107,11 @@ points = PoolVector2Array( -32, 32, -32, -24, 32, -24, 32, 32 )
 3/region = Rect2( 320, 128, 128, 64 )
 3/occluder_offset = Vector2( 64, 32 )
 3/navigation_offset = Vector2( 64, 32 )
-3/shape_offset = Vector2( 64, 32 )
-3/shapes = [ SubResource( 9 ) ]
+3/shapes = [ {
+"one_way": false,
+"shape": SubResource( 9 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 64, 32 )
+} ]
 4/name = "corner"
 4/texture = ExtResource( 1 )
 4/tex_offset = Vector2( 0, 0 )
@@ -107,8 +119,11 @@ points = PoolVector2Array( -32, 32, -32, -24, 32, -24, 32, 32 )
 4/region = Rect2( 64, 128, 64, 64 )
 4/occluder_offset = Vector2( 32, 32 )
 4/navigation_offset = Vector2( 32, 32 )
-4/shape_offset = Vector2( 32, 32 )
-4/shapes = [ SubResource( 10 ) ]
+4/shapes = [ {
+"one_way": false,
+"shape": SubResource( 10 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 32, 32 )
+} ]
 5/name = "flowers"
 5/texture = ExtResource( 1 )
 5/tex_offset = Vector2( 0, 0 )
@@ -116,8 +131,11 @@ points = PoolVector2Array( -32, 32, -32, -24, 32, -24, 32, 32 )
 5/region = Rect2( 192, 192, 64, 64 )
 5/occluder_offset = Vector2( 32, 32 )
 5/navigation_offset = Vector2( 32, 32 )
-5/shape_offset = Vector2( 32, 32 )
-5/shapes = [ SubResource( 11 ) ]
+5/shapes = [ {
+"one_way": false,
+"shape": SubResource( 11 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 32, 32 )
+} ]
 6/name = "tree_base"
 6/texture = ExtResource( 1 )
 6/tex_offset = Vector2( 0, 0 )
@@ -125,8 +143,11 @@ points = PoolVector2Array( -32, 32, -32, -24, 32, -24, 32, 32 )
 6/region = Rect2( 256, 192, 64, 64 )
 6/occluder_offset = Vector2( 32, 32 )
 6/navigation_offset = Vector2( 32, 32 )
-6/shape_offset = Vector2( 32, 32 )
-6/shapes = [ SubResource( 12 ) ]
+6/shapes = [ {
+"one_way": false,
+"shape": SubResource( 12 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 32, 32 )
+} ]
 7/name = "tree_mid"
 7/texture = ExtResource( 1 )
 7/tex_offset = Vector2( 0, 0 )
@@ -134,7 +155,6 @@ points = PoolVector2Array( -32, 32, -32, -24, 32, -24, 32, 32 )
 7/region = Rect2( 256, 128, 64, 64 )
 7/occluder_offset = Vector2( 32, 32 )
 7/navigation_offset = Vector2( 32, 32 )
-7/shape_offset = Vector2( 0, 0 )
 7/shapes = [  ]
 8/name = "tree_mid 2"
 8/texture = ExtResource( 1 )
@@ -143,7 +163,6 @@ points = PoolVector2Array( -32, 32, -32, -24, 32, -24, 32, 32 )
 8/region = Rect2( 256, 64, 64, 64 )
 8/occluder_offset = Vector2( 32, 32 )
 8/navigation_offset = Vector2( 32, 32 )
-8/shape_offset = Vector2( 0, 0 )
 8/shapes = [  ]
 9/name = "tree_top"
 9/texture = ExtResource( 1 )
@@ -152,7 +171,6 @@ points = PoolVector2Array( -32, 32, -32, -24, 32, -24, 32, 32 )
 9/region = Rect2( 256, 0, 64, 64 )
 9/occluder_offset = Vector2( 32, 32 )
 9/navigation_offset = Vector2( 32, 32 )
-9/shape_offset = Vector2( 0, 0 )
 9/shapes = [  ]
 10/name = "solid"
 10/texture = ExtResource( 1 )
@@ -161,7 +179,6 @@ points = PoolVector2Array( -32, 32, -32, -24, 32, -24, 32, 32 )
 10/region = Rect2( 0, 64, 64, 64 )
 10/occluder_offset = Vector2( 32, 32 )
 10/navigation_offset = Vector2( 32, 32 )
-10/shape_offset = Vector2( 0, 0 )
 10/shapes = [  ]
 11/name = "ceiling"
 11/texture = ExtResource( 1 )
@@ -170,8 +187,11 @@ points = PoolVector2Array( -32, 32, -32, -24, 32, -24, 32, 32 )
 11/region = Rect2( 384, 64, 64, 64 )
 11/occluder_offset = Vector2( 32, 32 )
 11/navigation_offset = Vector2( 32, 32 )
-11/shape_offset = Vector2( 32, 32 )
-11/shapes = [ SubResource( 3 ) ]
+11/shapes = [ {
+"one_way": false,
+"shape": SubResource( 3 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 32, 32 )
+} ]
 12/name = "ramp"
 12/texture = ExtResource( 1 )
 12/tex_offset = Vector2( 0, 0 )
@@ -179,8 +199,11 @@ points = PoolVector2Array( -32, 32, -32, -24, 32, -24, 32, 32 )
 12/region = Rect2( 128, 128, 64, 128 )
 12/occluder_offset = Vector2( 32, 64 )
 12/navigation_offset = Vector2( 32, 64 )
-12/shape_offset = Vector2( 32, 64 )
-12/shapes = [ SubResource( 4 ) ]
+12/shapes = [ {
+"one_way": false,
+"shape": SubResource( 4 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 32, 64 )
+} ]
 13/name = "ceiling2wall"
 13/texture = ExtResource( 1 )
 13/tex_offset = Vector2( 0, 0 )
@@ -188,8 +211,11 @@ points = PoolVector2Array( -32, 32, -32, -24, 32, -24, 32, 32 )
 13/region = Rect2( 448, 64, 64, 64 )
 13/occluder_offset = Vector2( 32, 32 )
 13/navigation_offset = Vector2( 32, 32 )
-13/shape_offset = Vector2( 32, 32 )
-13/shapes = [ SubResource( 5 ) ]
+13/shapes = [ {
+"one_way": false,
+"shape": SubResource( 5 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 32, 32 )
+} ]
 14/name = "platform_floor"
 14/texture = ExtResource( 1 )
 14/tex_offset = Vector2( 0, 0 )
@@ -197,8 +223,11 @@ points = PoolVector2Array( -32, 32, -32, -24, 32, -24, 32, 32 )
 14/region = Rect2( 128, 0, 64, 64 )
 14/occluder_offset = Vector2( 32, 32 )
 14/navigation_offset = Vector2( 32, 32 )
-14/shape_offset = Vector2( 32, 32 )
-14/shapes = [ SubResource( 6 ) ]
+14/shapes = [ {
+"one_way": false,
+"shape": SubResource( 6 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 32, 32 )
+} ]
 15/name = "platform_edge"
 15/texture = ExtResource( 1 )
 15/tex_offset = Vector2( 0, 0 )
@@ -206,6 +235,9 @@ points = PoolVector2Array( -32, 32, -32, -24, 32, -24, 32, 32 )
 15/region = Rect2( 192, 0, 64, 64 )
 15/occluder_offset = Vector2( 32, 32 )
 15/navigation_offset = Vector2( 32, 32 )
-15/shape_offset = Vector2( 32, 32 )
-15/shapes = [ SubResource( 7 ) ]
+15/shapes = [ {
+"one_way": false,
+"shape": SubResource( 7 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 32, 32 )
+} ]
 

+ 23 - 141
2d/platformer/tileset_edit.tscn

@@ -1,82 +1,18 @@
-[gd_scene load_steps=54 format=2]
+[gd_scene load_steps=2 format=2]
 
 [ext_resource path="res://tiles_demo.png" type="Texture" id=1]
 
-[sub_resource type="ConvexPolygonShape2D" id=1]
-
-custom_solver_bias = 0.0
-points = PoolVector2Array( -32, -24, 32, -24, 32, 32, -32, 32 )
-
-[sub_resource type="ConvexPolygonShape2D" id=2]
-
-custom_solver_bias = 0.0
-points = PoolVector2Array( -32, 32, -32, -24, 24, -24, 24, 32 )
-
-[sub_resource type="ConvexPolygonShape2D" id=3]
-
-custom_solver_bias = 0.0
-points = PoolVector2Array( -32, 32, -32, -32, 24, -32, 24, 32 )
-
-[sub_resource type="ConvexPolygonShape2D" id=4]
-
-custom_solver_bias = 0.0
-points = PoolVector2Array( -64, 32, -64, -32, -8, -32, -8, 32 )
-
-[sub_resource type="ConvexPolygonShape2D" id=5]
-
-custom_solver_bias = 0.0
-points = PoolVector2Array( -32, 32, -32, -32, 24, -32, 32, -24, 32, 32 )
-
-[sub_resource type="ConvexPolygonShape2D" id=6]
-
-custom_solver_bias = 0.0
-points = PoolVector2Array( -32, 32, -32, -24, 32, -24, 32, 32 )
-
-[sub_resource type="ConvexPolygonShape2D" id=7]
-
-custom_solver_bias = 0.0
-points = PoolVector2Array( -32, 32, -32, -24, 32, -24, 32, 32 )
-
-[sub_resource type="ConvexPolygonShape2D" id=8]
-
-custom_solver_bias = 0.0
-points = PoolVector2Array( -32, -32, 32, -32, 32, 32, -32, 32 )
-
-[sub_resource type="ConvexPolygonShape2D" id=9]
-
-custom_solver_bias = 0.0
-points = PoolVector2Array( -32, -56, 32, 8, 32, 64, -32, 64 )
-
-[sub_resource type="ConvexPolygonShape2D" id=10]
-
-custom_solver_bias = 0.0
-points = PoolVector2Array( -32, 32, -32, -32, 24, -32, 24, 32 )
-
-[sub_resource type="ConvexPolygonShape2D" id=11]
-
-custom_solver_bias = 0.0
-points = PoolVector2Array( -32, -24, 32, -24, 32, 24, -32, 24 )
-
-[sub_resource type="ConvexPolygonShape2D" id=12]
-
-custom_solver_bias = 0.0
-points = PoolVector2Array( -32, -24, 24, -24, 24, 24, -32, 24 )
-
 [node name="Node" type="Node"]
 
-
 [node name="floor" type="Sprite" parent="."]
 
 texture = ExtResource( 1 )
-region = true
+region_enabled = true
 region_rect = Rect2( 0, 0, 64, 64 )
 
 [node name="collision" type="StaticBody2D" parent="floor"]
 
 input_pickable = false
-shapes/0/shape = SubResource( 1 )
-shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-shapes/0/trigger = false
 collision_layer = 1
 collision_mask = 1
 constant_linear_velocity = Vector2( 0, 0 )
@@ -88,22 +24,17 @@ bounce = 0.0
 
 build_mode = 0
 polygon = PoolVector2Array( 32, -24, 32, 32, -32, 32, -32, -24 )
-shape_range = Vector2( -1, -1 )
-trigger = false
 
 [node name="edge" type="Sprite" parent="."]
 
 position = Vector2( 64, 0 )
 texture = ExtResource( 1 )
-region = true
+region_enabled = true
 region_rect = Rect2( 64, 0, 64, 64 )
 
 [node name="collision" type="StaticBody2D" parent="edge"]
 
 input_pickable = false
-shapes/0/shape = SubResource( 2 )
-shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-shapes/0/trigger = false
 collision_layer = 1
 collision_mask = 1
 constant_linear_velocity = Vector2( 0, 0 )
@@ -115,22 +46,17 @@ bounce = 0.0
 
 build_mode = 0
 polygon = PoolVector2Array( -32, -24, 24, -24, 24, 32, -32, 32 )
-shape_range = Vector2( -1, -1 )
-trigger = false
 
 [node name="wall" type="Sprite" parent="."]
 
 position = Vector2( 64, 64 )
 texture = ExtResource( 1 )
-region = true
+region_enabled = true
 region_rect = Rect2( 64, 64, 64, 64 )
 
 [node name="collision" type="StaticBody2D" parent="wall"]
 
 input_pickable = false
-shapes/0/shape = SubResource( 3 )
-shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-shapes/0/trigger = false
 collision_layer = 1
 collision_mask = 1
 constant_linear_velocity = Vector2( 0, 0 )
@@ -142,22 +68,17 @@ bounce = 0.0
 
 build_mode = 0
 polygon = PoolVector2Array( -32, -32, 24, -32, 24, 32, -32, 32 )
-shape_range = Vector2( -1, -1 )
-trigger = false
 
 [node name="wall_deco" type="Sprite" parent="."]
 
 position = Vector2( 96, 128 )
 texture = ExtResource( 1 )
-region = true
+region_enabled = true
 region_rect = Rect2( 320, 128, 128, 64 )
 
 [node name="collision" type="StaticBody2D" parent="wall_deco"]
 
 input_pickable = false
-shapes/0/shape = SubResource( 4 )
-shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-shapes/0/trigger = false
 collision_layer = 1
 collision_mask = 1
 constant_linear_velocity = Vector2( 0, 0 )
@@ -169,22 +90,17 @@ bounce = 0.0
 
 build_mode = 0
 polygon = PoolVector2Array( -64, -32, -8, -32, -8, 32, -64, 32 )
-shape_range = Vector2( -1, -1 )
-trigger = false
 
 [node name="corner" type="Sprite" parent="."]
 
 position = Vector2( 64, 192 )
 texture = ExtResource( 1 )
-region = true
+region_enabled = true
 region_rect = Rect2( 64, 128, 64, 64 )
 
 [node name="collision" type="StaticBody2D" parent="corner"]
 
 input_pickable = false
-shapes/0/shape = SubResource( 5 )
-shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-shapes/0/trigger = false
 collision_layer = 1
 collision_mask = 1
 constant_linear_velocity = Vector2( 0, 0 )
@@ -196,22 +112,17 @@ bounce = 0.0
 
 build_mode = 0
 polygon = PoolVector2Array( -32, -32, 24, -32, 32, -24, 32, 32, -32, 32 )
-shape_range = Vector2( -1, -1 )
-trigger = false
 
 [node name="flowers" type="Sprite" parent="."]
 
 position = Vector2( 128, 192 )
 texture = ExtResource( 1 )
-region = true
+region_enabled = true
 region_rect = Rect2( 192, 192, 64, 64 )
 
 [node name="collision" type="StaticBody2D" parent="flowers"]
 
 input_pickable = false
-shapes/0/shape = SubResource( 6 )
-shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-shapes/0/trigger = false
 collision_layer = 1
 collision_mask = 1
 constant_linear_velocity = Vector2( 0, 0 )
@@ -223,22 +134,17 @@ bounce = 0.0
 
 build_mode = 0
 polygon = PoolVector2Array( -32, 32, 32, 32, 32, -24, -32, -24 )
-shape_range = Vector2( -1, -1 )
-trigger = false
 
 [node name="tree_base" type="Sprite" parent="."]
 
 position = Vector2( 192, 192 )
 texture = ExtResource( 1 )
-region = true
+region_enabled = true
 region_rect = Rect2( 256, 192, 64, 64 )
 
 [node name="collision" type="StaticBody2D" parent="tree_base"]
 
 input_pickable = false
-shapes/0/shape = SubResource( 7 )
-shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-shapes/0/trigger = false
 collision_layer = 1
 collision_mask = 1
 constant_linear_velocity = Vector2( 0, 0 )
@@ -250,50 +156,45 @@ bounce = 0.0
 
 build_mode = 0
 polygon = PoolVector2Array( -32, 32, 32, 32, 32, -24, -32, -24 )
-shape_range = Vector2( -1, -1 )
-trigger = false
 
 [node name="tree_mid" type="Sprite" parent="."]
 
 position = Vector2( 192, 128 )
 texture = ExtResource( 1 )
-region = true
+region_enabled = true
 region_rect = Rect2( 256, 128, 64, 64 )
 
 [node name="tree_mid 2" type="Sprite" parent="."]
 
 position = Vector2( 192, 64 )
 texture = ExtResource( 1 )
-region = true
+region_enabled = true
 region_rect = Rect2( 256, 64, 64, 64 )
 
 [node name="tree_top" type="Sprite" parent="."]
 
 position = Vector2( 192, 0 )
 texture = ExtResource( 1 )
-region = true
+region_enabled = true
 region_rect = Rect2( 256, 0, 64, 64 )
 
 [node name="solid" type="Sprite" parent="."]
 
 position = Vector2( 0, 64 )
 texture = ExtResource( 1 )
-region = true
+region_enabled = true
 region_rect = Rect2( 0, 64, 64, 64 )
 
 [node name="ceiling" type="Sprite" parent="."]
 
 position = Vector2( 0, 128 )
 texture = ExtResource( 1 )
-region = true
+region_enabled = true
 region_rect = Rect2( 384, 64, 64, 64 )
 
 [node name="collision" type="StaticBody2D" parent="ceiling"]
 
 input_pickable = false
-shapes/0/shape = SubResource( 8 )
-shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-shapes/0/trigger = false
 collision_layer = 1
 collision_mask = 1
 constant_linear_velocity = Vector2( 0, 0 )
@@ -305,22 +206,17 @@ bounce = 0.0
 
 build_mode = 0
 polygon = PoolVector2Array( 32, -32, 32, 32, -32, 32, -32, -32 )
-shape_range = Vector2( -1, -1 )
-trigger = false
 
 [node name="ramp" type="Sprite" parent="."]
 
 position = Vector2( 256, 224 )
 texture = ExtResource( 1 )
-region = true
+region_enabled = true
 region_rect = Rect2( 128, 128, 64, 128 )
 
 [node name="collision" type="StaticBody2D" parent="ramp"]
 
 input_pickable = false
-shapes/0/shape = SubResource( 9 )
-shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-shapes/0/trigger = false
 collision_layer = 1
 collision_mask = 1
 constant_linear_velocity = Vector2( 0, 0 )
@@ -332,22 +228,17 @@ bounce = 0.0
 
 build_mode = 0
 polygon = PoolVector2Array( -32, -56, 32, 8, 32, 64, -32, 64 )
-shape_range = Vector2( -1, -1 )
-trigger = false
 
 [node name="ceiling2wall" type="Sprite" parent="."]
 
 position = Vector2( 0, 192 )
 texture = ExtResource( 1 )
-region = true
+region_enabled = true
 region_rect = Rect2( 448, 64, 64, 64 )
 
 [node name="collision" type="StaticBody2D" parent="ceiling2wall"]
 
 input_pickable = false
-shapes/0/shape = SubResource( 10 )
-shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-shapes/0/trigger = false
 collision_layer = 1
 collision_mask = 1
 constant_linear_velocity = Vector2( 0, 0 )
@@ -359,22 +250,17 @@ bounce = 0.0
 
 build_mode = 0
 polygon = PoolVector2Array( -32, -32, 24, -32, 24, 32, -32, 32 )
-shape_range = Vector2( -1, -1 )
-trigger = false
 
 [node name="platform_floor" type="Sprite" parent="."]
 
 position = Vector2( 0, 256 )
 texture = ExtResource( 1 )
-region = true
+region_enabled = true
 region_rect = Rect2( 128, 0, 64, 64 )
 
 [node name="collision" type="StaticBody2D" parent="platform_floor"]
 
 input_pickable = false
-shapes/0/shape = SubResource( 11 )
-shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-shapes/0/trigger = false
 collision_layer = 1
 collision_mask = 1
 constant_linear_velocity = Vector2( 0, 0 )
@@ -386,22 +272,17 @@ bounce = 0.0
 
 build_mode = 0
 polygon = PoolVector2Array( 32, -24, 32, 24, -32, 24, -32, -24 )
-shape_range = Vector2( -1, -1 )
-trigger = false
 
 [node name="platform_edge" type="Sprite" parent="."]
 
 position = Vector2( 64, 256 )
 texture = ExtResource( 1 )
-region = true
+region_enabled = true
 region_rect = Rect2( 192, 0, 64, 64 )
 
 [node name="collision" type="StaticBody2D" parent="platform_edge"]
 
 input_pickable = false
-shapes/0/shape = SubResource( 12 )
-shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-shapes/0/trigger = false
 collision_layer = 1
 collision_mask = 1
 constant_linear_velocity = Vector2( 0, 0 )
@@ -413,18 +294,17 @@ bounce = 0.0
 
 build_mode = 0
 polygon = PoolVector2Array( 24, -24, 24, 24, -32, 24, -32, -24 )
-shape_range = Vector2( -1, -1 )
-trigger = false
 
 [node name="help" type="Label" parent="."]
 
-focus_ignore_mouse = true
-focus_stop_mouse = true
-size_flags_horizontal = 2
 margin_left = 1.0
 margin_top = 331.0
 margin_right = 727.0
 margin_bottom = 422.0
+rect_clip_content = false
+mouse_filter = 2
+size_flags_horizontal = 2
+size_flags_vertical = 0
 text = "This scene serves as a tool for editing the tileset.
 Nodes (sprites) and their respective collisionsare edited here.
 
@@ -435,3 +315,5 @@ Finally, the saved tileset resource (tileset.tres in this case), can be opened
 percent_visible = 1.0
 lines_skipped = 0
 max_lines_visible = -1
+
+

Some files were not shown because too many files changed in this diff