Skip to content

Commit 4913cd8

Browse files
committed
Misc fixes and tweaks
1 parent fecbed5 commit 4913cd8

File tree

48 files changed

+219
-284
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+219
-284
lines changed

2d/dodge_the_creeps/Mob.tscn

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@
1010

1111
[sub_resource type="SpriteFrames" id=1]
1212
animations = [ {
13-
"frames": [ ExtResource( 4 ), ExtResource( 5 ) ],
13+
"frames": [ ExtResource( 2 ), ExtResource( 3 ) ],
1414
"loop": true,
15-
"name": "walk",
16-
"speed": 4.0
15+
"name": "fly",
16+
"speed": 3.0
1717
}, {
1818
"frames": [ ExtResource( 6 ), ExtResource( 7 ) ],
1919
"loop": true,
2020
"name": "swim",
2121
"speed": 4.0
2222
}, {
23-
"frames": [ ExtResource( 2 ), ExtResource( 3 ) ],
23+
"frames": [ ExtResource( 4 ), ExtResource( 5 ) ],
2424
"loop": true,
25-
"name": "fly",
26-
"speed": 3.0
25+
"name": "walk",
26+
"speed": 4.0
2727
} ]
2828

2929
[sub_resource type="CapsuleShape2D" id=2]

2d/finite_state_machine/player/Player.tscn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ align = 1
115115
valign = 1
116116
uppercase = true
117117
script = ExtResource( 15 )
118-
[connection signal="state_changed" from="StateMachine" to="StateNameDisplayer" method="_on_StateMachine_state_changed"]
119118
[connection signal="state_changed" from="StateMachine" to="BodyPivot/WeaponPivot/Offset/Sword" method="_on_StateMachine_state_changed"]
119+
[connection signal="state_changed" from="StateMachine" to="StateNameDisplayer" method="_on_StateMachine_state_changed"]
120120
[connection signal="animation_finished" from="AnimationPlayer" to="StateMachine" method="_on_animation_finished"]
121121
[connection signal="attack_finished" from="BodyPivot/WeaponPivot/Offset/Sword" to="StateMachine/Attack" method="_on_Sword_attack_finished"]

2d/particles/particles.tscn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ _data = [ Vector2( 0, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 85.0781 ), 0.0, 0.0, 0, 0
1919
[sub_resource type="CurveTexture" id=3]
2020
curve = SubResource( 2 )
2121

22-
[sub_resource type="Curve" id=31]
22+
[sub_resource type="Curve" id=4]
2323
_data = [ Vector2( 0, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 0 ), 0.0, 0.0, 0, 0 ]
2424

2525
[sub_resource type="CurveTexture" id=5]
26-
curve = SubResource( 31 )
26+
curve = SubResource( 4 )
2727

2828
[sub_resource type="ParticlesMaterial" id=6]
2929
emission_shape = 1

2d/physics_tests/main.tscn

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ margin_top = -25.0
141141
margin_right = -5.0
142142
margin_bottom = -5.0
143143
focus_mode = 0
144-
enabled_focus_mode = 0
145144
text = "clear"
146145
__meta__ = {
147146
"_edit_use_anchors_": false
@@ -158,7 +157,6 @@ margin_right = -54.0
158157
margin_bottom = -3.0
159158
focus_mode = 0
160159
pressed = true
161-
enabled_focus_mode = 0
162160
text = "auto-scroll"
163161
__meta__ = {
164162
"_edit_use_anchors_": false

2d/physics_tests/tests/functional/test_character_slopes.tscn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ length = 64.0
2626
[node name="Test" type="Node2D"]
2727
script = ExtResource( 1 )
2828
_snap_distance = 32.0
29-
_floor_max_angle = 45.0
3029

3130
[node name="LabelTestType" type="Label" parent="."]
3231
margin_left = 14.0

2d/physics_tests/tests/functional/test_one_way_collision.tscn

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@ extents = Vector2( 32, 32 )
1717

1818
[node name="Test" type="Node2D"]
1919
script = ExtResource( 1 )
20+
_enable_debug_collision = true
21+
_platform_size = 64.0
22+
_platform_angle = 0.0
23+
_platform_speed = 0.0
24+
_body_angle = 0.0
25+
_body_velocity = Vector2( 400, 0 )
26+
_use_kinematic_body = false
2027

2128
[node name="LabelTestType" type="Label" parent="."]
2229
margin_left = 14.0

2d/pong/paddle.png.import

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ compress/hdr_mode=0
2020
compress/bptc_ldr=0
2121
compress/normal_map=0
2222
flags/repeat=0
23-
flags/filter=true
23+
flags/filter=false
2424
flags/mipmaps=false
2525
flags/anisotropic=false
2626
flags/srgb=2

2d/role_playing_game/grid_movement/pawns/Actor.tscn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,3 @@ anims/walk = SubResource( 2 )
8181
texture = ExtResource( 2 )
8282
centered = false
8383
offset = Vector2( -32, -32 )
84-

2d/role_playing_game/screens/combat/actors/sprites/Sprite.tscn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,3 @@ texture = ExtResource( 1 )
3636
[node name="Body" type="Sprite" parent="Pivot"]
3737
position = Vector2( 0, -76 )
3838
texture = ExtResource( 2 )
39-

2d/role_playing_game/screens/combat/interface/ActorInfo.tscn

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ margin_right = 409.0
77
margin_bottom = 239.0
88
size_flags_horizontal = 3
99
size_flags_vertical = 3
10+
__meta__ = {
11+
"_edit_use_anchors_": false
12+
}
1013

1114
[node name="VBoxContainer" type="VBoxContainer" parent="."]
1215
margin_left = 7.0

0 commit comments

Comments
 (0)