Update other 2D demos for Godot 3.2

This commit is contained in:
Aaron Franke
2020-02-17 20:56:48 -05:00
parent 35bd408367
commit dda0bd7e20
12 changed files with 27 additions and 20 deletions

View File

@@ -115,7 +115,7 @@ align = 1
valign = 1
uppercase = true
script = ExtResource( 15 )
[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="state_changed" from="StateMachine" to="BodyPivot/WeaponPivot/Offset/Sword" 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"]

View File

@@ -10,19 +10,23 @@ bg_color = Color( 1, 1, 1, 1 )
[node name="PaintRoot" type="Control"]
margin_right = 40.0
margin_bottom = 40.0
__meta__ = {
"_edit_use_anchors_": false
}
[node name="DrawingAreaBG" type="Panel" parent="."]
margin_left = 350.0
margin_right = 1280.0
margin_bottom = 720.0
custom_styles/panelf = SubResource( 1 )
custom_styles/panel = SubResource( 1 )
custom_styles/panelnc = SubResource( 1 )
[node name="PaintControl" type="Control" parent="."]
margin_right = 40.0
margin_bottom = 40.0
script = ExtResource( 1 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="TLPos" type="Position2D" parent="PaintControl"]
position = Vector2( 350, 0 )
@@ -137,7 +141,6 @@ text = "Brush shape: Circle"
align = 1
[node name="ButtonShapeBox" type="Button" parent="ToolsPanel/BrushSettings"]
editor/display_folded = true
margin_left = 100.0
margin_top = 100.0
margin_right = 160.0
@@ -151,7 +154,6 @@ region_enabled = true
region_rect = Rect2( 0, 16, 16, 16 )
[node name="ButtonShapeCircle" type="Button" parent="ToolsPanel/BrushSettings"]
editor/display_folded = true
margin_left = 190.0
margin_top = 100.0
margin_right = 250.0

View File

@@ -78,7 +78,6 @@ anims/walk = SubResource( 2 )
[node name="Pivot" type="Position2D" parent="."]
[node name="Sprite" type="Sprite" parent="Pivot"]
position = Vector2( 1.43051e-06, -1.90735e-06 )
texture = ExtResource( 2 )
centered = false
offset = Vector2( -32, -32 )

File diff suppressed because one or more lines are too long

View File

@@ -14,9 +14,10 @@ scroll_base_scale = Vector2( 0.7, 0 )
motion_mirroring = Vector2( 800, 0 )
[node name="Sprite" type="Sprite" parent="Sky"]
scale = Vector2( 32, 0.94 )
scale = Vector2( 1000, 0.94 )
texture = ExtResource( 1 )
centered = false
offset = Vector2( -15, 0 )
[node name="Clouds" type="ParallaxLayer" parent="."]
motion_scale = Vector2( 0.1, 1 )

View File

@@ -7,7 +7,6 @@
[ext_resource path="res://audio/sound_explode.wav" type="AudioStream" id=5]
[sub_resource type="PhysicsMaterial" id=1]
friction = 0.0
[sub_resource type="Animation" id=2]
length = 6.0

View File

@@ -83,6 +83,6 @@ func _bullet_collider(cc, s, dp):
state = State.DYING
s.set_angular_velocity(sign(dp.x) * 33.0)
set_friction(1)
physics_material_override.friction = 1
cc.disable()
($SoundHit as AudioStreamPlayer2D).play()

View File

@@ -131,7 +131,6 @@ quality/intended_usage/framebuffer_allocation=0
quality/intended_usage/framebuffer_allocation.mobile=1
quality/filters/anisotropic_filter_level=2
quality/filters/use_nearest_mipmap_filter=true
quality/voxel_cone_tracing/high_quality=false
quality/depth/hdr=false
[texture_import]

View File

@@ -9,6 +9,9 @@ margin_right = 1280.0
margin_bottom = 720.0
theme = ExtResource( 1 )
script = ExtResource( 2 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Name" type="RichTextLabel" parent="."]
margin_left = 40.0

View File

@@ -29,6 +29,9 @@ margin_right = 1280.0
margin_bottom = 720.0
theme = ExtResource( 3 )
script = ExtResource( 4 )
__meta__ = {
"_edit_use_anchors_": false
}
combatants_node = NodePath("../Combatants")
info_scene = ExtResource( 5 )
@@ -55,7 +58,7 @@ columns = 2
[node name="Attack" type="Button" parent="UI/Buttons/GridContainer"]
margin_right = 468.0
margin_bottom = 121.0
margin_bottom = 119.0
size_flags_horizontal = 3
size_flags_vertical = 3
text = "Attack"
@@ -63,15 +66,15 @@ text = "Attack"
[node name="Defend" type="Button" parent="UI/Buttons/GridContainer"]
margin_left = 472.0
margin_right = 940.0
margin_bottom = 121.0
margin_bottom = 119.0
size_flags_horizontal = 3
size_flags_vertical = 3
text = "Defend"
[node name="Flee" type="Button" parent="UI/Buttons/GridContainer"]
margin_top = 125.0
margin_top = 123.0
margin_right = 468.0
margin_bottom = 246.0
margin_bottom = 242.0
size_flags_horizontal = 3
size_flags_vertical = 3
text = "Flee"

View File

@@ -83,6 +83,9 @@ anchor_right = 1.0
anchor_bottom = 1.0
size_flags_horizontal = 2
size_flags_vertical = 2
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Burano" type="TextureRect" parent="Pictures"]
margin_right = 40.0

View File

@@ -59,6 +59,9 @@ custom_colors/font_color_shadow = Color( 0.56592, 0.454525, 0.518426, 1 )
text = "Signed Distance
Field Font!!"
align = 1
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Camera2D" type="Camera2D" parent="."]
offset = Vector2( 512, 300 )