Merge pull request #591 from aaronfranke/misc

Misc improvements and tweaks for 3.2.3

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

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

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

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

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

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]

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

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 )
 

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