Skip to content

Commit

Permalink
fixed collision issue with some tiles
Browse files Browse the repository at this point in the history
  • Loading branch information
@Cod3lta
Cod3lta committed Nov 5, 2023
1 parent 5e9e7d8 commit 20d4788
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 40 deletions.
2 changes: 1 addition & 1 deletion src/actors/player/player.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ position = Vector2( 0, -20 )
scale = Vector2( 10, 10 )
frames = ExtResource( 2 )
animation = "idle"
frame = 2
frame = 4
playing = true

[node name="Camera" type="Camera2D" parent="."]
Expand Down
78 changes: 39 additions & 39 deletions src/levels/levelDemo/levelDemo.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -947,8 +947,8 @@ points = PoolVector2Array( 12, 12, 1, 12, 1, 6, 12, 6 )
10/tile_mode = 0
10/occluder_offset = Vector2( 0, 0 )
10/navigation_offset = Vector2( 0, 0 )
10/shape_offset = Vector2( 0, -13 )
10/shape_transform = Transform2D( 1, 0, 0, 1, 0, -13 )
10/shape_offset = Vector2( 0, 0 )
10/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
10/shape = SubResource( 70 )
10/shape_one_way = false
10/shape_one_way_margin = 1.0
Expand All @@ -957,7 +957,7 @@ points = PoolVector2Array( 12, 12, 1, 12, 1, 6, 12, 6 )
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 70 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, -13 )
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
} ]
10/z_index = 0
11/name = "furnitures.png 11"
Expand All @@ -968,8 +968,8 @@ points = PoolVector2Array( 12, 12, 1, 12, 1, 6, 12, 6 )
11/tile_mode = 0
11/occluder_offset = Vector2( 0, 0 )
11/navigation_offset = Vector2( 0, 0 )
11/shape_offset = Vector2( 0, -13 )
11/shape_transform = Transform2D( 1, 0, 0, 1, 0, -13 )
11/shape_offset = Vector2( 0, 0 )
11/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
11/shape = SubResource( 71 )
11/shape_one_way = false
11/shape_one_way_margin = 1.0
Expand All @@ -978,7 +978,7 @@ points = PoolVector2Array( 12, 12, 1, 12, 1, 6, 12, 6 )
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 71 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, -13 )
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
} ]
11/z_index = 0
12/name = "furnitures.png 12"
Expand All @@ -989,8 +989,8 @@ points = PoolVector2Array( 12, 12, 1, 12, 1, 6, 12, 6 )
12/tile_mode = 0
12/occluder_offset = Vector2( 0, 0 )
12/navigation_offset = Vector2( 0, 0 )
12/shape_offset = Vector2( 0, -13 )
12/shape_transform = Transform2D( 1, 0, 0, 1, 0, -13 )
12/shape_offset = Vector2( 0, 0 )
12/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
12/shape = SubResource( 72 )
12/shape_one_way = false
12/shape_one_way_margin = 1.0
Expand All @@ -999,7 +999,7 @@ points = PoolVector2Array( 12, 12, 1, 12, 1, 6, 12, 6 )
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 72 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, -13 )
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
} ]
12/z_index = 0
13/name = "furnitures.png 13"
Expand All @@ -1010,8 +1010,8 @@ points = PoolVector2Array( 12, 12, 1, 12, 1, 6, 12, 6 )
13/tile_mode = 0
13/occluder_offset = Vector2( 0, 0 )
13/navigation_offset = Vector2( 0, 0 )
13/shape_offset = Vector2( 0, -13 )
13/shape_transform = Transform2D( 1, 0, 0, 1, 0, -13 )
13/shape_offset = Vector2( 0, 0 )
13/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
13/shape = SubResource( 73 )
13/shape_one_way = false
13/shape_one_way_margin = 1.0
Expand All @@ -1020,7 +1020,7 @@ points = PoolVector2Array( 12, 12, 1, 12, 1, 6, 12, 6 )
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 73 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, -13 )
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
} ]
13/z_index = 0
14/name = "furnitures.png 14"
Expand All @@ -1031,8 +1031,8 @@ points = PoolVector2Array( 12, 12, 1, 12, 1, 6, 12, 6 )
14/tile_mode = 0
14/occluder_offset = Vector2( 0, 0 )
14/navigation_offset = Vector2( 0, 0 )
14/shape_offset = Vector2( 0, -13 )
14/shape_transform = Transform2D( 1, 0, 0, 1, 0, -13 )
14/shape_offset = Vector2( 0, 0 )
14/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
14/shape = SubResource( 74 )
14/shape_one_way = false
14/shape_one_way_margin = 1.0
Expand All @@ -1041,7 +1041,7 @@ points = PoolVector2Array( 12, 12, 1, 12, 1, 6, 12, 6 )
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 74 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, -13 )
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
} ]
14/z_index = 0

