Misc fixes and tweaks

This commit is contained in:
Aaron Franke
2021-03-03 00:06:27 -05:00
parent fecbed5fb2
commit 4913cd868a
48 changed files with 219 additions and 284 deletions

View File

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

View File

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

View File

@@ -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] [sub_resource type="CurveTexture" id=3]
curve = SubResource( 2 ) 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 ] _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] [sub_resource type="CurveTexture" id=5]
curve = SubResource( 31 ) curve = SubResource( 4 )
[sub_resource type="ParticlesMaterial" id=6] [sub_resource type="ParticlesMaterial" id=6]
emission_shape = 1 emission_shape = 1

View File

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

View File

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

View File

@@ -17,6 +17,13 @@ extents = Vector2( 32, 32 )
[node name="Test" type="Node2D"] [node name="Test" type="Node2D"]
script = ExtResource( 1 ) 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="."] [node name="LabelTestType" type="Label" parent="."]
margin_left = 14.0 margin_left = 14.0

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -30,6 +30,9 @@ func _on_Button_button_up():
margin_right = 1024.0 margin_right = 1024.0
margin_bottom = 600.0 margin_bottom = 600.0
theme = ExtResource( 1 ) theme = ExtResource( 1 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Panel" type="Panel" parent="."] [node name="Panel" type="Panel" parent="."]
margin_left = 128.0 margin_left = 128.0

View File

@@ -13,3 +13,6 @@ text = "Title"
align = 1 align = 1
autowrap = true autowrap = true
clip_text = true clip_text = true
__meta__ = {
"_edit_use_anchors_": false
}

View File

@@ -12,4 +12,3 @@ damage = 2
life = 10 life = 10
[node name="Sprite" parent="." instance=ExtResource( 3 )] [node name="Sprite" parent="." instance=ExtResource( 3 )]

View File

@@ -1,23 +1,29 @@
extends Control extends Control
onready var effect = $Effect
onready var effects = $Effects
onready var picture = $Picture
onready var pictures = $Pictures
func _ready(): func _ready():
for c in $Pictures.get_children(): for c in pictures.get_children():
$Picture.add_item("PIC: " + c.get_name()) picture.add_item("PIC: " + c.get_name())
for c in $Effects.get_children(): for c in effects.get_children():
$Effect.add_item("FX: " + c.get_name()) effect.add_item("FX: " + c.get_name())
func _on_picture_item_selected(ID): func _on_picture_item_selected(ID):
for c in range($Pictures.get_child_count()): for c in range(pictures.get_child_count()):
if ID == c: if ID == c:
$Pictures.get_child(c).show() pictures.get_child(c).show()
else: else:
$Pictures.get_child(c).hide() pictures.get_child(c).hide()
func _on_effect_item_selected(ID): func _on_effect_item_selected(ID):
for c in range($Effects.get_child_count()): for c in range(effects.get_child_count()):
if ID == c: if ID == c:
$Effects.get_child(c).show() effects.get_child(c).show()
else: else:
$Effects.get_child(c).hide() effects.get_child(c).hide()

View File

@@ -49,17 +49,7 @@ __meta__ = {
} }
skeleton_path = NodePath("../../../GodotBattleBot/Armature/Skeleton") skeleton_path = NodePath("../../../GodotBattleBot/Armature/Skeleton")
bone_name = "Head" bone_name = "Head"
update_mode = 0
look_at_axis = 1
use_our_rotation_x = false
use_our_rotation_y = false
use_our_rotation_z = false
use_negative_our_rot = false
additional_rotation = Vector3( 90, 0, 0 ) additional_rotation = Vector3( 90, 0, 0 )
position_using_additional_bone = false
additional_bone_name = ""
additional_bone_length = 1.0
debug_messages = false
[node name="IK_LookAt_LeftArm" type="Spatial" parent="Camera/Targets"] [node name="IK_LookAt_LeftArm" type="Spatial" parent="Camera/Targets"]
script = ExtResource( 6 ) script = ExtResource( 6 )
@@ -68,17 +58,6 @@ __meta__ = {
} }
skeleton_path = NodePath("../../../GodotBattleBot/Armature/Skeleton") skeleton_path = NodePath("../../../GodotBattleBot/Armature/Skeleton")
bone_name = "Left_UpperArm" bone_name = "Left_UpperArm"
update_mode = 0
look_at_axis = 1
use_our_rotation_x = false
use_our_rotation_y = false
use_our_rotation_z = false
use_negative_our_rot = false
additional_rotation = Vector3( 0, 0, 0 )
position_using_additional_bone = false
additional_bone_name = ""
additional_bone_length = 1.0
debug_messages = false
[node name="IK_LookAt_RightArm" type="Spatial" parent="Camera/Targets"] [node name="IK_LookAt_RightArm" type="Spatial" parent="Camera/Targets"]
script = ExtResource( 6 ) script = ExtResource( 6 )
@@ -87,17 +66,7 @@ __meta__ = {
} }
skeleton_path = NodePath("../../../GodotBattleBot/Armature/Skeleton") skeleton_path = NodePath("../../../GodotBattleBot/Armature/Skeleton")
bone_name = "Right_UpperArm" bone_name = "Right_UpperArm"
update_mode = 0
look_at_axis = 1
use_our_rotation_x = false
use_our_rotation_y = false
use_our_rotation_z = false
use_negative_our_rot = false
additional_rotation = Vector3( 0, 0, 180 ) additional_rotation = Vector3( 0, 0, 180 )
position_using_additional_bone = false
additional_bone_name = ""
additional_bone_length = 1.0
debug_messages = false
[node name="Control" type="Control" parent="."] [node name="Control" type="Control" parent="."]
anchor_right = 1.0 anchor_right = 1.0

View File

@@ -40,8 +40,8 @@ multithread/thread_rid_pool_prealloc=60
[rendering] [rendering]
quality/intended_usage/framebuffer_allocation=3 quality/intended_usage/framebuffer_allocation=3
vram_compression/import_etc2=false
quality/filters/anisotropic_filter_level=16 quality/filters/anisotropic_filter_level=16
vram_compression/import_etc2=false
quality/filters/msaa=2 quality/filters/msaa=2
quality/filters/msaa.mobile=0 quality/filters/msaa.mobile=0
quality/filters/anisotropic_filter_level.mobile=4 quality/filters/anisotropic_filter_level.mobile=4

View File

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

View File

