Merge pull request #591 from aaronfranke/misc

Misc improvements and tweaks for 3.2.3

Author: aaronfranke

2d/dodge_the_creeps/Mob.tscn

@@ -10,20 +10,20 @@
 
 [sub_resource type="SpriteFrames" id=1]
 animations = [ {
-"frames": [ ExtResource( 4 ), ExtResource( 5 ) ],
+"frames": [ ExtResource( 2 ), ExtResource( 3 ) ],
 "loop": true,
-"name": "walk",
-"speed": 4.0
+"name": "fly",
+"speed": 3.0
 }, {
 "frames": [ ExtResource( 6 ), ExtResource( 7 ) ],
 "loop": true,
 "name": "swim",
 "speed": 4.0
 }, {
-"frames": [ ExtResource( 2 ), ExtResource( 3 ) ],
+"frames": [ ExtResource( 4 ), ExtResource( 5 ) ],
 "loop": true,
-"name": "fly",
-"speed": 3.0
+"name": "walk",
+"speed": 4.0
 } ]
 
 [sub_resource type="CapsuleShape2D" id=2]

2d/finite_state_machine/player/Player.tscn

@@ -115,7 +115,7 @@ align = 1
 valign = 1
 uppercase = true
 script = ExtResource( 15 )
-[connection signal="state_changed" from="StateMachine" to="StateNameDisplayer" method="_on_StateMachine_state_changed"]
 [connection signal="state_changed" from="StateMachine" to="BodyPivot/WeaponPivot/Offset/Sword" method="_on_StateMachine_state_changed"]
+[connection signal="state_changed" from="StateMachine" to="StateNameDisplayer" method="_on_StateMachine_state_changed"]
 [connection signal="animation_finished" from="AnimationPlayer" to="StateMachine" method="_on_animation_finished"]
 [connection signal="attack_finished" from="BodyPivot/WeaponPivot/Offset/Sword" to="StateMachine/Attack" method="_on_Sword_attack_finished"]

2d/particles/particles.tscn

@@ -19,11 +19,11 @@ _data = [ Vector2( 0, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 85.0781 ), 0.0, 0.0, 0, 0
 [sub_resource type="CurveTexture" id=3]
 curve = SubResource( 2 )
 
-[sub_resource type="Curve" id=31]
+[sub_resource type="Curve" id=4]
 _data = [ Vector2( 0, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 0 ), 0.0, 0.0, 0, 0 ]
 
 [sub_resource type="CurveTexture" id=5]
-curve = SubResource( 31 )
+curve = SubResource( 4 )
 
 [sub_resource type="ParticlesMaterial" id=6]
 emission_shape = 1

2d/physics_tests/main.tscn

@@ -141,7 +141,6 @@ margin_top = -25.0
 margin_right = -5.0
 margin_bottom = -5.0
 focus_mode = 0
-enabled_focus_mode = 0
 text = "clear"
 __meta__ = {
 "_edit_use_anchors_": false
@@ -158,7 +157,6 @@ margin_right = -54.0
 margin_bottom = -3.0
 focus_mode = 0
 pressed = true
-enabled_focus_mode = 0
 text = "auto-scroll"
 __meta__ = {
 "_edit_use_anchors_": false

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

@@ -26,7 +26,6 @@ length = 64.0
 [node name="Test" type="Node2D"]
 script = ExtResource( 1 )
 _snap_distance = 32.0
-_floor_max_angle = 45.0
 
 [node name="LabelTestType" type="Label" parent="."]
 margin_left = 14.0

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

@@ -17,6 +17,13 @@ extents = Vector2( 32, 32 )
 
 [node name="Test" type="Node2D"]
 script = ExtResource( 1 )
+_enable_debug_collision = true
+_platform_size = 64.0
+_platform_angle = 0.0
+_platform_speed = 0.0
+_body_angle = 0.0
+_body_velocity = Vector2( 400, 0 )
+_use_kinematic_body = false
 
 [node name="LabelTestType" type="Label" parent="."]
 margin_left = 14.0

2d/pong/paddle.png.import

@@ -20,7 +20,7 @@ compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2

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

@@ -81,4 +81,3 @@ anims/walk = SubResource( 2 )
 texture = ExtResource( 2 )
 centered = false
 offset = Vector2( -32, -32 )
-

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

@@ -36,4 +36,3 @@ texture = ExtResource( 1 )
 [node name="Body" type="Sprite" parent="Pivot"]
 position = Vector2( 0, -76 )
 texture = ExtResource( 2 )
-

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

@@ -7,6 +7,9 @@ margin_right = 409.0
 margin_bottom = 239.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
+__meta__ = {
+"_edit_use_anchors_": false
+}
 
 [node name="VBoxContainer" type="VBoxContainer" parent="."]
 margin_left = 7.0