Expand Down Expand Up @@ -1084,8 +1084,8 @@ points = PoolVector2Array( 15, 31, 25, 31, 25, 38, 15, 38 )
0/tile_mode = 0
0/occluder_offset = Vector2( 0, 0 )
0/navigation_offset = Vector2( 0, 0 )
0/shape_offset = Vector2( 0, -13 )
0/shape_transform = Transform2D( 1, 0, 0, 1, 0, -13 )
0/shape_offset = Vector2( 0, 0 )
0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
0/shape = SubResource( 82 )
0/shape_one_way = false
0/shape_one_way_margin = 1.0
Expand All @@ -1094,7 +1094,7 @@ points = PoolVector2Array( 15, 31, 25, 31, 25, 38, 15, 38 )
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 82 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, -13 )
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
} ]
0/z_index = 0
1/name = "rocks.png 1"
Expand Down Expand Up @@ -1147,8 +1147,8 @@ points = PoolVector2Array( 15, 31, 25, 31, 25, 38, 15, 38 )
3/tile_mode = 0
3/occluder_offset = Vector2( 0, 0 )
3/navigation_offset = Vector2( 0, 0 )
3/shape_offset = Vector2( 0, -13 )
3/shape_transform = Transform2D( 1, 0, 0, 1, 0, -13 )
3/shape_offset = Vector2( 0, 0 )
3/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
3/shape = SubResource( 83 )
3/shape_one_way = false
3/shape_one_way_margin = 1.0
Expand All @@ -1157,7 +1157,7 @@ points = PoolVector2Array( 15, 31, 25, 31, 25, 38, 15, 38 )
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 83 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, -13 )
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
} ]
3/z_index = 0
4/name = "trees.png 4"
Expand All @@ -1168,8 +1168,8 @@ points = PoolVector2Array( 15, 31, 25, 31, 25, 38, 15, 38 )
4/tile_mode = 0
4/occluder_offset = Vector2( 0, 0 )
4/navigation_offset = Vector2( 0, 0 )
4/shape_offset = Vector2( 0, -26 )
4/shape_transform = Transform2D( 1, 0, 0, 1, 0, -26 )
4/shape_offset = Vector2( 0, 0 )
4/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
4/shape = SubResource( 84 )
4/shape_one_way = false
4/shape_one_way_margin = 1.0
Expand All @@ -1178,7 +1178,7 @@ points = PoolVector2Array( 15, 31, 25, 31, 25, 38, 15, 38 )
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 84 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, -26 )
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
} ]
4/z_index = 0
5/name = "trees.png 5"
Expand All @@ -1189,8 +1189,8 @@ points = PoolVector2Array( 15, 31, 25, 31, 25, 38, 15, 38 )
5/tile_mode = 0
5/occluder_offset = Vector2( 0, 0 )
5/navigation_offset = Vector2( 0, 0 )
5/shape_offset = Vector2( -13, -26 )
5/shape_transform = Transform2D( 1, 0, 0, 1, -13, -26 )
5/shape_offset = Vector2( 0, 0 )
5/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
5/shape = SubResource( 85 )
5/shape_one_way = false
5/shape_one_way_margin = 1.0
Expand All @@ -1199,7 +1199,7 @@ points = PoolVector2Array( 15, 31, 25, 31, 25, 38, 15, 38 )
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 85 ),
"shape_transform": Transform2D( 1, 0, 0, 1, -13, -26 )
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
} ]
5/z_index = 0
6/name = "trees.png 6"
Expand All @@ -1210,8 +1210,8 @@ points = PoolVector2Array( 15, 31, 25, 31, 25, 38, 15, 38 )
6/tile_mode = 0
6/occluder_offset = Vector2( 0, 0 )
6/navigation_offset = Vector2( 0, 0 )
6/shape_offset = Vector2( -13, -26 )
6/shape_transform = Transform2D( 1, 0, 0, 1, -13, -26 )
6/shape_offset = Vector2( 0, 0 )
6/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
6/shape = SubResource( 86 )
6/shape_one_way = false
6/shape_one_way_margin = 1.0
Expand All @@ -1220,7 +1220,7 @@ points = PoolVector2Array( 15, 31, 25, 31, 25, 38, 15, 38 )
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 86 ),
"shape_transform": Transform2D( 1, 0, 0, 1, -13, -26 )
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
} ]
6/z_index = 0
7/name = "trees.png 7"
Expand All @@ -1231,8 +1231,8 @@ points = PoolVector2Array( 15, 31, 25, 31, 25, 38, 15, 38 )
7/tile_mode = 0
7/occluder_offset = Vector2( 0, 0 )
7/navigation_offset = Vector2( 0, 0 )
7/shape_offset = Vector2( -13, -26 )
7/shape_transform = Transform2D( 1, 0, 0, 1, -13, -26 )
7/shape_offset = Vector2( 0, 0 )
7/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
7/shape = SubResource( 87 )
7/shape_one_way = false
7/shape_one_way_margin = 1.0
Expand All @@ -1241,7 +1241,7 @@ points = PoolVector2Array( 15, 31, 25, 31, 25, 38, 15, 38 )
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 87 ),
"shape_transform": Transform2D( 1, 0, 0, 1, -13, -26 )
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
} ]
7/z_index = 0
8/name = "trees.png 8"
Expand All @@ -1252,8 +1252,8 @@ points = PoolVector2Array( 15, 31, 25, 31, 25, 38, 15, 38 )
8/tile_mode = 0
8/occluder_offset = Vector2( 0, 0 )
8/navigation_offset = Vector2( 0, 0 )
8/shape_offset = Vector2( -13, -26 )
8/shape_transform = Transform2D( 1, 0, 0, 1, -13, -26 )
8/shape_offset = Vector2( 0, 0 )
8/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
8/shape = SubResource( 88 )
8/shape_one_way = false
8/shape_one_way_margin = 1.0
Expand All @@ -1262,7 +1262,7 @@ points = PoolVector2Array( 15, 31, 25, 31, 25, 38, 15, 38 )
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 88 ),
"shape_transform": Transform2D( 1, 0, 0, 1, -13, -26 )
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
} ]
8/z_index = 0
9/name = "trees.png 9"
Expand All @@ -1273,8 +1273,8 @@ points = PoolVector2Array( 15, 31, 25, 31, 25, 38, 15, 38 )
9/tile_mode = 0
9/occluder_offset = Vector2( 0, 0 )
9/navigation_offset = Vector2( 0, 0 )
9/shape_offset = Vector2( -13, -26 )
9/shape_transform = Transform2D( 1, 0, 0, 1, -13, -26 )
9/shape_offset = Vector2( 0, 0 )
9/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
9/shape = SubResource( 89 )
9/shape_one_way = false
9/shape_one_way_margin = 1.0
Expand All @@ -1283,7 +1283,7 @@ points = PoolVector2Array( 15, 31, 25, 31, 25, 38, 15, 38 )
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 89 ),
"shape_transform": Transform2D( 1, 0, 0, 1, -13, -26 )
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
} ]
9/z_index = 0

Expand Down

0 comments on commit 20d4788

Please sign in to comment.