@@ -148,6 +148,5 @@ multithread/thread_rid_pool_prealloc=60
quality/intended_usage/framebuffer_allocation=3 quality/intended_usage/framebuffer_allocation=3
quality/filters/anisotropic_filter_level=16 quality/filters/anisotropic_filter_level=16
quality/filters/msaa=2 quality/filters/msaa=2
environment/default_environment="res://default_env.tres"
quality/filters/anisotropic_filter_level.mobile=4 quality/filters/anisotropic_filter_level.mobile=4
quality/filters/msaa.mobile=0 quality/filters/msaa.mobile=0

View File

@@ -1,10 +1,11 @@
[gd_scene load_steps=14 format=2] [gd_scene load_steps=15 format=2]
[ext_resource path="res://stage/tiles.tres" type="MeshLibrary" id=1] [ext_resource path="res://stage/tiles.tres" type="MeshLibrary" id=1]
[ext_resource path="res://stage/floor_mesh.tres" type="ArrayMesh" id=2] [ext_resource path="res://stage/floor_mesh.tres" type="ArrayMesh" id=2]
[ext_resource path="res://coin/coin.tscn" type="PackedScene" id=3] [ext_resource path="res://coin/coin.tscn" type="PackedScene" id=3]
[ext_resource path="res://enemy/enemy.tscn" type="PackedScene" id=4] [ext_resource path="res://enemy/enemy.tscn" type="PackedScene" id=4]
[ext_resource path="res://player/player.tscn" type="PackedScene" id=5] [ext_resource path="res://player/player.tscn" type="PackedScene" id=5]
[ext_resource path="res://default_env.tres" type="Environment" id=6]
[sub_resource type="PhysicsMaterial" id=1] [sub_resource type="PhysicsMaterial" id=1]
friction = 0.0 friction = 0.0
@@ -35,6 +36,68 @@ __meta__ = {
"__editor_plugin_screen__": "3D" "__editor_plugin_screen__": "3D"
} }
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = ExtResource( 6 )
[node name="DirectionalLight" type="DirectionalLight" parent="WorldEnvironment"]
transform = Transform( 0.707107, 0.45452, -0.541675, 0, 0.766044, 0.642788, 0.707107, -0.454519, 0.541675, 0, 0, 0 )
shadow_enabled = true
shadow_bias = 0.13
directional_shadow_normal_bias = 0.1
[node name="Reflection1" type="ReflectionProbe" parent="WorldEnvironment"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 1, -1 )
intensity = 0.5
max_distance = 60.0
extents = Vector3( 15, 10, 22 )
origin_offset = Vector3( 0, 4, 0 )
box_projection = true
cull_mask = 1048573
interior_enable = true
interior_ambient_color = Color( 0.403137, 0.55498, 0.884824, 1 )
[node name="Reflection2" type="ReflectionProbe" parent="WorldEnvironment"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 15, 0, 0 )
intensity = 0.5
extents = Vector3( 8, 2.5, 3 )
origin_offset = Vector3( 0, -0.22168, 0 )
box_projection = true
cull_mask = 1048573
interior_enable = true
interior_ambient_color = Color( 0.403137, 0.55498, 0.884824, 1 )
[node name="Reflection3" type="ReflectionProbe" parent="WorldEnvironment"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 20, 0, 4 )
intensity = 0.5
max_distance = 18.7
extents = Vector3( 3, 3, 6 )
origin_offset = Vector3( 0, -0.22168, 0 )
box_projection = true
cull_mask = 1048573
interior_enable = true
interior_ambient_color = Color( 0.403137, 0.55498, 0.884824, 1 )
[node name="Reflection4" type="ReflectionProbe" parent="WorldEnvironment"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 21, 1, 15 )
intensity = 0.5
max_distance = 60.0
extents = Vector3( 12, 10, 8 )
origin_offset = Vector3( 0, 2.00781, 0 )
box_projection = true
cull_mask = 1048573
interior_enable = true
interior_ambient_color = Color( 0.403137, 0.55498, 0.884824, 1 )
[node name="Reflection5" type="ReflectionProbe" parent="WorldEnvironment"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 45, 1, 8 )
intensity = 0.5
max_distance = 60.0
extents = Vector3( 13, 10, 20 )
origin_offset = Vector3( 0, 2.00781, 0 )
cull_mask = 1048573
interior_enable = true
interior_ambient_color = Color( 0.403137, 0.55498, 0.884824, 1 )
[node name="GridMap" type="GridMap" parent="."] [node name="GridMap" type="GridMap" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -16, -6, -12 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -16, -6, -12 )
mesh_library = ExtResource( 1 ) mesh_library = ExtResource( 1 )
@@ -88,12 +151,6 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 7, 11, 9 )
mesh = ExtResource( 2 ) mesh = ExtResource( 2 )
material/0 = null material/0 = null
[node name="DirectionalLight" type="DirectionalLight" parent="."]
transform = Transform( 0.522923, 0.663002, -0.535705, -0.24539, 0.718971, 0.650281, 0.816294, -0.20859, 0.53866, -16, -6, -12 )
shadow_enabled = true
shadow_bias = 0.13
directional_shadow_normal_bias = 0.1
[node name="Coins" type="Spatial" parent="."] [node name="Coins" type="Spatial" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -16, -6, -12 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -16, -6, -12 )
@@ -251,59 +308,6 @@ physics_material_override = SubResource( 4 )
[node name="Player" parent="." instance=ExtResource( 5 )] [node name="Player" parent="." instance=ExtResource( 5 )]
transform = Transform( 0.0160683, 0, -0.999871, 0, 1, 0, 0.999871, 0, 0.0160683, -7.49833, -1.84189, 3.9334 ) transform = Transform( 0.0160683, 0, -0.999871, 0, 1, 0, 0.999871, 0, 0.0160683, -7.49833, -1.84189, 3.9334 )
[node name="Reflection1" type="ReflectionProbe" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 1, -1 )
intensity = 0.5
max_distance = 60.0
extents = Vector3( 15, 10, 22 )
origin_offset = Vector3( 0, 4, 0 )
box_projection = true
cull_mask = 1048573
interior_enable = true
interior_ambient_color = Color( 0.403137, 0.55498, 0.884824, 1 )
[node name="Reflection2" type="ReflectionProbe" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 15, 0, 0 )
intensity = 0.5
extents = Vector3( 8, 2.5, 3 )
origin_offset = Vector3( 0, -0.22168, 0 )
box_projection = true
cull_mask = 1048573
interior_enable = true
interior_ambient_color = Color( 0.403137, 0.55498, 0.884824, 1 )
[node name="Reflection3" type="ReflectionProbe" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 20, 0, 4 )
intensity = 0.5
max_distance = 18.7
extents = Vector3( 3, 3, 6 )
origin_offset = Vector3( 0, -0.22168, 0 )
box_projection = true
cull_mask = 1048573
interior_enable = true
interior_ambient_color = Color( 0.403137, 0.55498, 0.884824, 1 )
[node name="Reflection4" type="ReflectionProbe" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 21, 1, 15 )
intensity = 0.5
max_distance = 60.0
extents = Vector3( 12, 10, 8 )
origin_offset = Vector3( 0, 2.00781, 0 )
box_projection = true
cull_mask = 1048573
interior_enable = true
interior_ambient_color = Color( 0.403137, 0.55498, 0.884824, 1 )
[node name="Reflection5" type="ReflectionProbe" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 45, 1, 8 )
intensity = 0.5
max_distance = 60.0
extents = Vector3( 13, 10, 20 )
origin_offset = Vector3( 0, 2.00781, 0 )
cull_mask = 1048573
interior_enable = true
interior_ambient_color = Color( 0.403137, 0.55498, 0.884824, 1 )
[node name="SoundArea1" type="Area" parent="."] [node name="SoundArea1" type="Area" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -16, -6, -12 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -16, -6, -12 )
reverb_bus_enable = true reverb_bus_enable = true

