From 4913cd868a2e22b23b8e0f17ac1da5501ba6b5c8 Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Wed, 3 Mar 2021 00:06:27 -0500 Subject: [PATCH] Misc fixes and tweaks --- 2d/dodge_the_creeps/Mob.tscn | 12 +- 2d/finite_state_machine/player/Player.tscn | 2 +- 2d/particles/particles.tscn | 4 +- 2d/physics_tests/main.tscn | 2 - .../functional/test_character_slopes.tscn | 1 - .../functional/test_one_way_collision.tscn | 7 + 2d/pong/paddle.png.import | 2 +- .../grid_movement/pawns/Actor.tscn | 1 - .../screens/combat/actors/sprites/Sprite.tscn | 1 - .../screens/combat/interface/ActorInfo.tscn | 3 + .../screens/combat/interface/Info.tscn | 3 + 2d/role_playing_game/theme/Theme.tscn | 3 + 2d/role_playing_game/theme/labels/Title.tscn | 3 + .../turn_combat/combatants/Combatant.tscn | 1 - 2d/screen_space_shaders/screen_shaders.gd | 26 ++-- 3d/ik/look_at_ik.tscn | 31 ----- 3d/material_testers/project.godot | 2 +- 3d/physics_tests/main.tscn | 2 - 3d/platformer/project.godot | 1 - 3d/platformer/stage/stage.tscn | 124 +++++++++--------- 3d/platformer/stage/tiles.tres | 1 - 3d/truck_town/project.godot | 2 +- 3d/voxel/player/player.tscn | 2 +- 3d/voxel/project.godot | 2 +- gui/drag_and_drop/drag_and_drop.tscn | 39 +++--- gui/input_mapping/InputRemapMenu.tscn | 28 ++-- loading/background_load/background_load.tscn | 3 + loading/scene_changer/scene_a.tscn | 11 +- loading/scene_changer/scene_b.tscn | 45 +------ misc/2.5d/assets/cube/cube.tscn | 1 + misc/2.5d/assets/cube/cube_point.tscn | 1 + misc/2.5d/assets/platform/platform.tscn | 1 + misc/joypads/joypads.tscn | 2 - misc/joypads/remap/remap_wizard.tscn | 1 - mono/dodge_the_creeps/Mob.tscn | 10 +- mono/dodge_the_creeps/Player.tscn | 1 - mono/multiplayer_pong/paddle.png.import | 2 +- mono/pong/ball.png.import | 2 +- mono/pong/paddle.png.import | 2 +- networking/multiplayer_bomber/player.gd | 5 + networking/multiplayer_bomber/rock.gd | 1 + networking/webrtc_minimal/Signaling.gd | 3 + networking/websocket_chat/server/server.tscn | 54 +------- .../material_creator/material_dock.tscn | 3 + viewport/2d_in_3d/2D_in_3D.tscn | 42 +++--- viewport/3d_scaling/hud.tscn | 4 +- visual_script/multitouch_view/project.godot | 2 +- visual_script/pong/paddle.png.import | 2 +- 48 files changed, 219 insertions(+), 284 deletions(-) diff --git a/2d/dodge_the_creeps/Mob.tscn b/2d/dodge_the_creeps/Mob.tscn index d8975ad3..a8de23d9 100644 --- a/2d/dodge_the_creeps/Mob.tscn +++ b/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] diff --git a/2d/finite_state_machine/player/Player.tscn b/2d/finite_state_machine/player/Player.tscn index 10f667c3..e336d9be 100644 --- a/2d/finite_state_machine/player/Player.tscn +++ b/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"] diff --git a/2d/particles/particles.tscn b/2d/particles/particles.tscn index 0623fb5a..71c15814 100644 --- a/2d/particles/particles.tscn +++ b/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 diff --git a/2d/physics_tests/main.tscn b/2d/physics_tests/main.tscn index 05996ea8..05ec8c5e 100644 --- a/2d/physics_tests/main.tscn +++ b/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 diff --git a/2d/physics_tests/tests/functional/test_character_slopes.tscn b/2d/physics_tests/tests/functional/test_character_slopes.tscn index 7c96a0b3..edacfafd 100644 --- a/2d/physics_tests/tests/functional/test_character_slopes.tscn +++ b/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 diff --git a/2d/physics_tests/tests/functional/test_one_way_collision.tscn b/2d/physics_tests/tests/functional/test_one_way_collision.tscn index a0d6ccb1..ff4a3859 100644 --- a/2d/physics_tests/tests/functional/test_one_way_collision.tscn +++ b/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 diff --git a/2d/pong/paddle.png.import b/2d/pong/paddle.png.import index 8abc1c7c..3363f632 100644 --- a/2d/pong/paddle.png.import +++ b/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 diff --git a/2d/role_playing_game/grid_movement/pawns/Actor.tscn b/2d/role_playing_game/grid_movement/pawns/Actor.tscn index 5d55bd2b..8521de4f 100644 --- a/2d/role_playing_game/grid_movement/pawns/Actor.tscn +++ b/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 ) - diff --git a/2d/role_playing_game/screens/combat/actors/sprites/Sprite.tscn b/2d/role_playing_game/screens/combat/actors/sprites/Sprite.tscn index 76091cb4..f554162a 100644 --- a/2d/role_playing_game/screens/combat/actors/sprites/Sprite.tscn +++ b/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 ) - diff --git a/2d/role_playing_game/screens/combat/interface/ActorInfo.tscn b/2d/role_playing_game/screens/combat/interface/ActorInfo.tscn index c66c33a9..de0c73eb 100644 --- a/2d/role_playing_game/screens/combat/interface/ActorInfo.tscn +++ b/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 diff --git a/2d/role_playing_game/screens/combat/interface/Info.tscn b/2d/role_playing_game/screens/combat/interface/Info.tscn index c728b833..efb862c4 100644 --- a/2d/role_playing_game/screens/combat/interface/Info.tscn +++ b/2d/role_playing_game/screens/combat/interface/Info.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 diff --git a/2d/role_playing_game/theme/Theme.tscn b/2d/role_playing_game/theme/Theme.tscn index 5cd0f50d..d3b80927 100644 --- a/2d/role_playing_game/theme/Theme.tscn +++ b/2d/role_playing_game/theme/Theme.tscn @@ -30,6 +30,9 @@ func _on_Button_button_up(): margin_right = 1024.0 margin_bottom = 600.0 theme = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} [node name="Panel" type="Panel" parent="."] margin_left = 128.0 diff --git a/2d/role_playing_game/theme/labels/Title.tscn b/2d/role_playing_game/theme/labels/Title.tscn index d8dc623d..6e2521a9 100644 --- a/2d/role_playing_game/theme/labels/Title.tscn +++ b/2d/role_playing_game/theme/labels/Title.tscn @@ -13,3 +13,6 @@ text = "Title" align = 1 autowrap = true clip_text = true +__meta__ = { +"_edit_use_anchors_": false +} diff --git a/2d/role_playing_game/turn_combat/combatants/Combatant.tscn b/2d/role_playing_game/turn_combat/combatants/Combatant.tscn index 3182af65..0f0e2d14 100644 --- a/2d/role_playing_game/turn_combat/combatants/Combatant.tscn +++ b/2d/role_playing_game/turn_combat/combatants/Combatant.tscn @@ -12,4 +12,3 @@ damage = 2 life = 10 [node name="Sprite" parent="." instance=ExtResource( 3 )] - diff --git a/2d/screen_space_shaders/screen_shaders.gd b/2d/screen_space_shaders/screen_shaders.gd index 414941bf..1fc649fc 100644 --- a/2d/screen_space_shaders/screen_shaders.gd +++ b/2d/screen_space_shaders/screen_shaders.gd @@ -1,23 +1,29 @@ extends Control +onready var effect = $Effect +onready var effects = $Effects +onready var picture = $Picture +onready var pictures = $Pictures + + func _ready(): - for c in $Pictures.get_children(): - $Picture.add_item("PIC: " + c.get_name()) - for c in $Effects.get_children(): - $Effect.add_item("FX: " + c.get_name()) + for c in pictures.get_children(): + picture.add_item("PIC: " + c.get_name()) + for c in effects.get_children(): + effect.add_item("FX: " + c.get_name()) 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: - $Pictures.get_child(c).show() + pictures.get_child(c).show() else: - $Pictures.get_child(c).hide() + pictures.get_child(c).hide() 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: - $Effects.get_child(c).show() + effects.get_child(c).show() else: - $Effects.get_child(c).hide() + effects.get_child(c).hide() diff --git a/3d/ik/look_at_ik.tscn b/3d/ik/look_at_ik.tscn index 6645a47a..174da070 100644 --- a/3d/ik/look_at_ik.tscn +++ b/3d/ik/look_at_ik.tscn @@ -49,17 +49,7 @@ __meta__ = { } skeleton_path = NodePath("../../../GodotBattleBot/Armature/Skeleton") 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 ) -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"] script = ExtResource( 6 ) @@ -68,17 +58,6 @@ __meta__ = { } skeleton_path = NodePath("../../../GodotBattleBot/Armature/Skeleton") 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"] script = ExtResource( 6 ) @@ -87,17 +66,7 @@ __meta__ = { } skeleton_path = NodePath("../../../GodotBattleBot/Armature/Skeleton") 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 ) -position_using_additional_bone = false -additional_bone_name = "" -additional_bone_length = 1.0 -debug_messages = false [node name="Control" type="Control" parent="."] anchor_right = 1.0 diff --git a/3d/material_testers/project.godot b/3d/material_testers/project.godot index b63e175a..bddcf5b2 100644 --- a/3d/material_testers/project.godot +++ b/3d/material_testers/project.godot @@ -40,8 +40,8 @@ multithread/thread_rid_pool_prealloc=60 [rendering] quality/intended_usage/framebuffer_allocation=3 -vram_compression/import_etc2=false quality/filters/anisotropic_filter_level=16 +vram_compression/import_etc2=false quality/filters/msaa=2 quality/filters/msaa.mobile=0 quality/filters/anisotropic_filter_level.mobile=4 diff --git a/3d/physics_tests/main.tscn b/3d/physics_tests/main.tscn index fa00334d..06f8d001 100644 --- a/3d/physics_tests/main.tscn +++ b/3d/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 diff --git a/3d/platformer/project.godot b/3d/platformer/project.godot index f9eed7cb..6895f180 100644 --- a/3d/platformer/project.godot +++ b/3d/platformer/project.godot @@ -148,6 +148,5 @@ multithread/thread_rid_pool_prealloc=60 quality/intended_usage/framebuffer_allocation=3 quality/filters/anisotropic_filter_level=16 quality/filters/msaa=2 -environment/default_environment="res://default_env.tres" quality/filters/anisotropic_filter_level.mobile=4 quality/filters/msaa.mobile=0 diff --git a/3d/platformer/stage/stage.tscn b/3d/platformer/stage/stage.tscn index 70101a71..fef39268 100644 --- a/3d/platformer/stage/stage.tscn +++ b/3d/platformer/stage/stage.tscn @@ -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/floor_mesh.tres" type="ArrayMesh" id=2] [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://player/player.tscn" type="PackedScene" id=5] +[ext_resource path="res://default_env.tres" type="Environment" id=6] [sub_resource type="PhysicsMaterial" id=1] friction = 0.0 @@ -35,6 +36,68 @@ __meta__ = { "__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="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -16, -6, -12 ) 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 ) 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="."] 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 )] 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="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -16, -6, -12 ) reverb_bus_enable = true diff --git a/3d/platformer/stage/tiles.tres b/3d/platformer/stage/tiles.tres index 221b2631..91d3a4d4 100644 --- a/3d/platformer/stage/tiles.tres +++ b/3d/platformer/stage/tiles.tres @@ -8,7 +8,6 @@ albedo_texture = ExtResource( 1 ) metallic = 0.51 metallic_texture = ExtResource( 2 ) -roughness = 0.2 roughness_texture = ExtResource( 2 ) [sub_resource type="ArrayMesh" id=2] diff --git a/3d/truck_town/project.godot b/3d/truck_town/project.godot index 1b438b80..04da87fa 100644 --- a/3d/truck_town/project.godot +++ b/3d/truck_town/project.godot @@ -79,7 +79,7 @@ shadow_filter=3 quality/driver/driver_name="GLES2" quality/intended_usage/framebuffer_allocation=3 quality/shadows/filter_mode=2 -quality/filters/anisotropic_filter_level=16 quality/filters/msaa=2 environment/default_environment="res://default_env.tres" +quality/filters/anisotropic_filter_level=16 quality/filters/anisotropic_filter_level.mobile=4 diff --git a/3d/voxel/player/player.tscn b/3d/voxel/player/player.tscn index 9fb4c5b8..6db04c9a 100644 --- a/3d/voxel/player/player.tscn +++ b/3d/voxel/player/player.tscn @@ -8,7 +8,7 @@ radius = 0.4 height = 1.8 [sub_resource type="AtlasTexture" id=2] -flags = 3 +flags = 11 atlas = ExtResource( 2 ) region = Rect2( 0, 0, 64, 64 ) diff --git a/3d/voxel/project.godot b/3d/voxel/project.godot index 0142c2f7..d3e323b1 100644 --- a/3d/voxel/project.godot +++ b/3d/voxel/project.godot @@ -160,8 +160,8 @@ common/physics_fps=120 quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false -quality/filters/anisotropic_filter_level=16 quality/filters/msaa=2 environment/default_environment="res://default_env.tres" +quality/filters/anisotropic_filter_level=16 gles2/debug/disable_half_float=true quality/filters/anisotropic_filter_level.mobile=4 diff --git a/gui/drag_and_drop/drag_and_drop.tscn b/gui/drag_and_drop/drag_and_drop.tscn index b3847417..43ce9357 100644 --- a/gui/drag_and_drop/drag_and_drop.tscn +++ b/gui/drag_and_drop/drag_and_drop.tscn @@ -32,6 +32,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "Drag colors from button to button, or change button colors and drag them again." align = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="GridContainer" type="GridContainer" parent="."] anchor_left = 0.5 @@ -48,9 +51,9 @@ __meta__ = { } [node name="ColorPickerButton0" type="ColorPickerButton" parent="GridContainer"] -margin_left = 33.0 +margin_left = 34.0 margin_top = 25.0 -margin_right = 129.0 +margin_right = 130.0 margin_bottom = 89.0 rect_min_size = Vector2( 96, 64 ) size_flags_horizontal = 6 @@ -62,9 +65,9 @@ __meta__ = { } [node name="ColorPickerButton1" type="ColorPickerButton" parent="GridContainer"] -margin_left = 201.0 +margin_left = 202.0 margin_top = 25.0 -margin_right = 297.0 +margin_right = 298.0 margin_bottom = 89.0 rect_min_size = Vector2( 96, 64 ) size_flags_horizontal = 6 @@ -73,9 +76,9 @@ color = Color( 0, 0.797347, 0.741037, 1 ) script = ExtResource( 1 ) [node name="ColorPickerButton2" type="ColorPickerButton" parent="GridContainer"] -margin_left = 369.0 +margin_left = 370.0 margin_top = 25.0 -margin_right = 465.0 +margin_right = 466.0 margin_bottom = 89.0 rect_min_size = Vector2( 96, 64 ) size_flags_horizontal = 6 @@ -84,9 +87,9 @@ color = Color( 0.443924, 0, 0.632923, 1 ) script = ExtResource( 1 ) [node name="ColorPickerButton3" type="ColorPickerButton" parent="GridContainer"] -margin_left = 33.0 +margin_left = 34.0 margin_top = 143.0 -margin_right = 129.0 +margin_right = 130.0 margin_bottom = 207.0 rect_min_size = Vector2( 96, 64 ) size_flags_horizontal = 6 @@ -95,9 +98,9 @@ color = Color( 1, 1, 1, 1 ) script = ExtResource( 1 ) [node name="ColorPickerButton4" type="ColorPickerButton" parent="GridContainer"] -margin_left = 201.0 +margin_left = 202.0 margin_top = 143.0 -margin_right = 297.0 +margin_right = 298.0 margin_bottom = 207.0 rect_min_size = Vector2( 96, 64 ) size_flags_horizontal = 6 @@ -106,9 +109,9 @@ color = Color( 1, 0.933842, 0, 1 ) script = ExtResource( 1 ) [node name="ColorPickerButton5" type="ColorPickerButton" parent="GridContainer"] -margin_left = 369.0 +margin_left = 370.0 margin_top = 143.0 -margin_right = 465.0 +margin_right = 466.0 margin_bottom = 207.0 rect_min_size = Vector2( 96, 64 ) size_flags_horizontal = 6 @@ -117,9 +120,9 @@ color = Color( 0.287293, 0.886362, 0.122933, 1 ) script = ExtResource( 1 ) [node name="ColorPickerButton6" type="ColorPickerButton" parent="GridContainer"] -margin_left = 33.0 +margin_left = 34.0 margin_top = 261.0 -margin_right = 129.0 +margin_right = 130.0 margin_bottom = 325.0 rect_min_size = Vector2( 96, 64 ) size_flags_horizontal = 6 @@ -128,9 +131,9 @@ color = Color( 0.908461, 0, 0.88789, 1 ) script = ExtResource( 1 ) [node name="ColorPickerButton7" type="ColorPickerButton" parent="GridContainer"] -margin_left = 201.0 +margin_left = 202.0 margin_top = 261.0 -margin_right = 297.0 +margin_right = 298.0 margin_bottom = 325.0 rect_min_size = Vector2( 96, 64 ) size_flags_horizontal = 6 @@ -139,9 +142,9 @@ color = Color( 0, 0.283703, 0, 1 ) script = ExtResource( 1 ) [node name="ColorPickerButton8" type="ColorPickerButton" parent="GridContainer"] -margin_left = 369.0 +margin_left = 370.0 margin_top = 261.0 -margin_right = 465.0 +margin_right = 466.0 margin_bottom = 325.0 rect_min_size = Vector2( 96, 64 ) size_flags_horizontal = 6 diff --git a/gui/input_mapping/InputRemapMenu.tscn b/gui/input_mapping/InputRemapMenu.tscn index 8a4462ab..2d5aa931 100644 --- a/gui/input_mapping/InputRemapMenu.tscn +++ b/gui/input_mapping/InputRemapMenu.tscn @@ -75,13 +75,13 @@ action = "move_left" [node name="ActionRemapRow2" type="HBoxContainer" parent="RemapButtonGroup/ActionsList"] margin_top = 56.0 margin_right = 320.0 -margin_bottom = 108.0 +margin_bottom = 109.0 size_flags_horizontal = 3 size_flags_vertical = 3 [node name="ActionName" type="Label" parent="RemapButtonGroup/ActionsList/ActionRemapRow2"] margin_right = 158.0 -margin_bottom = 52.0 +margin_bottom = 53.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "Move Right" @@ -91,22 +91,22 @@ valign = 1 [node name="RemapButton" parent="RemapButtonGroup/ActionsList/ActionRemapRow2" instance=ExtResource( 1 )] margin_left = 162.0 margin_right = 320.0 -margin_bottom = 52.0 +margin_bottom = 53.0 size_flags_horizontal = 3 size_flags_vertical = 3 group = SubResource( 1 ) action = "move_right" [node name="ActionRemapRow3" type="HBoxContainer" parent="RemapButtonGroup/ActionsList"] -margin_top = 112.0 +margin_top = 113.0 margin_right = 320.0 -margin_bottom = 164.0 +margin_bottom = 166.0 size_flags_horizontal = 3 size_flags_vertical = 3 [node name="ActionName" type="Label" parent="RemapButtonGroup/ActionsList/ActionRemapRow3"] margin_right = 158.0 -margin_bottom = 52.0 +margin_bottom = 53.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "Look Up" @@ -116,22 +116,22 @@ valign = 1 [node name="RemapButton" parent="RemapButtonGroup/ActionsList/ActionRemapRow3" instance=ExtResource( 1 )] margin_left = 162.0 margin_right = 320.0 -margin_bottom = 52.0 +margin_bottom = 53.0 size_flags_horizontal = 3 size_flags_vertical = 3 group = SubResource( 1 ) action = "look_up" [node name="ActionRemapRow4" type="HBoxContainer" parent="RemapButtonGroup/ActionsList"] -margin_top = 168.0 +margin_top = 170.0 margin_right = 320.0 -margin_bottom = 220.0 +margin_bottom = 223.0 size_flags_horizontal = 3 size_flags_vertical = 3 [node name="ActionName" type="Label" parent="RemapButtonGroup/ActionsList/ActionRemapRow4"] margin_right = 158.0 -margin_bottom = 52.0 +margin_bottom = 53.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "Crouch" @@ -141,14 +141,14 @@ valign = 1 [node name="RemapButton" parent="RemapButtonGroup/ActionsList/ActionRemapRow4" instance=ExtResource( 1 )] margin_left = 162.0 margin_right = 320.0 -margin_bottom = 52.0 +margin_bottom = 53.0 size_flags_horizontal = 3 size_flags_vertical = 3 group = SubResource( 1 ) action = "crouch" [node name="ActionRemapRow5" type="HBoxContainer" parent="RemapButtonGroup/ActionsList"] -margin_top = 224.0 +margin_top = 227.0 margin_right = 320.0 margin_bottom = 280.0 size_flags_horizontal = 3 @@ -156,7 +156,7 @@ size_flags_vertical = 3 [node name="ActionName" type="Label" parent="RemapButtonGroup/ActionsList/ActionRemapRow5"] margin_right = 158.0 -margin_bottom = 56.0 +margin_bottom = 53.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "Dash" @@ -166,7 +166,7 @@ valign = 1 [node name="RemapButton" parent="RemapButtonGroup/ActionsList/ActionRemapRow5" instance=ExtResource( 1 )] margin_left = 162.0 margin_right = 320.0 -margin_bottom = 56.0 +margin_bottom = 53.0 size_flags_horizontal = 3 size_flags_vertical = 3 group = SubResource( 1 ) diff --git a/loading/background_load/background_load.tscn b/loading/background_load/background_load.tscn index 6a0510d9..9adf6392 100644 --- a/loading/background_load/background_load.tscn +++ b/loading/background_load/background_load.tscn @@ -4,6 +4,9 @@ [node name="BackgroundLoad" type="Control"] script = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} [node name="Progress" type="ProgressBar" parent="."] visible = false diff --git a/loading/scene_changer/scene_a.tscn b/loading/scene_changer/scene_a.tscn index 7389db8f..14912916 100644 --- a/loading/scene_changer/scene_a.tscn +++ b/loading/scene_changer/scene_a.tscn @@ -2,7 +2,7 @@ [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_bottom = 1.0 size_flags_horizontal = 2 @@ -12,7 +12,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="label" type="Label" parent="."] +[node name="Label" type="Label" parent="."] margin_left = 64.0 margin_top = 48.0 margin_right = 104.0 @@ -20,7 +20,7 @@ margin_bottom = 62.0 size_flags_vertical = 0 text = "This is scene A." -[node name="goto_scene" type="Button" parent="."] +[node name="GoToScene" type="Button" parent="."] margin_left = 64.0 margin_top = 128.0 margin_right = 192.0 @@ -28,4 +28,7 @@ margin_bottom = 160.0 size_flags_horizontal = 2 size_flags_vertical = 2 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"] diff --git a/loading/scene_changer/scene_b.tscn b/loading/scene_changer/scene_b.tscn index b115c57b..0ad87c4a 100644 --- a/loading/scene_changer/scene_b.tscn +++ b/loading/scene_changer/scene_b.tscn @@ -2,61 +2,30 @@ [ext_resource path="res://scene_b.gd" type="Script" id=1] -[node name="scene_b" type="Panel"] - -anchor_left = 0.0 -anchor_top = 0.0 +[node name="SceneB" type="Panel"] anchor_right = 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_vertical = 2 script = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} -[node name="label" type="Label" parent="."] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 +[node name="Label" type="Label" parent="."] margin_left = 64.0 margin_top = 48.0 margin_right = 164.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 text = "This is scene B." -percent_visible = 1.0 -lines_skipped = 0 -max_lines_visible = -1 -[node name="goto_scene" type="Button" parent="."] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 +[node name="GoToScene" type="Button" parent="."] margin_left = 64.0 margin_top = 128.0 margin_right = 192.0 margin_bottom = 160.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 0 size_flags_horizontal = 2 size_flags_vertical = 2 -toggle_mode = false -enabled_focus_mode = 2 -shortcut = null -group = null text = "Go to Scene A" -flat = false - -[connection signal="pressed" from="goto_scene" to="." method="_on_goto_scene_pressed"] - - +[connection signal="pressed" from="GoToScene" to="." method="_on_goto_scene_pressed"] diff --git a/misc/2.5d/assets/cube/cube.tscn b/misc/2.5d/assets/cube/cube.tscn index 6034f1c8..6971d16e 100644 --- a/misc/2.5d/assets/cube/cube.tscn +++ b/misc/2.5d/assets/cube/cube.tscn @@ -20,3 +20,4 @@ script = ExtResource( 4 ) __meta__ = { "_editor_icon": ExtResource( 1 ) } +sort_enabled = true diff --git a/misc/2.5d/assets/cube/cube_point.tscn b/misc/2.5d/assets/cube/cube_point.tscn index d880e9fb..a06b61d1 100644 --- a/misc/2.5d/assets/cube/cube_point.tscn +++ b/misc/2.5d/assets/cube/cube_point.tscn @@ -9,6 +9,7 @@ script = ExtResource( 1 ) __meta__ = { "_editor_icon": ExtResource( 2 ) } +spatial_position = Vector3( 0, 0, 0 ) [node name="CubePointMath" type="Spatial" parent="."] diff --git a/misc/2.5d/assets/platform/platform.tscn b/misc/2.5d/assets/platform/platform.tscn index 5885e6bb..caf385c8 100644 --- a/misc/2.5d/assets/platform/platform.tscn +++ b/misc/2.5d/assets/platform/platform.tscn @@ -14,6 +14,7 @@ script = ExtResource( 1 ) __meta__ = { "_editor_icon": ExtResource( 2 ) } +spatial_position = Vector3( 0, 0, 0 ) [node name="PlatformMath" type="StaticBody" parent="."] collision_layer = 1048575 diff --git a/misc/joypads/joypads.tscn b/misc/joypads/joypads.tscn index 339c26f9..efdecd2d 100644 --- a/misc/joypads/joypads.tscn +++ b/misc/joypads/joypads.tscn @@ -954,7 +954,6 @@ margin_bottom = 30.0 focus_mode = 0 size_flags_horizontal = 3 size_flags_vertical = 3 -enabled_focus_mode = 0 text = "Start Vibration" __meta__ = { "_edit_use_anchors_": false @@ -1013,7 +1012,6 @@ margin_bottom = 30.0 text = "Show" [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/Stop" to="." method="_on_stop_vibration_pressed"] [connection signal="pressed" from="VBoxContainer/Clear" to="." method="_on_Clear_pressed"] diff --git a/misc/joypads/remap/remap_wizard.tscn b/misc/joypads/remap/remap_wizard.tscn index 017b55a2..3696e8e8 100644 --- a/misc/joypads/remap/remap_wizard.tscn +++ b/misc/joypads/remap/remap_wizard.tscn @@ -264,7 +264,6 @@ margin_bottom = 176.0 size_flags_vertical = 3 readonly = 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/XboxOSX" to="." method="_on_xboxosx_pressed"] [connection signal="pressed" from="Start/Margin/Layout/Buttons/Cancel" to="." method="_on_Cancel_pressed"] diff --git a/mono/dodge_the_creeps/Mob.tscn b/mono/dodge_the_creeps/Mob.tscn index 8547571e..10cfcfe2 100644 --- a/mono/dodge_the_creeps/Mob.tscn +++ b/mono/dodge_the_creeps/Mob.tscn @@ -10,11 +10,6 @@ [sub_resource type="SpriteFrames" id=1] animations = [ { -"frames": [ ExtResource( 2 ), ExtResource( 3 ) ], -"loop": true, -"name": "swim", -"speed": 4.0 -}, { "frames": [ ExtResource( 4 ), ExtResource( 5 ) ], "loop": true, "name": "walk", @@ -24,6 +19,11 @@ animations = [ { "loop": true, "name": "fly", "speed": 3.0 +}, { +"frames": [ ExtResource( 2 ), ExtResource( 3 ) ], +"loop": true, +"name": "swim", +"speed": 4.0 } ] [sub_resource type="CapsuleShape2D" id=2] diff --git a/mono/dodge_the_creeps/Player.tscn b/mono/dodge_the_creeps/Player.tscn index 1e989a44..31cc0cc7 100644 --- a/mono/dodge_the_creeps/Player.tscn +++ b/mono/dodge_the_creeps/Player.tscn @@ -51,7 +51,6 @@ script = ExtResource( 1 ) __meta__ = { "_edit_group_": true } -_speed = 400 [node name="AnimatedSprite" type="AnimatedSprite" parent="."] scale = Vector2( 0.5, 0.5 ) diff --git a/mono/multiplayer_pong/paddle.png.import b/mono/multiplayer_pong/paddle.png.import index 8abc1c7c..3363f632 100644 --- a/mono/multiplayer_pong/paddle.png.import +++ b/mono/multiplayer_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 diff --git a/mono/pong/ball.png.import b/mono/pong/ball.png.import index a5df6b66..f239f238 100644 --- a/mono/pong/ball.png.import +++ b/mono/pong/ball.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 diff --git a/mono/pong/paddle.png.import b/mono/pong/paddle.png.import index 8abc1c7c..3363f632 100644 --- a/mono/pong/paddle.png.import +++ b/mono/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 diff --git a/networking/multiplayer_bomber/player.gd b/networking/multiplayer_bomber/player.gd index de75ad78..e4fd4c9b 100644 --- a/networking/multiplayer_bomber/player.gd +++ b/networking/multiplayer_bomber/player.gd @@ -20,6 +20,7 @@ var current_anim = "" var prev_bombing = false var bomb_index = 0 + func _physics_process(_delta): var motion = Vector2() @@ -74,18 +75,22 @@ func _physics_process(_delta): if not is_network_master(): puppet_pos = position # To avoid jitter + puppet func stun(): stunned = true + master func exploded(_by_who): if stunned: return rpc("stun") # Stun puppets stun() # Stun master - could use sync to do both at once + func set_player_name(new_name): get_node("label").set_text(new_name) + func _ready(): stunned = false puppet_pos = position diff --git a/networking/multiplayer_bomber/rock.gd b/networking/multiplayer_bomber/rock.gd index 6f7920bc..9274859a 100644 --- a/networking/multiplayer_bomber/rock.gd +++ b/networking/multiplayer_bomber/rock.gd @@ -4,6 +4,7 @@ extends KinematicBody2D puppet func do_explosion(): $"AnimationPlayer".play("explode") + # Received by owner of the rock master func exploded(by_who): rpc("do_explosion") # Re-sent to puppet rocks diff --git a/networking/webrtc_minimal/Signaling.gd b/networking/webrtc_minimal/Signaling.gd index d4196966..8cfe7a73 100644 --- a/networking/webrtc_minimal/Signaling.gd +++ b/networking/webrtc_minimal/Signaling.gd @@ -10,6 +10,7 @@ func register(path): if peers.size() == 2: get_node(peers[0]).peer.create_offer() + func _find_other(path): # Find the other registered peer. for p in peers: @@ -17,11 +18,13 @@ func _find_other(path): return p return "" + func send_session(path, type, sdp): var other = _find_other(path) assert(other != "") get_node(other).peer.set_remote_description(type, sdp) + func send_candidate(path, mid, index, sdp): var other = _find_other(path) assert(other != "") diff --git a/networking/websocket_chat/server/server.tscn b/networking/websocket_chat/server/server.tscn index 6c14493d..b98d959b 100644 --- a/networking/websocket_chat/server/server.tscn +++ b/networking/websocket_chat/server/server.tscn @@ -8,35 +8,23 @@ anchor_right = 1.0 anchor_bottom = 1.0 script = ExtResource( 1 ) __meta__ = { - +"_edit_use_anchors_": false } [node name="Server" type="Node" parent="."] script = ExtResource( 2 ) -__meta__ = { - -} [node name="Panel" type="Panel" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 -__meta__ = { - -} [node name="VBoxContainer" type="VBoxContainer" parent="Panel"] anchor_right = 1.0 anchor_bottom = 1.0 -__meta__ = { - -} [node name="HBoxContainer" type="HBoxContainer" parent="Panel/VBoxContainer"] margin_right = 1024.0 margin_bottom = 24.0 -__meta__ = { - -} [node name="Port" type="SpinBox" parent="Panel/VBoxContainer/HBoxContainer"] margin_right = 74.0 @@ -44,9 +32,6 @@ margin_bottom = 24.0 min_value = 1.0 max_value = 65535.0 value = 8000.0 -__meta__ = { - -} [node name="Listen" type="Button" parent="Panel/VBoxContainer/HBoxContainer"] margin_left = 78.0 @@ -54,76 +39,49 @@ margin_right = 129.0 margin_bottom = 24.0 toggle_mode = true text = "Listen" -__meta__ = { - -} [node name="HBoxContainer2" type="HBoxContainer" parent="Panel/VBoxContainer"] margin_top = 28.0 margin_right = 1024.0 margin_bottom = 52.0 -__meta__ = { - -} [node name="WriteMode" type="OptionButton" parent="Panel/VBoxContainer/HBoxContainer2"] -margin_right = 41.0 +margin_right = 29.0 margin_bottom = 24.0 -__meta__ = { - -} [node name="MPAPI" type="CheckBox" parent="Panel/VBoxContainer/HBoxContainer2"] -margin_left = 45.0 -margin_right = 171.0 +margin_left = 33.0 +margin_right = 159.0 margin_bottom = 24.0 pressed = true text = "Multiplayer API" -__meta__ = { - -} [node name="Destination" type="OptionButton" parent="Panel/VBoxContainer/HBoxContainer2"] -margin_left = 175.0 -margin_right = 216.0 +margin_left = 163.0 +margin_right = 192.0 margin_bottom = 24.0 -__meta__ = { - -} [node name="HBoxContainer3" type="HBoxContainer" parent="Panel/VBoxContainer"] margin_top = 56.0 margin_right = 1024.0 margin_bottom = 80.0 -__meta__ = { - -} [node name="LineEdit" type="LineEdit" parent="Panel/VBoxContainer/HBoxContainer3"] margin_right = 977.0 margin_bottom = 24.0 size_flags_horizontal = 3 -__meta__ = { - -} [node name="Send" type="Button" parent="Panel/VBoxContainer/HBoxContainer3"] margin_left = 981.0 margin_right = 1024.0 margin_bottom = 24.0 text = "Send" -__meta__ = { - -} [node name="RichTextLabel" type="RichTextLabel" parent="Panel/VBoxContainer"] margin_top = 84.0 margin_right = 1024.0 margin_bottom = 600.0 size_flags_vertical = 3 -__meta__ = { - -} [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="pressed" from="Panel/VBoxContainer/HBoxContainer3/Send" to="." method="_on_Send_pressed"] diff --git a/plugins/addons/material_creator/material_dock.tscn b/plugins/addons/material_creator/material_dock.tscn index 9582c895..8107ae70 100644 --- a/plugins/addons/material_creator/material_dock.tscn +++ b/plugins/addons/material_creator/material_dock.tscn @@ -7,6 +7,9 @@ margin_right = 220.0 margin_bottom = 340.0 rect_min_size = Vector2( 210, 410 ) script = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} [node name="VBoxContainer" type="VBoxContainer" parent="."] anchor_left = 0.5 diff --git a/viewport/2d_in_3d/2D_in_3D.tscn b/viewport/2d_in_3d/2D_in_3D.tscn index 7cdb2d54..577ddfc6 100644 --- a/viewport/2d_in_3d/2D_in_3D.tscn +++ b/viewport/2d_in_3d/2D_in_3D.tscn @@ -20,24 +20,24 @@ func e(): roughness = 0.7 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 ) roughness = 0.0 -[sub_resource type="GDScript" id=9] +[sub_resource type="GDScript" id=6] script/source = "tool extends Object func e(): return 0.1 " -[sub_resource type="CubeMesh" id=10] +[sub_resource type="CubeMesh" id=7] 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"] 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"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, 0 ) -mesh = SubResource( 7 ) -material/0 = SubResource( 8 ) +mesh = SubResource( 4 ) +material/0 = SubResource( 5 ) [node name="PillarTop" type="MeshInstance" parent="Pillar1"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5.5, 0 ) -mesh = SubResource( 7 ) -material/0 = SubResource( 8 ) +mesh = SubResource( 4 ) +material/0 = SubResource( 5 ) [node name="PillarMiddle" type="MeshInstance" parent="Pillar1"] transform = Transform( 0.7, 0, 0, 0, 2, 0, 0, 0, 0.7, 0, 2.5, 0 ) -mesh = SubResource( 7 ) -material/0 = SubResource( 8 ) +mesh = SubResource( 4 ) +material/0 = SubResource( 5 ) [node name="Pillar2" type="Spatial" parent="."] 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"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, 0 ) -mesh = SubResource( 7 ) -material/0 = SubResource( 8 ) +mesh = SubResource( 4 ) +material/0 = SubResource( 5 ) [node name="PillarTop" type="MeshInstance" parent="Pillar2"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5.5, 0 ) -mesh = SubResource( 7 ) -material/0 = SubResource( 8 ) +mesh = SubResource( 4 ) +material/0 = SubResource( 5 ) [node name="PillarMiddle" type="MeshInstance" parent="Pillar2"] transform = Transform( 0.7, 0, 0, 0, 2, 0, 0, 0, 0.7, 0, 2.5, 0 ) -mesh = SubResource( 7 ) -material/0 = SubResource( 8 ) +mesh = SubResource( 4 ) +material/0 = SubResource( 5 ) [node name="PillarBack" type="MeshInstance" parent="."] transform = Transform( 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 1.2, -4.5 ) -mesh = SubResource( 10 ) -material/0 = SubResource( 8 ) +mesh = SubResource( 7 ) +material/0 = SubResource( 5 ) [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 ) @@ -101,7 +101,7 @@ directional_shadow_normal_bias = 0.2 [node name="ViewportQuad" type="MeshInstance" parent="."] 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 ) material/0 = null diff --git a/viewport/3d_scaling/hud.tscn b/viewport/3d_scaling/hud.tscn index 3152a583..ac79694e 100644 --- a/viewport/3d_scaling/hud.tscn +++ b/viewport/3d_scaling/hud.tscn @@ -66,7 +66,7 @@ __meta__ = { } [node name="Scale" type="Label" parent="VBoxContainer"] -margin_right = 137.0 +margin_right = 130.0 margin_bottom = 28.0 custom_colors/font_color_shadow = Color( 0, 0, 0, 0.752941 ) custom_constants/shadow_offset_x = 2 @@ -79,7 +79,7 @@ __meta__ = { [node name="Filter" type="Label" parent="VBoxContainer"] margin_top = 32.0 -margin_right = 137.0 +margin_right = 130.0 margin_bottom = 60.0 custom_colors/font_color_shadow = Color( 0, 0, 0, 0.752941 ) custom_constants/shadow_offset_x = 2 diff --git a/visual_script/multitouch_view/project.godot b/visual_script/multitouch_view/project.godot index 0b6aecfe..449358d1 100644 --- a/visual_script/multitouch_view/project.godot +++ b/visual_script/multitouch_view/project.godot @@ -15,7 +15,7 @@ _global_script_class_icons={ [application] -config/name="Multitouch View" +config/name="Multitouch View with VisualScript" config/description="Simple debugger for multitouch input. Shows red dots everywhere you press." run/main_scene="res://Main.tscn" diff --git a/visual_script/pong/paddle.png.import b/visual_script/pong/paddle.png.import index 8abc1c7c..3363f632 100644 --- a/visual_script/pong/paddle.png.import +++ b/visual_script/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