diff --git a/2d/finite_state_machine/Demo.tscn b/2d/finite_state_machine/Demo.tscn index 6aed3764a3..fdcc89b05a 100644 --- a/2d/finite_state_machine/Demo.tscn +++ b/2d/finite_state_machine/Demo.tscn @@ -49,9 +49,6 @@ __meta__ = { [node name="Control" type="Control" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 -__meta__ = { -"_edit_use_anchors_": false -} [node name="StatesStackDiplayer" parent="Control" instance=ExtResource( 3 )] diff --git a/2d/finite_state_machine/player/Player.tscn b/2d/finite_state_machine/player/Player.tscn index 17899d6cf5..966343f22d 100644 --- a/2d/finite_state_machine/player/Player.tscn +++ b/2d/finite_state_machine/player/Player.tscn @@ -104,6 +104,7 @@ position = Vector2( 110, 0 ) polygon = PoolVector2Array( -20, 0, -20, -20, 20, -20, 20, 0 ) [node name="StateNameDisplayer" type="Label" parent="."] +physics_interpolation_mode = 2 margin_left = -109.0 margin_top = -172.0 margin_right = 110.0 @@ -114,9 +115,6 @@ align = 1 valign = 1 uppercase = true script = ExtResource( 15 ) -__meta__ = { -"_edit_use_anchors_": false -} [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"] diff --git a/2d/finite_state_machine/player/bullet/bullet_spawner.gd b/2d/finite_state_machine/player/bullet/bullet_spawner.gd index d6136d5892..0d17b30656 100644 --- a/2d/finite_state_machine/player/bullet/bullet_spawner.gd +++ b/2d/finite_state_machine/player/bullet/bullet_spawner.gd @@ -14,6 +14,6 @@ func fire(): $CooldownTimer.start() var new_bullet = bullet.instance() - add_child(new_bullet) new_bullet.position = global_position new_bullet.direction = owner.look_direction + add_child(new_bullet) diff --git a/2d/finite_state_machine/project.godot b/2d/finite_state_machine/project.godot index 51c5e49d16..f5293a9ef1 100644 --- a/2d/finite_state_machine/project.godot +++ b/2d/finite_state_machine/project.godot @@ -94,6 +94,10 @@ attack={ ] } +[physics] + +common/physics_interpolation=true + [rendering] quality/driver/driver_name="GLES2" diff --git a/2d/hexagonal_map/project.godot b/2d/hexagonal_map/project.godot index 04b33a735d..39030e1e97 100644 --- a/2d/hexagonal_map/project.godot +++ b/2d/hexagonal_map/project.godot @@ -60,6 +60,11 @@ move_up={ ] } +[physics] + +common/physics_fps=120 +common/physics_interpolation=true + [rendering] quality/driver/driver_name="GLES2" diff --git a/2d/hexagonal_map/troll.tscn b/2d/hexagonal_map/troll.tscn index 32ef38d95e..272dc98266 100644 --- a/2d/hexagonal_map/troll.tscn +++ b/2d/hexagonal_map/troll.tscn @@ -18,3 +18,4 @@ shape = SubResource( 1 ) [node name="Camera2D" type="Camera2D" parent="."] current = true +process_mode = 0 diff --git a/2d/isometric/dungeon.tscn b/2d/isometric/dungeon.tscn index 6ccb3a7696..96e3a1cd59 100644 --- a/2d/isometric/dungeon.tscn +++ b/2d/isometric/dungeon.tscn @@ -1581,7 +1581,6 @@ material = SubResource( 41 ) position = Vector2( 445, -129 ) frames = SubResource( 40 ) animation = "sleep" -frame = 1 playing = true [node name="CrowSleep2" type="AnimatedSprite" parent="Crows"] @@ -1589,7 +1588,6 @@ material = SubResource( 42 ) position = Vector2( 108, 481 ) frames = SubResource( 40 ) animation = "sleep" -frame = 1 playing = true flip_h = true @@ -1597,7 +1595,6 @@ flip_h = true position = Vector2( -168, -145 ) frames = SubResource( 91 ) animation = "looking" -frame = 7 playing = true flip_h = true @@ -1605,7 +1602,6 @@ flip_h = true position = Vector2( 1782, 35 ) frames = SubResource( 91 ) animation = "looking" -frame = 7 playing = true flip_h = true @@ -1613,5 +1609,4 @@ flip_h = true position = Vector2( 1024, 78 ) frames = SubResource( 91 ) animation = "looking" -frame = 7 playing = true diff --git a/2d/isometric/player/goblin.tscn b/2d/isometric/player/goblin.tscn index eccf081d16..6df9aefd46 100644 --- a/2d/isometric/player/goblin.tscn +++ b/2d/isometric/player/goblin.tscn @@ -1396,7 +1396,6 @@ position = Vector2( 0, -35 ) scale = Vector2( 0.8, 0.8 ) frames = SubResource( 260 ) animation = "front_idle" -frame = 8 playing = true [node name="CollisionShape2D" type="CollisionShape2D" parent="."] @@ -1406,6 +1405,7 @@ shape = SubResource( 1 ) [node name="Camera2D" type="Camera2D" parent="."] current = true +process_mode = 0 [node name="LightOccluder2D" type="LightOccluder2D" parent="."] light_mask = 16 diff --git a/2d/isometric/project.godot b/2d/isometric/project.godot index 7830c77d53..41745282a4 100644 --- a/2d/isometric/project.godot +++ b/2d/isometric/project.godot @@ -68,6 +68,11 @@ move_up={ ] } +[physics] + +common/physics_fps=120 +common/physics_interpolation=true + [rasterizer] use_pixel_snap=true diff --git a/2d/kinematic_character/project.godot b/2d/kinematic_character/project.godot index d72d24a263..81b3fcf765 100644 --- a/2d/kinematic_character/project.godot +++ b/2d/kinematic_character/project.godot @@ -66,7 +66,9 @@ multithread/thread_rid_pool_prealloc=60 [physics] +common/physics_fps=120 2d/default_gravity=500 +common/physics_interpolation=true [rendering] diff --git a/2d/kinematic_character/world.tscn b/2d/kinematic_character/world.tscn index 237d92aa8b..bf5d4a4f18 100644 --- a/2d/kinematic_character/world.tscn +++ b/2d/kinematic_character/world.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=19 format=2] +[gd_scene load_steps=20 format=2] [ext_resource path="res://level/obstacle.png" type="Texture" id=2] [ext_resource path="res://player/player.tscn" type="PackedScene" id=3] @@ -36,6 +36,21 @@ extents = Vector2( 8, 8 ) [sub_resource type="RectangleShape2D" id=3] extents = Vector2( 8, 8 ) +[sub_resource type="Animation" id=13] +resource_name = "RESET" +tracks/0/type = "value" +tracks/0/path = NodePath(".:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ Vector2( 184, 152 ) ] +} + [sub_resource type="Animation" id=4] length = 10.0 loop = true @@ -52,10 +67,8 @@ tracks/0/keys = { "values": [ Vector2( 184, 152 ), Vector2( 184, 152 ), Vector2( 328.086, 152 ), Vector2( 328.086, 152 ) ] } -[sub_resource type="Animation" id=5] -resource_name = "leftright" -length = 10.0 -loop = true +[sub_resource type="Animation" id=14] +resource_name = "RESET" tracks/0/type = "value" tracks/0/path = NodePath(".:position") tracks/0/interp = 1 @@ -63,10 +76,10 @@ tracks/0/loop_wrap = true tracks/0/imported = false tracks/0/enabled = true tracks/0/keys = { -"times": PoolRealArray( 0, 1, 5, 6 ), -"transitions": PoolRealArray( 1, 1, 1, 1 ), +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 184, 152 ), Vector2( 184, 152 ), Vector2( 328.086, 152 ), Vector2( 328.086, 152 ) ] +"values": [ Vector2( 88.3493, 296 ) ] } [sub_resource type="Animation" id=6] @@ -128,7 +141,7 @@ tile_data = PoolIntArray( -720908, 0, 0, -720907, 0, 0, -720906, 0, 0, -720905, position = Vector2( 233.06, 223.436 ) [node name="MovingPlatform1" type="KinematicBody2D" parent="."] -position = Vector2( 274.142, 152 ) +position = Vector2( 184, 152 ) [node name="Collision" type="CollisionShape2D" parent="MovingPlatform1"] shape = SubResource( 3 ) @@ -139,10 +152,11 @@ texture = ExtResource( 2 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="MovingPlatform1"] autoplay = "leftright" playback_process_mode = 0 +anims/RESET = SubResource( 13 ) anims/leftright = SubResource( 4 ) [node name="MovingPlatform2" type="KinematicBody2D" parent="."] -position = Vector2( 88.3493, 284.689 ) +position = Vector2( 88.3493, 296 ) [node name="Collision" type="CollisionShape2D" parent="MovingPlatform2"] shape = SubResource( 3 ) @@ -153,7 +167,7 @@ texture = ExtResource( 2 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="MovingPlatform2"] autoplay = "updown" playback_process_mode = 0 -anims/leftright = SubResource( 5 ) +anims/RESET = SubResource( 14 ) anims/updown = SubResource( 6 ) [node name="Princess" type="Area2D" parent="."] @@ -266,5 +280,6 @@ shape = SubResource( 12 ) [node name="Camera2D" type="Camera2D" parent="."] offset = Vector2( 265, 247 ) current = true +process_mode = 0 [connection signal="body_entered" from="Princess" to="Princess" method="_on_body_entered"] diff --git a/2d/navigation/level.tscn b/2d/navigation/level.tscn index 24d98f6dcc..19fc9d8acc 100644 --- a/2d/navigation/level.tscn +++ b/2d/navigation/level.tscn @@ -21,7 +21,7 @@ position = Vector2( 429.585, 287.32 ) texture = ExtResource( 2 ) [node name="Character" type="Sprite" parent="."] -position = Vector2( 228.464, 132.594 ) +position = Vector2( 202, 100 ) scale = Vector2( 0.5, 0.5 ) texture = ExtResource( 3 ) offset = Vector2( 0, -26 ) @@ -36,3 +36,4 @@ default_color = Color( 1, 0, 0, 1 ) [node name="Camera2D" type="Camera2D" parent="."] offset = Vector2( 420, 300 ) current = true +process_mode = 0 diff --git a/2d/navigation/project.godot b/2d/navigation/project.godot index e6fdc342eb..08a71289b4 100644 --- a/2d/navigation/project.godot +++ b/2d/navigation/project.godot @@ -34,10 +34,15 @@ singletons=[ ] click={ "deadzone": 0.5, -"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null) +"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"canceled":false,"pressed":false,"doubleclick":false,"script":null) ] } +[physics] + +common/physics_fps=120 +common/physics_interpolation=true + [rendering] quality/driver/driver_name="GLES2" diff --git a/2d/physics_platformer/player/Player.tscn b/2d/physics_platformer/player/Player.tscn index e86a40774e..0fd3523c08 100644 --- a/2d/physics_platformer/player/Player.tscn +++ b/2d/physics_platformer/player/Player.tscn @@ -236,6 +236,7 @@ anims/standing_weapon_ready = SubResource( 12 ) [node name="Camera" type="Camera2D" parent="."] current = true zoom = Vector2( 0.5, 0.5 ) +process_mode = 0 limit_left = 0 limit_top = 0 diff --git a/2d/physics_platformer/project.godot b/2d/physics_platformer/project.godot index 2af3515c0f..1df191f478 100644 --- a/2d/physics_platformer/project.godot +++ b/2d/physics_platformer/project.godot @@ -130,7 +130,7 @@ shoot={ , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":2,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":90,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":7,"pressure":0.0,"pressed":false,"script":null) -, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null) +, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"canceled":false,"pressed":false,"doubleclick":false,"script":null) ] } spawn={ @@ -142,7 +142,9 @@ spawn={ [physics] +common/physics_fps=120 2d/default_gravity=900 +common/physics_interpolation=true [rasterizer] diff --git a/2d/physics_tests/project.godot b/2d/physics_tests/project.godot index 5421ceee4c..ff726e2332 100644 --- a/2d/physics_tests/project.godot +++ b/2d/physics_tests/project.godot @@ -47,10 +47,6 @@ config/icon="res://icon.png" Log="*res://utils/system_log.gd" System="*res://utils/system.gd" -[debug] - -gdscript/warnings/return_value_discarded=false - [display] window/dpi/allow_hidpi=true @@ -123,6 +119,10 @@ character_jump={ limits/message_queue/max_size_kb=10240 +[physics] + +common/physics_interpolation=true + [rendering] quality/driver/driver_name="GLES2" diff --git a/2d/platformer/project.godot b/2d/platformer/project.godot index 8b41d9d425..4821be33dc 100644 --- a/2d/platformer/project.godot +++ b/2d/platformer/project.godot @@ -141,7 +141,7 @@ shoot={ "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":2,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":90,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null) +, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"canceled":false,"pressed":false,"doubleclick":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777350,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777238,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] @@ -228,7 +228,9 @@ splitscreen={ [physics] +common/physics_fps=120 2d/default_gravity=1400 +common/physics_interpolation=true [rasterizer] diff --git a/2d/platformer/src/actors/player.tscn b/2d/platformer/src/actors/player.tscn index d94a95af2f..428500a9ea 100644 --- a/2d/platformer/src/actors/player.tscn +++ b/2d/platformer/src/actors/player.tscn @@ -238,6 +238,10 @@ position = Vector2( 0, -28 ) offset = Vector2( 0, 50 ) current = true process_mode = 0 +limit_left = -315 +limit_top = -250 +limit_right = 955 +limit_bottom = 690 [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2( 0, -14 ) diff --git a/2d/platformer/src/level/level.gd b/2d/platformer/src/level/level.gd index a30fd92a2a..e251cf8aee 100644 --- a/2d/platformer/src/level/level.gd +++ b/2d/platformer/src/level/level.gd @@ -1,17 +1 @@ extends Node2D - - -const LIMIT_LEFT = -315 -const LIMIT_TOP = -250 -const LIMIT_RIGHT = 955 -const LIMIT_BOTTOM = 690 - - -func _ready(): - for child in get_children(): - if child is Player: - var camera = child.get_node("Camera") - camera.limit_left = LIMIT_LEFT - camera.limit_top = LIMIT_TOP - camera.limit_right = LIMIT_RIGHT - camera.limit_bottom = LIMIT_BOTTOM diff --git a/2d/platformer/src/main/game.gd b/2d/platformer/src/main/game.gd index 1b01119535..896add7f19 100644 --- a/2d/platformer/src/main/game.gd +++ b/2d/platformer/src/main/game.gd @@ -52,7 +52,7 @@ func _unhandled_input(event): $Black/SplitContainer/ViewportContainer1.free() $Black.queue_free() # warning-ignore:return_value_discarded - get_tree().change_scene("res://src/Main/Game.tscn") + get_tree().change_scene("res://src/main/game.tscn") else: # warning-ignore:return_value_discarded - get_tree().change_scene("res://src/Main/Splitscreen.tscn") + get_tree().change_scene("res://src/main/split_screen.tscn") diff --git a/2d/platformer/src/main/game.tscn b/2d/platformer/src/main/game.tscn index 1d7b70bb5e..c8d2c66410 100644 --- a/2d/platformer/src/main/game.tscn +++ b/2d/platformer/src/main/game.tscn @@ -13,7 +13,7 @@ script = ExtResource( 2 ) z_index = -1 [node name="Player" parent="Level" instance=ExtResource( 4 )] -position = Vector2( 157, 648 ) +position = Vector2( 157, 636.5 ) scale = Vector2( 1, 1 ) z_index = 3 diff --git a/2d/platformer/src/main/split_screen.tscn b/2d/platformer/src/main/split_screen.tscn index ed3bdf2ec6..e50ce448b8 100644 --- a/2d/platformer/src/main/split_screen.tscn +++ b/2d/platformer/src/main/split_screen.tscn @@ -51,11 +51,15 @@ audio_listener_enable_2d = true [node name="Level" parent="Black/SplitContainer/ViewportContainer1/Viewport1" instance=ExtResource( 3 )] [node name="Player1" parent="Black/SplitContainer/ViewportContainer1/Viewport1/Level" instance=ExtResource( 4 )] -position = Vector2( 90, 546 ) +position = Vector2( 100, 636.5 ) +scale = Vector2( 1, 1 ) +z_index = 3 action_suffix = "_p1" [node name="Player2" parent="Black/SplitContainer/ViewportContainer1/Viewport1/Level" instance=ExtResource( 4 )] -position = Vector2( 120, 546 ) +position = Vector2( 160, 636.5 ) +scale = Vector2( 1, 1 ) +z_index = 3 action_suffix = "_p2" [node name="ViewportContainer2" type="ViewportContainer" parent="Black/SplitContainer"] diff --git a/2d/skeleton/player/player.tscn b/2d/skeleton/player/player.tscn index fb0c50d25d..8dc54c36ba 100644 --- a/2d/skeleton/player/player.tscn +++ b/2d/skeleton/player/player.tscn @@ -1747,7 +1747,7 @@ nodes/walk_animation/node = SubResource( 21 ) nodes/walk_animation/position = Vector2( 0, 140 ) nodes/walk_timescale/node = SubResource( 22 ) nodes/walk_timescale/position = Vector2( 200, 120 ) -node_connections = [ "jump", 0, "state", "jump", 1, "jump_animation", "land", 0, "jump", "land", 1, "land_animation", "land_hard", 0, "land", "land_hard", 1, "land_hard_animation", "run_timescale", 0, "run_animation", "walk_timescale", 0, "walk_animation", "state", 0, "idle_animation", "state", 1, "walk_timescale", "state", 2, "run_timescale", "state", 3, "fly_animation", "state", 4, "fall_animation", "output", 0, "land_hard" ] +node_connections = [ "jump", 0, "state", "jump", 1, "jump_animation", "land", 0, "jump", "land", 1, "land_animation", "land_hard", 0, "land", "land_hard", 1, "land_hard_animation", "output", 0, "land_hard", "run_timescale", 0, "run_animation", "state", 0, "idle_animation", "state", 1, "walk_timescale", "state", 2, "run_timescale", "state", 3, "fly_animation", "state", 4, "fall_animation", "walk_timescale", 0, "walk_animation" ] [sub_resource type="RectangleShape2D" id=24] extents = Vector2( 11, 16.4358 ) @@ -1950,3 +1950,4 @@ shape = SubResource( 24 ) position = Vector2( 0, -32 ) current = true zoom = Vector2( 0.25, 0.25 ) +process_mode = 0 diff --git a/2d/skeleton/project.godot b/2d/skeleton/project.godot index 46078b5920..a56cd9df1c 100644 --- a/2d/skeleton/project.godot +++ b/2d/skeleton/project.godot @@ -82,7 +82,9 @@ limits/debugger_stdout/max_chars_per_second=1000000 [physics] +common/physics_fps=120 2d/default_gravity=900 +common/physics_interpolation=true [rendering] diff --git a/3d/kinematic_character/models/cube.glb.import b/3d/kinematic_character/models/cube.glb.import index 8cdd70ba3f..d9881279c7 100644 --- a/3d/kinematic_character/models/cube.glb.import +++ b/3d/kinematic_character/models/cube.glb.import @@ -20,9 +20,10 @@ nodes/use_legacy_names=true materials/location=1 materials/storage=2 materials/keep_on_reimport=true -meshes/octahedral_compression=true meshes/compress=true meshes/ensure_tangents=true +meshes/octahedral_compression=true +meshes/vertex_cache_optimization=true meshes/storage=0 meshes/light_baking=0 meshes/lightmap_texel_size=0.1 diff --git a/3d/kinematic_character/models/mushroom.glb.import b/3d/kinematic_character/models/mushroom.glb.import index 84cdab3eb6..a1a01dacd3 100644 --- a/3d/kinematic_character/models/mushroom.glb.import +++ b/3d/kinematic_character/models/mushroom.glb.import @@ -20,9 +20,10 @@ nodes/use_legacy_names=true materials/location=1 materials/storage=0 materials/keep_on_reimport=true -meshes/octahedral_compression=true meshes/compress=true meshes/ensure_tangents=true +meshes/octahedral_compression=true +meshes/vertex_cache_optimization=true meshes/storage=0 meshes/light_baking=0 meshes/lightmap_texel_size=0.1 diff --git a/3d/kinematic_character/player/cubio.gd b/3d/kinematic_character/player/cubio.gd index fc605f7379..a4e58617bf 100644 --- a/3d/kinematic_character/player/cubio.gd +++ b/3d/kinematic_character/player/cubio.gd @@ -17,6 +17,7 @@ func _physics_process(delta): get_tree().quit() if Input.is_action_just_pressed("reset_position"): translation = start_position + reset_physics_interpolation() var dir = Vector3() dir.x = Input.get_action_strength("move_right") - Input.get_action_strength("move_left") diff --git a/3d/kinematic_character/project.godot b/3d/kinematic_character/project.godot index 61f491dce4..1a2106178e 100644 --- a/3d/kinematic_character/project.godot +++ b/3d/kinematic_character/project.godot @@ -76,6 +76,7 @@ exit={ [physics] common/physics_fps=120 +common/physics_interpolation=true [rasterizer] diff --git a/3d/navmesh/project.godot b/3d/navmesh/project.godot index 4bf88edffd..ce557059d8 100644 --- a/3d/navmesh/project.godot +++ b/3d/navmesh/project.godot @@ -22,6 +22,11 @@ config/icon="res://icon.png" singletons=[ ] +[physics] + +common/physics_fps=120 +common/physics_interpolation=true + [rendering] quality/driver/driver_name="GLES2" diff --git a/3d/physics_tests/project.godot b/3d/physics_tests/project.godot index 37f4066a57..4e836511c3 100644 --- a/3d/physics_tests/project.godot +++ b/3d/physics_tests/project.godot @@ -41,10 +41,6 @@ config/icon="res://icon.png" Log="*res://utils/system_log.gd" System="*res://utils/system.gd" -[debug] - -gdscript/warnings/return_value_discarded=false - [display] window/dpi/allow_hidpi=true @@ -113,6 +109,10 @@ character_jump={ ] } +[physics] + +common/physics_interpolation=true + [rendering] quality/driver/driver_name="GLES2" diff --git a/3d/platformer/coin/coin.tscn b/3d/platformer/coin/coin.tscn index ec72fc254f..3dd9a3054a 100644 --- a/3d/platformer/coin/coin.tscn +++ b/3d/platformer/coin/coin.tscn @@ -137,6 +137,7 @@ freeze_bodies = false stream = ExtResource( 2 ) [node name="Particles" type="CPUParticles" parent="."] +physics_interpolation_mode = 1 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.000732422, 0.542954, 0 ) emitting = false one_shot = true diff --git a/3d/platformer/enemy/enemy.tscn b/3d/platformer/enemy/enemy.tscn index a155191214..43064b8c6a 100644 --- a/3d/platformer/enemy/enemy.tscn +++ b/3d/platformer/enemy/enemy.tscn @@ -618,6 +618,7 @@ unit_db = 18.0 doppler_tracking = 1 [node name="Explosion" type="CPUParticles" parent="."] +physics_interpolation_mode = 1 emitting = false lifetime = 0.5 one_shot = true diff --git a/3d/platformer/player/bullet/bullet.tscn b/3d/platformer/player/bullet/bullet.tscn index ba80823083..565c549db8 100644 --- a/3d/platformer/player/bullet/bullet.tscn +++ b/3d/platformer/player/bullet/bullet.tscn @@ -99,6 +99,7 @@ autoplay = "life" anims/life = SubResource( 4 ) [node name="Particles" type="CPUParticles" parent="."] +physics_interpolation_mode = 1 amount = 16 lifetime = 0.4 fixed_fps = 60 diff --git a/3d/platformer/player/player.gd b/3d/platformer/player/player.gd index feee9681db..155186dd71 100644 --- a/3d/platformer/player/player.gd +++ b/3d/platformer/player/player.gd @@ -117,9 +117,9 @@ func _physics_process(delta): shoot_blend = SHOOT_TIME var bullet = preload("res://player/bullet/bullet.tscn").instance() bullet.set_transform(get_node("Armature/Bullet").get_global_transform().orthonormalized()) - get_parent().add_child(bullet) bullet.set_linear_velocity(get_node("Armature/Bullet").get_global_transform().basis[2].normalized() * BULLET_SPEED) bullet.add_collision_exception_with(self) # Add it to bullet. + get_parent().add_child(bullet) get_node("SoundShoot").play() prev_shoot = shoot_attempt diff --git a/3d/platformer/project.godot b/3d/platformer/project.godot index c061a79ae5..45b3d5fa08 100644 --- a/3d/platformer/project.godot +++ b/3d/platformer/project.godot @@ -124,7 +124,7 @@ jump={ shoot={ "deadzone": 0.5, "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":90,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null) +, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"canceled":false,"pressed":false,"doubleclick":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":1,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":7,"pressure":0.0,"pressed":false,"script":null) ] @@ -136,7 +136,9 @@ multithread/thread_rid_pool_prealloc=60 [physics] +common/physics_fps=120 3d/default_gravity=14.0 +common/physics_interpolation=true [rendering] diff --git a/3d/rigidbody_character/models/cube.glb.import b/3d/rigidbody_character/models/cube.glb.import index 8cdd70ba3f..d9881279c7 100644 --- a/3d/rigidbody_character/models/cube.glb.import +++ b/3d/rigidbody_character/models/cube.glb.import @@ -20,9 +20,10 @@ nodes/use_legacy_names=true materials/location=1 materials/storage=2 materials/keep_on_reimport=true -meshes/octahedral_compression=true meshes/compress=true meshes/ensure_tangents=true +meshes/octahedral_compression=true +meshes/vertex_cache_optimization=true meshes/storage=0 meshes/light_baking=0 meshes/lightmap_texel_size=0.1 diff --git a/3d/rigidbody_character/models/mushroom.glb.import b/3d/rigidbody_character/models/mushroom.glb.import index 84cdab3eb6..a1a01dacd3 100644 --- a/3d/rigidbody_character/models/mushroom.glb.import +++ b/3d/rigidbody_character/models/mushroom.glb.import @@ -20,9 +20,10 @@ nodes/use_legacy_names=true materials/location=1 materials/storage=0 materials/keep_on_reimport=true -meshes/octahedral_compression=true meshes/compress=true meshes/ensure_tangents=true +meshes/octahedral_compression=true +meshes/vertex_cache_optimization=true meshes/storage=0 meshes/light_baking=0 meshes/lightmap_texel_size=0.1 diff --git a/3d/rigidbody_character/player/cubio.gd b/3d/rigidbody_character/player/cubio.gd index 7bb069adaa..e672601f32 100644 --- a/3d/rigidbody_character/player/cubio.gd +++ b/3d/rigidbody_character/player/cubio.gd @@ -11,6 +11,7 @@ func _physics_process(_delta): get_tree().quit() if Input.is_action_just_pressed("reset_position"): translation = start_position + reset_physics_interpolation() return var dir = Vector3() diff --git a/3d/rigidbody_character/project.godot b/3d/rigidbody_character/project.godot index 3ac3b523cd..da09e5d768 100644 --- a/3d/rigidbody_character/project.godot +++ b/3d/rigidbody_character/project.godot @@ -76,6 +76,7 @@ exit={ [physics] common/physics_fps=120 +common/physics_interpolation=true [rasterizer] diff --git a/3d/truck_town/project.godot b/3d/truck_town/project.godot index 4353faa3ac..da5631c896 100644 --- a/3d/truck_town/project.godot +++ b/3d/truck_town/project.godot @@ -65,6 +65,11 @@ back={ ] } +[physics] + +common/physics_fps=120 +common/physics_interpolation=true + [rasterizer] shadow_filter=3 diff --git a/3d/voxel/default_env.tres b/3d/voxel/default_env.tres index 0a8e581eb9..e1cd19b0d2 100644 --- a/3d/voxel/default_env.tres +++ b/3d/voxel/default_env.tres @@ -1,6 +1,10 @@ [gd_resource type="Environment" load_steps=2 format=2] [sub_resource type="ProceduralSky" id=1] +sky_top_color = Color( 0.501961, 0.6, 0.701961, 1 ) +sky_horizon_color = Color( 0.501961, 0.6, 0.701961, 1 ) +ground_bottom_color = Color( 0.501961, 0.6, 0.701961, 1 ) +ground_horizon_color = Color( 0.501961, 0.6, 0.701961, 1 ) sun_longitude = 100.0 sun_angle_min = 2.0 sun_angle_max = 20.0 @@ -8,8 +12,11 @@ sun_angle_max = 20.0 [resource] background_mode = 2 background_sky = SubResource( 1 ) +background_color = Color( 0.501961, 0.6, 0.701961, 1 ) fog_enabled = true fog_color = Color( 0.501961, 0.6, 0.701961, 1 ) +fog_sun_color = Color( 1, 1, 1, 1 ) +fog_sun_amount = 0.1 fog_depth_begin = 32.0 fog_depth_end = 64.0 fog_transmit_enabled = true diff --git a/3d/voxel/project.godot b/3d/voxel/project.godot index 4678da21c7..c351c6981d 100644 --- a/3d/voxel/project.godot +++ b/3d/voxel/project.godot @@ -39,6 +39,10 @@ config/icon="res://icon.png" Settings="*res://settings.gd" +[debug] + +settings/physics_interpolation/enable_warnings=false + [display] window/size/width=1600 @@ -97,14 +101,14 @@ pause={ } break={ "deadzone": 0.5, -"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null) +"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"canceled":false,"pressed":false,"doubleclick":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":7,"axis_value":1.0,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":7,"pressure":0.0,"pressed":false,"script":null) ] } place={ "deadzone": 0.5, -"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":2,"pressed":false,"doubleclick":false,"script":null) +"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":2,"canceled":false,"pressed":false,"doubleclick":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":6,"axis_value":1.0,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":6,"pressure":0.0,"pressed":false,"script":null) ] @@ -137,20 +141,20 @@ debug={ prev_block={ "deadzone": 0.5, "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":123,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":4,"pressed":false,"doubleclick":false,"script":null) +, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":4,"canceled":false,"pressed":false,"doubleclick":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":91,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } next_block={ "deadzone": 0.5, "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":125,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":5,"pressed":false,"doubleclick":false,"script":null) +, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":5,"canceled":false,"pressed":false,"doubleclick":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":93,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } pick_block={ "deadzone": 0.5, -"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":3,"pressed":false,"doubleclick":false,"script":null) +"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":3,"canceled":false,"pressed":false,"doubleclick":false,"script":null) ] } @@ -158,12 +162,14 @@ pick_block={ common/physics_fps=120 3d/physics_engine="Bullet" +common/physics_interpolation=true [rendering] quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false +quality/shadows/filter_mode=2 quality/filters/anisotropic_filter_level=16 quality/filters/msaa=2 environment/default_environment="res://default_env.tres" diff --git a/3d/voxel/world/textures/texture_sheet.png.import b/3d/voxel/world/textures/texture_sheet.png.import index df58f53044..828462c75a 100644 --- a/3d/voxel/world/textures/texture_sheet.png.import +++ b/3d/voxel/world/textures/texture_sheet.png.import @@ -19,7 +19,7 @@ compress/lossy_quality=1.0 compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 -flags/repeat=true +flags/repeat=0 flags/filter=false flags/mipmaps=true flags/anisotropic=true diff --git a/3d/voxel/world/world.tscn b/3d/voxel/world/world.tscn index 16aa944653..8c3d1dda80 100644 --- a/3d/voxel/world/world.tscn +++ b/3d/voxel/world/world.tscn @@ -35,4 +35,8 @@ environment = ExtResource( 3 ) script = ExtResource( 4 ) [node name="Sun" type="DirectionalLight" parent="Environment"] -transform = Transform( 0.173648, -0.564863, 0.806707, 0, 0.819152, 0.573576, -0.984808, -0.0996005, 0.142244, 0, 0, 0 ) +transform = Transform( 0.173648, -0.564863, 0.806707, 0, 0.819152, 0.573577, -0.984808, -0.0996004, 0.142244, 0, 0, 0 ) +shadow_enabled = true +shadow_bias = 0.02 +directional_shadow_mode = 0 +directional_shadow_max_distance = 50.0 diff --git a/networking/multiplayer_bomber/project.godot b/networking/multiplayer_bomber/project.godot index 945df72e67..54e61cc592 100644 --- a/networking/multiplayer_bomber/project.godot +++ b/networking/multiplayer_bomber/project.godot @@ -21,10 +21,6 @@ config/icon="res://icon.png" gamestate="*res://gamestate.gd" -[debug] - -gdscript/warnings/return_value_discarded=false - [display] window/dpi/allow_hidpi=true @@ -80,10 +76,14 @@ set_bomb={ "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":0,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":1,"pressure":0.0,"pressed":false,"script":null) -, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null) +, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"canceled":false,"pressed":false,"doubleclick":false,"script":null) ] } +[physics] + +common/physics_interpolation=true + [rendering] quality/driver/driver_name="GLES2" diff --git a/networking/multiplayer_bomber/world.tscn b/networking/multiplayer_bomber/world.tscn index ceadb76ad5..c2b1cc662e 100644 --- a/networking/multiplayer_bomber/world.tscn +++ b/networking/multiplayer_bomber/world.tscn @@ -313,5 +313,6 @@ __meta__ = { [node name="Camera2D" type="Camera2D" parent="."] offset = Vector2( 512, 300 ) current = true +process_mode = 0 [connection signal="pressed" from="Winner/ExitGame" to="Score" method="_on_exit_game_pressed"] diff --git a/viewport/dynamic_split_screen/default_env.tres b/viewport/dynamic_split_screen/default_env.tres index 84746c00be..5bda0c3282 100644 --- a/viewport/dynamic_split_screen/default_env.tres +++ b/viewport/dynamic_split_screen/default_env.tres @@ -8,6 +8,7 @@ ground_horizon_color = Color( 0.839216, 0.917647, 0.980392, 1 ) background_mode = 2 background_sky = SubResource( 1 ) ambient_light_color = Color( 0.560784, 0.560784, 0.560784, 1 ) +ambient_light_energy = 0.5 ambient_light_sky_contribution = 0.3 fog_color = Color( 1, 1, 1, 1 ) fog_sun_color = Color( 1, 1, 1, 1 ) diff --git a/viewport/dynamic_split_screen/project.godot b/viewport/dynamic_split_screen/project.godot index 4cbb06350d..0048049b6d 100644 --- a/viewport/dynamic_split_screen/project.godot +++ b/viewport/dynamic_split_screen/project.godot @@ -18,7 +18,7 @@ config/icon="res://icon.png" [debug] -gdscript/warnings/return_value_discarded=false +settings/physics_interpolation/enable_warnings=false [input] @@ -81,6 +81,11 @@ move_right_player2={ ] } +[physics] + +common/physics_fps=120 +common/physics_interpolation=true + [rendering] quality/driver/driver_name="GLES2"