View File

@@ -8,7 +8,6 @@
albedo_texture = ExtResource( 1 ) albedo_texture = ExtResource( 1 )
metallic = 0.51 metallic = 0.51
metallic_texture = ExtResource( 2 ) metallic_texture = ExtResource( 2 )
roughness = 0.2
roughness_texture = ExtResource( 2 ) roughness_texture = ExtResource( 2 )
[sub_resource type="ArrayMesh" id=2] [sub_resource type="ArrayMesh" id=2]

View File

@@ -79,7 +79,7 @@ shadow_filter=3
quality/driver/driver_name="GLES2" quality/driver/driver_name="GLES2"
quality/intended_usage/framebuffer_allocation=3 quality/intended_usage/framebuffer_allocation=3
quality/shadows/filter_mode=2 quality/shadows/filter_mode=2
quality/filters/anisotropic_filter_level=16
quality/filters/msaa=2 quality/filters/msaa=2
environment/default_environment="res://default_env.tres" environment/default_environment="res://default_env.tres"
quality/filters/anisotropic_filter_level=16
quality/filters/anisotropic_filter_level.mobile=4 quality/filters/anisotropic_filter_level.mobile=4

View File

@@ -8,7 +8,7 @@ radius = 0.4
height = 1.8 height = 1.8
[sub_resource type="AtlasTexture" id=2] [sub_resource type="AtlasTexture" id=2]
flags = 3 flags = 11
atlas = ExtResource( 2 ) atlas = ExtResource( 2 )
region = Rect2( 0, 0, 64, 64 ) region = Rect2( 0, 0, 64, 64 )

View File

@@ -160,8 +160,8 @@ common/physics_fps=120
quality/driver/driver_name="GLES2" quality/driver/driver_name="GLES2"
vram_compression/import_etc=true vram_compression/import_etc=true
vram_compression/import_etc2=false vram_compression/import_etc2=false
quality/filters/anisotropic_filter_level=16
quality/filters/msaa=2 quality/filters/msaa=2
environment/default_environment="res://default_env.tres" environment/default_environment="res://default_env.tres"
quality/filters/anisotropic_filter_level=16
gles2/debug/disable_half_float=true gles2/debug/disable_half_float=true
quality/filters/anisotropic_filter_level.mobile=4 quality/filters/anisotropic_filter_level.mobile=4

View File

