Skip to content

Commit f34e61e

Browse files
authored
Merge pull request #490 from aaronfranke/misc-tweaks-3.2.2
Misc fixes and tweaks to many demos for 3.2.2
2 parents 343669c + 189d6ac commit f34e61e

File tree

31 files changed

+363
-206
lines changed

31 files changed

+363
-206
lines changed

2d/hexagonal_map/troll.tscn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ radius = 16.0
99
[node name="Troll" type="KinematicBody2D"]
1010
script = ExtResource( 1 )
1111

12-
[node name="Sprite" type="Sprite" parent="."]
12+
[node name="Sprite2D" type="Sprite" parent="."]
1313
texture = ExtResource( 2 )
1414

1515
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]

2d/isometric/tileset.tres

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ points = PoolVector2Array( -40, 16, 24, -16, 40, -8, -24, 24 )
2020
0/tile_mode = 0
2121
0/occluder_offset = Vector2( 67.5, 52.5 )
2222
0/navigation_offset = Vector2( 67.5, 52.5 )
23+
0/shape_offset = Vector2( 0, 0 )
24+
0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
25+
0/shape_one_way = false
26+
0/shape_one_way_margin = 0.0
2327
0/shapes = [ ]
2428
0/z_index = 0
2529
1/name = "Base2"
@@ -30,6 +34,10 @@ points = PoolVector2Array( -40, 16, 24, -16, 40, -8, -24, 24 )
3034
1/tile_mode = 0
3135
1/occluder_offset = Vector2( 67.5, 52.5 )
3236
1/navigation_offset = Vector2( 67.5, 52.5 )
37+
1/shape_offset = Vector2( 0, 0 )
38+
1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
39+
1/shape_one_way = false
40+
1/shape_one_way_margin = 0.0
3341
1/shapes = [ ]
3442
1/z_index = 0
3543
2/name = "Wall"
@@ -40,6 +48,11 @@ points = PoolVector2Array( -40, 16, 24, -16, 40, -8, -24, 24 )
4048
2/tile_mode = 0
4149
2/occluder_offset = Vector2( 70, 70 )
4250
2/navigation_offset = Vector2( 70, 70 )
51+
2/shape_offset = Vector2( 70, 70 )
52+
2/shape_transform = Transform2D( 1, 0, 0, 1, 70, 70 )
53+
2/shape = SubResource( 1 )
54+
2/shape_one_way = false
55+
2/shape_one_way_margin = 1.0
4356
2/shapes = [ {
4457
"autotile_coord": Vector2( 0, 0 ),
4558
"one_way": false,
@@ -56,6 +69,11 @@ points = PoolVector2Array( -40, 16, 24, -16, 40, -8, -24, 24 )
5669
3/tile_mode = 0
5770
3/occluder_offset = Vector2( 27.5, 47.5 )
5871
3/navigation_offset = Vector2( 27.5, 47.5 )
72+
3/shape_offset = Vector2( 29.5, 47.5 )
73+
3/shape_transform = Transform2D( 1, 0, 0, 1, 29.5, 47.5 )
74+
3/shape = SubResource( 2 )
75+
3/shape_one_way = false
76+
3/shape_one_way_margin = 1.0
5977
3/shapes = [ {
6078
"autotile_coord": Vector2( 0, 0 ),
6179
"one_way": false,
@@ -72,6 +90,11 @@ points = PoolVector2Array( -40, 16, 24, -16, 40, -8, -24, 24 )
7290
4/tile_mode = 0
7391
4/occluder_offset = Vector2( 42.5, 55 )
7492
4/navigation_offset = Vector2( 42.5, 55 )
93+
4/shape_offset = Vector2( 42.5, 55 )
94+
4/shape_transform = Transform2D( 1, 0, 0, 1, 42.5, 55 )
95+
4/shape = SubResource( 3 )
96+
4/shape_one_way = false
97+
4/shape_one_way_margin = 1.0
7598
4/shapes = [ {
7699
"autotile_coord": Vector2( 0, 0 ),
77100
"one_way": false,

2d/navigation_astar/Game.tscn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ script = ExtResource( 2 )
1717
position = Vector2( 32, 32 )
1818
script = ExtResource( 3 )
1919

20-
[node name="Sprite" type="Sprite" parent="Character"]
20+
[node name="Sprite2D" type="Sprite" parent="Character"]
2121
position = Vector2( 7, 0 )
2222
texture = ExtResource( 4 )
2323

2d/particles/particles.tscn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,15 +236,15 @@ visibility_rect = Rect2( 26.0055, 90.0015, 199.176, 95.0445 )
236236
process_material = SubResource( 26 )
237237
texture = ExtResource( 3 )
238238

239-
[node name="Outline_Mask" type="Particles2D" parent="."]
239+
[node name="OutlineMask" type="Particles2D" parent="."]
240240
position = Vector2( 42, 52 )
241241
amount = 180
242242
lifetime = 0.2
243243
visibility_rect = Rect2( 26.0055, 90.0015, 199.176, 95.0445 )
244244
process_material = SubResource( 27 )
245245
texture = ExtResource( 3 )
246246

247-
[node name="Direction_Mask" type="Particles2D" parent="."]
247+
[node name="DirectionMask" type="Particles2D" parent="."]
248248
position = Vector2( 40, 180 )
249249
amount = 180
250250
lifetime = 0.2

0 commit comments

Comments
 (0)