@@ -32,6 +32,9 @@ size_flags_horizontal = 2
size_flags_vertical = 0 size_flags_vertical = 0
text = "Drag colors from button to button, or change button colors and drag them again." text = "Drag colors from button to button, or change button colors and drag them again."
align = 1 align = 1
__meta__ = {
"_edit_use_anchors_": false
}
[node name="GridContainer" type="GridContainer" parent="."] [node name="GridContainer" type="GridContainer" parent="."]
anchor_left = 0.5 anchor_left = 0.5
@@ -48,9 +51,9 @@ __meta__ = {
} }
[node name="ColorPickerButton0" type="ColorPickerButton" parent="GridContainer"] [node name="ColorPickerButton0" type="ColorPickerButton" parent="GridContainer"]
margin_left = 33.0 margin_left = 34.0
margin_top = 25.0 margin_top = 25.0
margin_right = 129.0 margin_right = 130.0
margin_bottom = 89.0 margin_bottom = 89.0
rect_min_size = Vector2( 96, 64 ) rect_min_size = Vector2( 96, 64 )
size_flags_horizontal = 6 size_flags_horizontal = 6
@@ -62,9 +65,9 @@ __meta__ = {
} }
[node name="ColorPickerButton1" type="ColorPickerButton" parent="GridContainer"] [node name="ColorPickerButton1" type="ColorPickerButton" parent="GridContainer"]
margin_left = 201.0 margin_left = 202.0
margin_top = 25.0 margin_top = 25.0
margin_right = 297.0 margin_right = 298.0
margin_bottom = 89.0 margin_bottom = 89.0
rect_min_size = Vector2( 96, 64 ) rect_min_size = Vector2( 96, 64 )
size_flags_horizontal = 6 size_flags_horizontal = 6
@@ -73,9 +76,9 @@ color = Color( 0, 0.797347, 0.741037, 1 )
script = ExtResource( 1 ) script = ExtResource( 1 )
[node name="ColorPickerButton2" type="ColorPickerButton" parent="GridContainer"] [node name="ColorPickerButton2" type="ColorPickerButton" parent="GridContainer"]
margin_left = 369.0 margin_left = 370.0
margin_top = 25.0 margin_top = 25.0
margin_right = 465.0 margin_right = 466.0
margin_bottom = 89.0 margin_bottom = 89.0
rect_min_size = Vector2( 96, 64 ) rect_min_size = Vector2( 96, 64 )
size_flags_horizontal = 6 size_flags_horizontal = 6
@@ -84,9 +87,9 @@ color = Color( 0.443924, 0, 0.632923, 1 )
script = ExtResource( 1 ) script = ExtResource( 1 )
[node name="ColorPickerButton3" type="ColorPickerButton" parent="GridContainer"] [node name="ColorPickerButton3" type="ColorPickerButton" parent="GridContainer"]
margin_left = 33.0 margin_left = 34.0
margin_top = 143.0 margin_top = 143.0
margin_right = 129.0 margin_right = 130.0
margin_bottom = 207.0 margin_bottom = 207.0
rect_min_size = Vector2( 96, 64 ) rect_min_size = Vector2( 96, 64 )
size_flags_horizontal = 6 size_flags_horizontal = 6
@@ -95,9 +98,9 @@ color = Color( 1, 1, 1, 1 )
script = ExtResource( 1 ) script = ExtResource( 1 )
[node name="ColorPickerButton4" type="ColorPickerButton" parent="GridContainer"] [node name="ColorPickerButton4" type="ColorPickerButton" parent="GridContainer"]
margin_left = 201.0 margin_left = 202.0
margin_top = 143.0 margin_top = 143.0
margin_right = 297.0 margin_right = 298.0
margin_bottom = 207.0 margin_bottom = 207.0
rect_min_size = Vector2( 96, 64 ) rect_min_size = Vector2( 96, 64 )
size_flags_horizontal = 6 size_flags_horizontal = 6
@@ -106,9 +109,9 @@ color = Color( 1, 0.933842, 0, 1 )
script = ExtResource( 1 ) script = ExtResource( 1 )
[node name="ColorPickerButton5" type="ColorPickerButton" parent="GridContainer"] [node name="ColorPickerButton5" type="ColorPickerButton" parent="GridContainer"]
margin_left = 369.0 margin_left = 370.0
margin_top = 143.0 margin_top = 143.0
margin_right = 465.0 margin_right = 466.0
margin_bottom = 207.0 margin_bottom = 207.0
rect_min_size = Vector2( 96, 64 ) rect_min_size = Vector2( 96, 64 )
size_flags_horizontal = 6 size_flags_horizontal = 6
@@ -117,9 +120,9 @@ color = Color( 0.287293, 0.886362, 0.122933, 1 )
script = ExtResource( 1 ) script = ExtResource( 1 )
[node name="ColorPickerButton6" type="ColorPickerButton" parent="GridContainer"] [node name="ColorPickerButton6" type="ColorPickerButton" parent="GridContainer"]
margin_left = 33.0 margin_left = 34.0
margin_top = 261.0 margin_top = 261.0
margin_right = 129.0 margin_right = 130.0
margin_bottom = 325.0 margin_bottom = 325.0
rect_min_size = Vector2( 96, 64 ) rect_min_size = Vector2( 96, 64 )
size_flags_horizontal = 6 size_flags_horizontal = 6
@@ -128,9 +131,9 @@ color = Color( 0.908461, 0, 0.88789, 1 )
script = ExtResource( 1 ) script = ExtResource( 1 )
[node name="ColorPickerButton7" type="ColorPickerButton" parent="GridContainer"] [node name="ColorPickerButton7" type="ColorPickerButton" parent="GridContainer"]
margin_left = 201.0 margin_left = 202.0
margin_top = 261.0 margin_top = 261.0
margin_right = 297.0 margin_right = 298.0
margin_bottom = 325.0 margin_bottom = 325.0
rect_min_size = Vector2( 96, 64 ) rect_min_size = Vector2( 96, 64 )
size_flags_horizontal = 6 size_flags_horizontal = 6
@@ -139,9 +142,9 @@ color = Color( 0, 0.283703, 0, 1 )
script = ExtResource( 1 ) script = ExtResource( 1 )
[node name="ColorPickerButton8" type="ColorPickerButton" parent="GridContainer"] [node name="ColorPickerButton8" type="ColorPickerButton" parent="GridContainer"]
margin_left = 369.0 margin_left = 370.0
margin_top = 261.0 margin_top = 261.0
margin_right = 465.0 margin_right = 466.0
margin_bottom = 325.0 margin_bottom = 325.0
rect_min_size = Vector2( 96, 64 ) rect_min_size = Vector2( 96, 64 )
size_flags_horizontal = 6 size_flags_horizontal = 6

View File

@@ -75,13 +75,13 @@ action = "move_left"
[node name="ActionRemapRow2" type="HBoxContainer" parent="RemapButtonGroup/ActionsList"] [node name="ActionRemapRow2" type="HBoxContainer" parent="RemapButtonGroup/ActionsList"]
margin_top = 56.0 margin_top = 56.0
margin_right = 320.0 margin_right = 320.0
margin_bottom = 108.0 margin_bottom = 109.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
[node name="ActionName" type="Label" parent="RemapButtonGroup/ActionsList/ActionRemapRow2"] [node name="ActionName" type="Label" parent="RemapButtonGroup/ActionsList/ActionRemapRow2"]
margin_right = 158.0 margin_right = 158.0
margin_bottom = 52.0 margin_bottom = 53.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
text = "Move Right" text = "Move Right"
@@ -91,22 +91,22 @@ valign = 1
[node name="RemapButton" parent="RemapButtonGroup/ActionsList/ActionRemapRow2" instance=ExtResource( 1 )] [node name="RemapButton" parent="RemapButtonGroup/ActionsList/ActionRemapRow2" instance=ExtResource( 1 )]
margin_left = 162.0 margin_left = 162.0
margin_right = 320.0 margin_right = 320.0
margin_bottom = 52.0 margin_bottom = 53.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
group = SubResource( 1 ) group = SubResource( 1 )
action = "move_right" action = "move_right"
[node name="ActionRemapRow3" type="HBoxContainer" parent="RemapButtonGroup/ActionsList"] [node name="ActionRemapRow3" type="HBoxContainer" parent="RemapButtonGroup/ActionsList"]
margin_top = 112.0 margin_top = 113.0
margin_right = 320.0 margin_right = 320.0
margin_bottom = 164.0 margin_bottom = 166.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
[node name="ActionName" type="Label" parent="RemapButtonGroup/ActionsList/ActionRemapRow3"] [node name="ActionName" type="Label" parent="RemapButtonGroup/ActionsList/ActionRemapRow3"]
margin_right = 158.0 margin_right = 158.0
margin_bottom = 52.0 margin_bottom = 53.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
text = "Look Up" text = "Look Up"
@@ -116,22 +116,22 @@ valign = 1
[node name="RemapButton" parent="RemapButtonGroup/ActionsList/ActionRemapRow3" instance=ExtResource( 1 )] [node name="RemapButton" parent="RemapButtonGroup/ActionsList/ActionRemapRow3" instance=ExtResource( 1 )]
margin_left = 162.0 margin_left = 162.0
margin_right = 320.0 margin_right = 320.0
margin_bottom = 52.0 margin_bottom = 53.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
group = SubResource( 1 ) group = SubResource( 1 )
action = "look_up" action = "look_up"
[node name="ActionRemapRow4" type="HBoxContainer" parent="RemapButtonGroup/ActionsList"] [node name="ActionRemapRow4" type="HBoxContainer" parent="RemapButtonGroup/ActionsList"]
margin_top = 168.0 margin_top = 170.0
margin_right = 320.0 margin_right = 320.0
margin_bottom = 220.0 margin_bottom = 223.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
[node name="ActionName" type="Label" parent="RemapButtonGroup/ActionsList/ActionRemapRow4"] [node name="ActionName" type="Label" parent="RemapButtonGroup/ActionsList/ActionRemapRow4"]
margin_right = 158.0 margin_right = 158.0
margin_bottom = 52.0 margin_bottom = 53.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
text = "Crouch" text = "Crouch"
@@ -141,14 +141,14 @@ valign = 1
[node name="RemapButton" parent="RemapButtonGroup/ActionsList/ActionRemapRow4" instance=ExtResource( 1 )] [node name="RemapButton" parent="RemapButtonGroup/ActionsList/ActionRemapRow4" instance=ExtResource( 1 )]
margin_left = 162.0 margin_left = 162.0
margin_right = 320.0 margin_right = 320.0
margin_bottom = 52.0 margin_bottom = 53.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
group = SubResource( 1 ) group = SubResource( 1 )
action = "crouch" action = "crouch"
[node name="ActionRemapRow5" type="HBoxContainer" parent="RemapButtonGroup/ActionsList"] [node name="ActionRemapRow5" type="HBoxContainer" parent="RemapButtonGroup/ActionsList"]
margin_top = 224.0 margin_top = 227.0
margin_right = 320.0 margin_right = 320.0
margin_bottom = 280.0 margin_bottom = 280.0
size_flags_horizontal = 3 size_flags_horizontal = 3
@@ -156,7 +156,7 @@ size_flags_vertical = 3
[node name="ActionName" type="Label" parent="RemapButtonGroup/ActionsList/ActionRemapRow5"] [node name="ActionName" type="Label" parent="RemapButtonGroup/ActionsList/ActionRemapRow5"]
margin_right = 158.0 margin_right = 158.0
margin_bottom = 56.0 margin_bottom = 53.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
text = "Dash" text = "Dash"
@@ -166,7 +166,7 @@ valign = 1
[node name="RemapButton" parent="RemapButtonGroup/ActionsList/ActionRemapRow5" instance=ExtResource( 1 )] [node name="RemapButton" parent="RemapButtonGroup/ActionsList/ActionRemapRow5" instance=ExtResource( 1 )]
margin_left = 162.0 margin_left = 162.0
margin_right = 320.0 margin_right = 320.0
margin_bottom = 56.0 margin_bottom = 53.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
group = SubResource( 1 ) group = SubResource( 1 )

View File

@@ -4,6 +4,9 @@
[node name="BackgroundLoad" type="Control"] [node name="BackgroundLoad" type="Control"]
script = ExtResource( 1 ) script = ExtResource( 1 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Progress" type="ProgressBar" parent="."] [node name="Progress" type="ProgressBar" parent="."]
visible = false visible = false

View File

@@ -2,7 +2,7 @@
[ext_resource path="res://scene_a.gd" type="Script" id=1] [ext_resource path="res://scene_a.gd" type="Script" id=1]
[node name="scene_a" type="Panel"] [node name="SceneA" type="Panel"]
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
size_flags_horizontal = 2 size_flags_horizontal = 2
@@ -12,7 +12,7 @@ __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="label" type="Label" parent="."] [node name="Label" type="Label" parent="."]
margin_left = 64.0 margin_left = 64.0
margin_top = 48.0 margin_top = 48.0
margin_right = 104.0 margin_right = 104.0
@@ -20,7 +20,7 @@ margin_bottom = 62.0
size_flags_vertical = 0 size_flags_vertical = 0
text = "This is scene A." text = "This is scene A."
[node name="goto_scene" type="Button" parent="."] [node name="GoToScene" type="Button" parent="."]
margin_left = 64.0 margin_left = 64.0
margin_top = 128.0 margin_top = 128.0
margin_right = 192.0 margin_right = 192.0
@@ -28,4 +28,7 @@ margin_bottom = 160.0
size_flags_horizontal = 2 size_flags_horizontal = 2
size_flags_vertical = 2 size_flags_vertical = 2
text = "Go to Scene B" text = "Go to Scene B"
[connection signal="pressed" from="goto_scene" to="." method="_on_goto_scene_pressed"] __meta__ = {
"_edit_use_anchors_": false
}
[connection signal="pressed" from="GoToScene" to="." method="_on_goto_scene_pressed"]

View File

@@ -2,61 +2,30 @@
[ext_resource path="res://scene_b.gd" type="Script" id=1] [ext_resource path="res://scene_b.gd" type="Script" id=1]
[node name="scene_b" type="Panel"] [node name="SceneB" type="Panel"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 0
size_flags_horizontal = 2 size_flags_horizontal = 2
size_flags_vertical = 2 size_flags_vertical = 2
script = ExtResource( 1 ) script = ExtResource( 1 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="label" type="Label" parent="."] [node name="Label" type="Label" parent="."]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 64.0 margin_left = 64.0
margin_top = 48.0 margin_top = 48.0
margin_right = 164.0 margin_right = 164.0
margin_bottom = 62.0 margin_bottom = 62.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 2
size_flags_horizontal = 1
size_flags_vertical = 0 size_flags_vertical = 0
text = "This is scene B." text = "This is scene B."
percent_visible = 1.0
lines_skipped = 0
max_lines_visible = -1
[node name="goto_scene" type="Button" parent="."] [node name="GoToScene" type="Button" parent="."]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 64.0 margin_left = 64.0
margin_top = 128.0 margin_top = 128.0
margin_right = 192.0 margin_right = 192.0
margin_bottom = 160.0 margin_bottom = 160.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 0
size_flags_horizontal = 2 size_flags_horizontal = 2
size_flags_vertical = 2 size_flags_vertical = 2
toggle_mode = false
enabled_focus_mode = 2
shortcut = null
group = null
text = "Go to Scene A" text = "Go to Scene A"
flat = false [connection signal="pressed" from="GoToScene" to="." method="_on_goto_scene_pressed"]
[connection signal="pressed" from="goto_scene" to="." method="_on_goto_scene_pressed"]

View File

@@ -20,3 +20,4 @@ script = ExtResource( 4 )
__meta__ = { __meta__ = {
"_editor_icon": ExtResource( 1 ) "_editor_icon": ExtResource( 1 )
} }
sort_enabled = true

View File

@@ -9,6 +9,7 @@ script = ExtResource( 1 )
__meta__ = { __meta__ = {
"_editor_icon": ExtResource( 2 ) "_editor_icon": ExtResource( 2 )
} }
spatial_position = Vector3( 0, 0, 0 )
[node name="CubePointMath" type="Spatial" parent="."] [node name="CubePointMath" type="Spatial" parent="."]

View File

@@ -14,6 +14,7 @@ script = ExtResource( 1 )
__meta__ = { __meta__ = {
"_editor_icon": ExtResource( 2 ) "_editor_icon": ExtResource( 2 )
} }
spatial_position = Vector3( 0, 0, 0 )
[node name="PlatformMath" type="StaticBody" parent="."] [node name="PlatformMath" type="StaticBody" parent="."]
collision_layer = 1048575 collision_layer = 1048575

View File

@@ -954,7 +954,6 @@ margin_bottom = 30.0
focus_mode = 0 focus_mode = 0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
enabled_focus_mode = 0
text = "Start Vibration" text = "Start Vibration"
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
@@ -1013,7 +1012,6 @@ margin_bottom = 30.0
text = "Show" text = "Show"
[node name="RemapWizard" parent="." instance=ExtResource( 3 )] [node name="RemapWizard" parent="." instance=ExtResource( 3 )]
[connection signal="pressed" from="Vibration/Buttons/Start" to="." method="_on_start_vibration_pressed"] [connection signal="pressed" from="Vibration/Buttons/Start" to="." method="_on_start_vibration_pressed"]
[connection signal="pressed" from="Vibration/Buttons/Stop" to="." method="_on_stop_vibration_pressed"] [connection signal="pressed" from="Vibration/Buttons/Stop" to="." method="_on_stop_vibration_pressed"]
[connection signal="pressed" from="VBoxContainer/Clear" to="." method="_on_Clear_pressed"] [connection signal="pressed" from="VBoxContainer/Clear" to="." method="_on_Clear_pressed"]

View File

@@ -264,7 +264,6 @@ margin_bottom = 176.0
size_flags_vertical = 3 size_flags_vertical = 3
readonly = true readonly = true
wrap_enabled = true wrap_enabled = true
[connection signal="pressed" from="Start/Margin/Layout/HTML5/known/Xbox" to="." method="_on_xbox_pressed"] [connection signal="pressed" from="Start/Margin/Layout/HTML5/known/Xbox" to="." method="_on_xbox_pressed"]
[connection signal="pressed" from="Start/Margin/Layout/HTML5/known/XboxOSX" to="." method="_on_xboxosx_pressed"] [connection signal="pressed" from="Start/Margin/Layout/HTML5/known/XboxOSX" to="." method="_on_xboxosx_pressed"]
[connection signal="pressed" from="Start/Margin/Layout/Buttons/Cancel" to="." method="_on_Cancel_pressed"] [connection signal="pressed" from="Start/Margin/Layout/Buttons/Cancel" to="." method="_on_Cancel_pressed"]

View File

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

View File

@@ -51,7 +51,6 @@ script = ExtResource( 1 )
__meta__ = { __meta__ = {
"_edit_group_": true "_edit_group_": true
} }
_speed = 400
[node name="AnimatedSprite" type="AnimatedSprite" parent="."] [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
scale = Vector2( 0.5, 0.5 ) scale = Vector2( 0.5, 0.5 )

View File

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

View File

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

View File

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

View File

@@ -20,6 +20,7 @@ var current_anim = ""
var prev_bombing = false var prev_bombing = false
var bomb_index = 0 var bomb_index = 0
func _physics_process(_delta): func _physics_process(_delta):
var motion = Vector2() var motion = Vector2()
@@ -74,18 +75,22 @@ func _physics_process(_delta):
if not is_network_master(): if not is_network_master():
puppet_pos = position # To avoid jitter puppet_pos = position # To avoid jitter
puppet func stun(): puppet func stun():
stunned = true stunned = true
master func exploded(_by_who): master func exploded(_by_who):
if stunned: if stunned:
return return
rpc("stun") # Stun puppets rpc("stun") # Stun puppets
stun() # Stun master - could use sync to do both at once stun() # Stun master - could use sync to do both at once
func set_player_name(new_name): func set_player_name(new_name):
get_node("label").set_text(new_name) get_node("label").set_text(new_name)
func _ready(): func _ready():
stunned = false stunned = false
puppet_pos = position puppet_pos = position

View File

@@ -4,6 +4,7 @@ extends KinematicBody2D
puppet func do_explosion(): puppet func do_explosion():
$"AnimationPlayer".play("explode") $"AnimationPlayer".play("explode")
# Received by owner of the rock # Received by owner of the rock
master func exploded(by_who): master func exploded(by_who):
rpc("do_explosion") # Re-sent to puppet rocks rpc("do_explosion") # Re-sent to puppet rocks

View File

@@ -10,6 +10,7 @@ func register(path):
if peers.size() == 2: if peers.size() == 2:
get_node(peers[0]).peer.create_offer() get_node(peers[0]).peer.create_offer()
func _find_other(path): func _find_other(path):
# Find the other registered peer. # Find the other registered peer.
for p in peers: for p in peers:
@@ -17,11 +18,13 @@ func _find_other(path):
return p return p
return "" return ""
func send_session(path, type, sdp): func send_session(path, type, sdp):
var other = _find_other(path) var other = _find_other(path)
assert(other != "") assert(other != "")
get_node(other).peer.set_remote_description(type, sdp) get_node(other).peer.set_remote_description(type, sdp)
func send_candidate(path, mid, index, sdp): func send_candidate(path, mid, index, sdp):
var other = _find_other(path) var other = _find_other(path)
assert(other != "") assert(other != "")

View File

@@ -8,35 +8,23 @@ anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
script = ExtResource( 1 ) script = ExtResource( 1 )
__meta__ = { __meta__ = {
"_edit_use_anchors_": false
} }
[node name="Server" type="Node" parent="."] [node name="Server" type="Node" parent="."]
script = ExtResource( 2 ) script = ExtResource( 2 )
__meta__ = {
}
[node name="Panel" type="Panel" parent="."] [node name="Panel" type="Panel" parent="."]
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
__meta__ = {
}
[node name="VBoxContainer" type="VBoxContainer" parent="Panel"] [node name="VBoxContainer" type="VBoxContainer" parent="Panel"]
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
__meta__ = {
}
[node name="HBoxContainer" type="HBoxContainer" parent="Panel/VBoxContainer"] [node name="HBoxContainer" type="HBoxContainer" parent="Panel/VBoxContainer"]
margin_right = 1024.0 margin_right = 1024.0
margin_bottom = 24.0 margin_bottom = 24.0
__meta__ = {
}
[node name="Port" type="SpinBox" parent="Panel/VBoxContainer/HBoxContainer"] [node name="Port" type="SpinBox" parent="Panel/VBoxContainer/HBoxContainer"]
margin_right = 74.0 margin_right = 74.0
@@ -44,9 +32,6 @@ margin_bottom = 24.0
min_value = 1.0 min_value = 1.0
max_value = 65535.0 max_value = 65535.0
value = 8000.0 value = 8000.0
__meta__ = {
}
[node name="Listen" type="Button" parent="Panel/VBoxContainer/HBoxContainer"] [node name="Listen" type="Button" parent="Panel/VBoxContainer/HBoxContainer"]
margin_left = 78.0 margin_left = 78.0
@@ -54,76 +39,49 @@ margin_right = 129.0
margin_bottom = 24.0 margin_bottom = 24.0
toggle_mode = true toggle_mode = true
text = "Listen" text = "Listen"
__meta__ = {
}
[node name="HBoxContainer2" type="HBoxContainer" parent="Panel/VBoxContainer"] [node name="HBoxContainer2" type="HBoxContainer" parent="Panel/VBoxContainer"]
margin_top = 28.0 margin_top = 28.0
margin_right = 1024.0 margin_right = 1024.0
margin_bottom = 52.0 margin_bottom = 52.0
__meta__ = {
}
[node name="WriteMode" type="OptionButton" parent="Panel/VBoxContainer/HBoxContainer2"] [node name="WriteMode" type="OptionButton" parent="Panel/VBoxContainer/HBoxContainer2"]
margin_right = 41.0 margin_right = 29.0
margin_bottom = 24.0 margin_bottom = 24.0
__meta__ = {
}
[node name="MPAPI" type="CheckBox" parent="Panel/VBoxContainer/HBoxContainer2"] [node name="MPAPI" type="CheckBox" parent="Panel/VBoxContainer/HBoxContainer2"]
margin_left = 45.0 margin_left = 33.0
margin_right = 171.0 margin_right = 159.0
margin_bottom = 24.0 margin_bottom = 24.0
pressed = true pressed = true
text = "Multiplayer API" text = "Multiplayer API"
__meta__ = {
}
[node name="Destination" type="OptionButton" parent="Panel/VBoxContainer/HBoxContainer2"] [node name="Destination" type="OptionButton" parent="Panel/VBoxContainer/HBoxContainer2"]
margin_left = 175.0 margin_left = 163.0
margin_right = 216.0 margin_right = 192.0
margin_bottom = 24.0 margin_bottom = 24.0
__meta__ = {
}
[node name="HBoxContainer3" type="HBoxContainer" parent="Panel/VBoxContainer"] [node name="HBoxContainer3" type="HBoxContainer" parent="Panel/VBoxContainer"]
margin_top = 56.0 margin_top = 56.0
margin_right = 1024.0 margin_right = 1024.0
margin_bottom = 80.0 margin_bottom = 80.0
__meta__ = {
}
[node name="LineEdit" type="LineEdit" parent="Panel/VBoxContainer/HBoxContainer3"] [node name="LineEdit" type="LineEdit" parent="Panel/VBoxContainer/HBoxContainer3"]
margin_right = 977.0 margin_right = 977.0
margin_bottom = 24.0 margin_bottom = 24.0
size_flags_horizontal = 3 size_flags_horizontal = 3
__meta__ = {
}
[node name="Send" type="Button" parent="Panel/VBoxContainer/HBoxContainer3"] [node name="Send" type="Button" parent="Panel/VBoxContainer/HBoxContainer3"]
margin_left = 981.0 margin_left = 981.0
margin_right = 1024.0 margin_right = 1024.0
margin_bottom = 24.0 margin_bottom = 24.0
text = "Send" text = "Send"
__meta__ = {
}
[node name="RichTextLabel" type="RichTextLabel" parent="Panel/VBoxContainer"] [node name="RichTextLabel" type="RichTextLabel" parent="Panel/VBoxContainer"]
margin_top = 84.0 margin_top = 84.0
margin_right = 1024.0 margin_right = 1024.0
margin_bottom = 600.0 margin_bottom = 600.0
size_flags_vertical = 3 size_flags_vertical = 3
__meta__ = {
}
[connection signal="toggled" from="Panel/VBoxContainer/HBoxContainer/Listen" to="." method="_on_Listen_toggled"] [connection signal="toggled" from="Panel/VBoxContainer/HBoxContainer/Listen" to="." method="_on_Listen_toggled"]
[connection signal="item_selected" from="Panel/VBoxContainer/HBoxContainer2/WriteMode" to="." method="_on_WriteMode_item_selected"] [connection signal="item_selected" from="Panel/VBoxContainer/HBoxContainer2/WriteMode" to="." method="_on_WriteMode_item_selected"]
[connection signal="pressed" from="Panel/VBoxContainer/HBoxContainer3/Send" to="." method="_on_Send_pressed"] [connection signal="pressed" from="Panel/VBoxContainer/HBoxContainer3/Send" to="." method="_on_Send_pressed"]

View File

@@ -7,6 +7,9 @@ margin_right = 220.0
margin_bottom = 340.0 margin_bottom = 340.0
rect_min_size = Vector2( 210, 410 ) rect_min_size = Vector2( 210, 410 )
script = ExtResource( 1 ) script = ExtResource( 1 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="VBoxContainer" type="VBoxContainer" parent="."] [node name="VBoxContainer" type="VBoxContainer" parent="."]
anchor_left = 0.5 anchor_left = 0.5

View File

@@ -20,24 +20,24 @@ func e():
roughness = 0.7 roughness = 0.7
script = SubResource( 2 ) script = SubResource( 2 )
[sub_resource type="CubeMesh" id=7] [sub_resource type="CubeMesh" id=4]
[sub_resource type="SpatialMaterial" id=8] [sub_resource type="SpatialMaterial" id=5]
albedo_color = Color( 0.652344, 0.652344, 0.652344, 1 ) albedo_color = Color( 0.652344, 0.652344, 0.652344, 1 )
roughness = 0.0 roughness = 0.0
[sub_resource type="GDScript" id=9] [sub_resource type="GDScript" id=6]
script/source = "tool script/source = "tool
extends Object extends Object
func e(): func e():
return 0.1 return 0.1
" "
[sub_resource type="CubeMesh" id=10] [sub_resource type="CubeMesh" id=7]
size = Vector3( 1.1, 0.8, 0.1 ) size = Vector3( 1.1, 0.8, 0.1 )
script = SubResource( 9 ) script = SubResource( 6 )
[sub_resource type="SpatialMaterial" id=11] [sub_resource type="SpatialMaterial" id=8]
[node name="2Din3D" type="Spatial"] [node name="2Din3D" type="Spatial"]
script = ExtResource( 1 ) script = ExtResource( 1 )
@@ -57,41 +57,41 @@ transform = Transform( 0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, -3, -0.2, -4 )
[node name="PillarBottom" type="MeshInstance" parent="Pillar1"] [node name="PillarBottom" type="MeshInstance" parent="Pillar1"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, 0 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, 0 )
mesh = SubResource( 7 ) mesh = SubResource( 4 )
material/0 = SubResource( 8 ) material/0 = SubResource( 5 )
[node name="PillarTop" type="MeshInstance" parent="Pillar1"] [node name="PillarTop" type="MeshInstance" parent="Pillar1"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5.5, 0 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5.5, 0 )
mesh = SubResource( 7 ) mesh = SubResource( 4 )
material/0 = SubResource( 8 ) material/0 = SubResource( 5 )
[node name="PillarMiddle" type="MeshInstance" parent="Pillar1"] [node name="PillarMiddle" type="MeshInstance" parent="Pillar1"]
transform = Transform( 0.7, 0, 0, 0, 2, 0, 0, 0, 0.7, 0, 2.5, 0 ) transform = Transform( 0.7, 0, 0, 0, 2, 0, 0, 0, 0.7, 0, 2.5, 0 )
mesh = SubResource( 7 ) mesh = SubResource( 4 )
material/0 = SubResource( 8 ) material/0 = SubResource( 5 )
[node name="Pillar2" type="Spatial" parent="."] [node name="Pillar2" type="Spatial" parent="."]
transform = Transform( 0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 3, -0.2, -4 ) transform = Transform( 0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 3, -0.2, -4 )
[node name="PillarBottom" type="MeshInstance" parent="Pillar2"] [node name="PillarBottom" type="MeshInstance" parent="Pillar2"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, 0 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, 0 )
mesh = SubResource( 7 ) mesh = SubResource( 4 )
material/0 = SubResource( 8 ) material/0 = SubResource( 5 )
[node name="PillarTop" type="MeshInstance" parent="Pillar2"] [node name="PillarTop" type="MeshInstance" parent="Pillar2"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5.5, 0 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5.5, 0 )
mesh = SubResource( 7 ) mesh = SubResource( 4 )
material/0 = SubResource( 8 ) material/0 = SubResource( 5 )
[node name="PillarMiddle" type="MeshInstance" parent="Pillar2"] [node name="PillarMiddle" type="MeshInstance" parent="Pillar2"]
transform = Transform( 0.7, 0, 0, 0, 2, 0, 0, 0, 0.7, 0, 2.5, 0 ) transform = Transform( 0.7, 0, 0, 0, 2, 0, 0, 0, 0.7, 0, 2.5, 0 )
mesh = SubResource( 7 ) mesh = SubResource( 4 )
material/0 = SubResource( 8 ) material/0 = SubResource( 5 )
[node name="PillarBack" type="MeshInstance" parent="."] [node name="PillarBack" type="MeshInstance" parent="."]
transform = Transform( 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 1.2, -4.5 ) transform = Transform( 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 1.2, -4.5 )
mesh = SubResource( 10 ) mesh = SubResource( 7 )
material/0 = SubResource( 8 ) material/0 = SubResource( 5 )
[node name="DirectionalLight" type="DirectionalLight" parent="."] [node name="DirectionalLight" type="DirectionalLight" parent="."]
transform = Transform( 0.623013, -0.733525, 0.271654, 0.321394, 0.55667, 0.766044, -0.713134, -0.389948, 0.582563, 0, 10, 0 ) transform = Transform( 0.623013, -0.733525, 0.271654, 0.321394, 0.55667, 0.766044, -0.713134, -0.389948, 0.582563, 0, 10, 0 )
@@ -101,7 +101,7 @@ directional_shadow_normal_bias = 0.2
[node name="ViewportQuad" type="MeshInstance" parent="."] [node name="ViewportQuad" type="MeshInstance" parent="."]
transform = Transform( 2, 0, 0, 0, 0, -1.333, 0, 1, 0, 0, 1.2, -4.25 ) transform = Transform( 2, 0, 0, 0, 0, -1.333, 0, 1, 0, 0, 1.2, -4.25 )
material_override = SubResource( 11 ) material_override = SubResource( 8 )
mesh = SubResource( 1 ) mesh = SubResource( 1 )
material/0 = null material/0 = null

View File

@@ -66,7 +66,7 @@ __meta__ = {
} }
[node name="Scale" type="Label" parent="VBoxContainer"] [node name="Scale" type="Label" parent="VBoxContainer"]
margin_right = 137.0 margin_right = 130.0
margin_bottom = 28.0 margin_bottom = 28.0
custom_colors/font_color_shadow = Color( 0, 0, 0, 0.752941 ) custom_colors/font_color_shadow = Color( 0, 0, 0, 0.752941 )
custom_constants/shadow_offset_x = 2 custom_constants/shadow_offset_x = 2
@@ -79,7 +79,7 @@ __meta__ = {
[node name="Filter" type="Label" parent="VBoxContainer"] [node name="Filter" type="Label" parent="VBoxContainer"]
margin_top = 32.0 margin_top = 32.0
margin_right = 137.0 margin_right = 130.0
margin_bottom = 60.0 margin_bottom = 60.0
custom_colors/font_color_shadow = Color( 0, 0, 0, 0.752941 ) custom_colors/font_color_shadow = Color( 0, 0, 0, 0.752941 )
custom_constants/shadow_offset_x = 2 custom_constants/shadow_offset_x = 2

View File

@@ -15,7 +15,7 @@ _global_script_class_icons={
[application] [application]
config/name="Multitouch View" config/name="Multitouch View with VisualScript"
config/description="Simple debugger for multitouch input. config/description="Simple debugger for multitouch input.
Shows red dots everywhere you press." Shows red dots everywhere you press."
run/main_scene="res://Main.tscn" run/main_scene="res://Main.tscn"

View File

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