Merge pull request #51 from aaronfranke/update-3.2

Finish updating to Godot 3.2 and fix many errors

door/DoorSimple.dae

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:305cdf1f75c453f728b994ad321d3dda2334611556547dc8dfd379fc4ee600a5
-size 6416474
+oid sha256:b796bcc46c31fb6a7c4c237308ad160b338a3a89288c231965c3916599513086
+size 6416448

door/door.tscn

@@ -32,7 +32,6 @@ unit_size = 7.0
 [node name="CollisionShape" type="CollisionShape" parent="."]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.55109, 0 )
 shape = SubResource( 1 )
-
 [connection signal="body_entered" from="." to="." method="_on_door_body_entered"]
 
 [editable path="Scene Root"]

enemies/red_robot/badrobot_large.dae

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fea1f2086ecb509611f8fc3aa5e1855c479e19a7771a037bf3deb4ff2b43bcaf
-size 21126029
+oid sha256:87e6fdcbadf0ae445f167cc0fc081195f8c383f64dbcff977fa3968957844e14
+size 21125913

enemies/red_robot/fire.tscn

@@ -1,470 +0,0 @@
-[gd_scene load_steps=49 format=2]
-
-[ext_resource path="res://enemies/red_robot/red_robot.gd" type="Script" id=1]
-[ext_resource path="res://enemies/red_robot/badrobot_large.dae" type="PackedScene" id=2]
-[ext_resource path="res://enemies/red_robot/ray.obj" type="ArrayMesh" id=3]
-[ext_resource path="res://enemies/red_robot/ray.shader" type="Shader" id=4]
-[ext_resource path="res://enemies/red_robot/ray_texture.png" type="Texture" id=5]
-[ext_resource path="res://enemies/red_robot/ray_smoke_texture.png" type="Texture" id=6]
-[ext_resource path="res://enemies/red_robot/particle.png" type="Texture" id=7]
-[ext_resource path="res://enemies/red_robot/explosion.png" type="Texture" id=8]
-[ext_resource path="res://enemies/red_robot/part_shield.obj" type="ArrayMesh" id=9]
-[ext_resource path="res://enemies/red_robot/EvilRobo.material" type="Material" id=10]
-
-[sub_resource type="ShaderMaterial" id=1]
-shader = ExtResource( 4 )
-shader_param/deform = 2.0
-shader_param/transparency = 0.0
-shader_param/energy = 1.0
-shader_param/smoke = 1.0
-shader_param/clip = 20.0
-shader_param/ray_texture = ExtResource( 5 )
-shader_param/smoke_texture = ExtResource( 6 )
-
-[sub_resource type="Gradient" id=2]
-offsets = PoolRealArray( 0, 0.283019, 1 )
-colors = PoolColorArray( 1, 1, 1, 0, 1, 1, 1, 0.283019, 1, 1, 1, 1 )
-
-[sub_resource type="GradientTexture" id=3]
-gradient = SubResource( 2 )
-
-[sub_resource type="Curve" id=4]
-_data = [ Vector2( 0, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 0.5264 ), 0.0, 0.0, 0, 0 ]
-
-[sub_resource type="CurveTexture" id=5]
-curve = SubResource( 4 )
-
-[sub_resource type="ParticlesMaterial" id=6]
-trail_divisor = 6
-trail_size_modifier = SubResource( 5 )
-emission_shape = 1
-emission_sphere_radius = 1.0
-gravity = Vector3( 0, 0, 0 )
-angular_velocity = -0.381543
-linear_accel = 1.0
-linear_accel_random = 1.0
-radial_accel = -1.0
-tangential_accel = 1.0
-scale = 0.1
-color_ramp = SubResource( 3 )
-
-[sub_resource type="SpatialMaterial" id=7]
-flags_transparent = true
-flags_unshaded = true
-vertex_color_use_as_albedo = true
-vertex_color_is_srgb = true
-params_blend_mode = 1
-params_billboard_mode = 3
-particles_anim_h_frames = 1
-particles_anim_v_frames = 1
-particles_anim_loop = false
-albedo_color = Color( 0.870588, 0.294118, 0.294118, 1 )
-albedo_texture = ExtResource( 7 )
-
-[sub_resource type="QuadMesh" id=8]
-material = SubResource( 7 )
-
-[sub_resource type="Gradient" id=9]
-colors = PoolColorArray( 1, 1, 1, 0.961538, 0.960784, 0.960784, 0.960784, 0 )
-
-[sub_resource type="GradientTexture" id=10]
-gradient = SubResource( 9 )
-
-[sub_resource type="Curve" id=11]
-max_value = 2.0
-_data = [ Vector2( 0, 0.3856 ), 0.0, 0.0, 0, 0, Vector2( 0.0612366, 1 ), 0.0, 0.0, 0, 0, Vector2( 0.999703, 1.4752 ), 0.0, 0.0, 0, 0 ]
-
-[sub_resource type="CurveTexture" id=12]
-curve = SubResource( 11 )
-
-[sub_resource type="ParticlesMaterial" id=13]
-emission_shape = 1
-emission_sphere_radius = 0.1
-spread = 180.0
-gravity = Vector3( 0, 2, 0 )
-initial_velocity = 0.3
-angular_velocity = 84.86
-angular_velocity_random = 1.0
-scale_curve = SubResource( 12 )
-color_ramp = SubResource( 10 )
-
-[sub_resource type="SpatialMaterial" id=14]
-flags_transparent = true
-flags_unshaded = true
-vertex_color_use_as_albedo = true
-vertex_color_is_srgb = true
-params_blend_mode = 1
-params_billboard_mode = 3
-particles_anim_h_frames = 1
-particles_anim_v_frames = 1
-particles_anim_loop = false
-albedo_texture = ExtResource( 8 )
-proximity_fade_enable = true
-proximity_fade_distance = 0.2
-
-[sub_resource type="QuadMesh" id=15]
-material = SubResource( 14 )
-
-[sub_resource type="AnimationNodeAnimation" id=16]
-resource_local_to_scene = true
-animation = "TurnRight-cycle"
-
-[sub_resource type="AnimationNodeAnimation" id=17]
-resource_local_to_scene = true
-animation = "TurnLeft-cycle"
-
-[sub_resource type="AnimationNodeAnimation" id=18]
-resource_local_to_scene = true
-animation = "Walk-cycle"
-
-[sub_resource type="AnimationNodeAnimation" id=19]
-resource_local_to_scene = true
-animation = "Damage_take1"
-
-[sub_resource type="AnimationNodeAnimation" id=20]
-resource_local_to_scene = true
-animation = "Damage_take2"
-
-[sub_resource type="AnimationNodeAnimation" id=21]
-resource_local_to_scene = true
-animation = "Damage_heavy"
-
-[sub_resource type="AnimationNodeAnimation" id=22]
-resource_local_to_scene = true
-animation = "Idle-cycle"
-
-[sub_resource type="AnimationNodeAnimation" id=23]
-resource_local_to_scene = true
-animation = "Cannon-U"
-
-[sub_resource type="AnimationNodeAnimation" id=24]
-resource_local_to_scene = true
-animation = "Cannon-D"
-
-[sub_resource type="AnimationNodeAnimation" id=25]
-resource_local_to_scene = true
-animation = "Cannon-R"
-
-[sub_resource type="AnimationNodeAnimation" id=26]
-resource_local_to_scene = true
-animation = "Cannon-L"
-
-[sub_resource type="AnimationNodeAnimation" id=27]
-resource_local_to_scene = true
-animation = "Cannon-N"
-
-[sub_resource type="AnimationNodeBlendSpace2D" id=28]
-resource_local_to_scene = true
-blend_point_0/node = SubResource( 23 )
-blend_point_0/pos = Vector2( 0, 1 )
-blend_point_1/node = SubResource( 24 )
-blend_point_1/pos = Vector2( 0, -1 )
-blend_point_2/node = SubResource( 25 )
-blend_point_2/pos = Vector2( 1, 0 )
-blend_point_3/node = SubResource( 26 )
-blend_point_3/pos = Vector2( -1, 0 )
-blend_point_4/node = SubResource( 27 )
-blend_point_4/pos = Vector2( 0, 0 )
-
-[sub_resource type="AnimationNodeBlend2" id=29]
-resource_local_to_scene = true
-filter_enabled = true
-filters = [ "Armature/Skeleton:Cannon-TrackTurret", "Armature/Skeleton:CannonAnimRecoil" ]
-
-[sub_resource type="AnimationNodeOneShot" id=30]
-resource_local_to_scene = true
-fadeout_time = 0.5
-autorestart_random_delay = 0.0
-
-[sub_resource type="AnimationNodeOneShot" id=31]
-resource_local_to_scene = true
-fadeout_time = 0.5
-autorestart_random_delay = 0.0
-
-[sub_resource type="AnimationNodeOneShot" id=32]
-resource_local_to_scene = true
-fadeout_time = 0.5
-autorestart_random_delay = 0.0
-
-[sub_resource type="AnimationNodeTransition" id=33]
-resource_local_to_scene = true
-input_count = 4
-xfade_time = 0.5
-input_0/name = "idle"
-input_0/auto_advance = false
-input_1/name = "turn_left"
-input_1/auto_advance = false
-input_2/name = "turn_right"
-input_2/auto_advance = false
-input_3/name = "walk"
-input_3/auto_advance = false
-
-[sub_resource type="AnimationNodeBlendTree" id=34]
-resource_local_to_scene = true
-graph_offset = Vector2( -16, 79 )
-nodes/Animation/node = SubResource( 22 )
-nodes/Animation/position = Vector2( -200, 100 )
-"nodes/Animation 2/node" = SubResource( 16 )
-"nodes/Animation 2/position" = Vector2( -200, 340 )
-"nodes/Animation 3/node" = SubResource( 17 )
-"nodes/Animation 3/position" = Vector2( -200, 220 )
-"nodes/Animation 4/node" = SubResource( 18 )
-"nodes/Animation 4/position" = Vector2( -160, 460 )
-"nodes/Animation 5/node" = SubResource( 19 )
-"nodes/Animation 5/position" = Vector2( 200, 440 )
-"nodes/Animation 6/node" = SubResource( 20 )
-"nodes/Animation 6/position" = Vector2( 500, 440 )
-"nodes/Animation 7/node" = SubResource( 21 )
-"nodes/Animation 7/position" = Vector2( 740, 440 )
-nodes/aim/node = SubResource( 28 )
-nodes/aim/position = Vector2( 80, 320 )
-nodes/aiming/node = SubResource( 29 )
-nodes/aiming/position = Vector2( 320, 200 )
-nodes/hit1/node = SubResource( 30 )
-nodes/hit1/position = Vector2( 540, 240 )
-nodes/hit2/node = SubResource( 31 )
-nodes/hit2/position = Vector2( 760, 240 )
-nodes/hit3/node = SubResource( 32 )
-nodes/hit3/position = Vector2( 980, 240 )
-nodes/output/position = Vector2( 1180, 200 )
-nodes/state/node = SubResource( 33 )
-nodes/state/position = Vector2( 60, 100 )
-node_connections = [ "output", 0, "hit3", "state", 0, "Animation", "state", 1, "Animation 3", "state", 2, "Animation 2", "state", 3, "Animation 4", "hit2", 0, "hit1", "hit2", 1, "Animation 6", "hit3", 0, "hit2", "hit3", 1, "Animation 7", "aiming", 0, "state", "aiming", 1, "aim", "hit1", 0, "aiming", "hit1", 1, "Animation 5" ]
-
-[sub_resource type="SphereShape" id=35]
-radius = 1.11815
-
-[sub_resource type="SphereShape" id=36]
-radius = 18.1337
-
-[sub_resource type="Animation" id=37]
-length = 4.0
-tracks/0/type = "value"
-tracks/0/path = NodePath("Scene Root/Armature/Skeleton/ray_from/ray:material/0:shader_param/energy")
-tracks/0/interp = 1
-tracks/0/loop_wrap = true
-tracks/0/imported = false
-tracks/0/enabled = true
-tracks/0/keys = {
-"times": PoolRealArray( 0, 2, 2.1, 2.2, 2.6 ),
-"transitions": PoolRealArray( 1, 1, 1, 1, 1 ),
-"update": 0,
-"values": [ 1.0, 1.0, 5.0, 1.0, 1.0 ]
-}
-tracks/1/type = "value"
-tracks/1/path = NodePath("Scene Root/Armature/Skeleton/ray_from/ray:material/0:shader_param/transparency")
-tracks/1/interp = 1
-tracks/1/loop_wrap = true
-tracks/1/imported = false
-tracks/1/enabled = true
-tracks/1/keys = {
-"times": PoolRealArray( 0, 2, 2.1, 2.6, 2.8 ),
-"transitions": PoolRealArray( 1, 1, 1, 1, 1 ),
-"update": 0,
-"values": [ 0.0, 0.0, 1.0, 1.0, 0.0 ]
-}
-tracks/2/type = "value"
-tracks/2/path = NodePath("Scene Root/Armature/Skeleton/ray_from/ray:material/0:shader_param/deform")
-tracks/2/interp = 1
-tracks/2/loop_wrap = true
-tracks/2/imported = false
-tracks/2/enabled = true
-tracks/2/keys = {
-"times": PoolRealArray( 0, 2, 2.6, 2.8 ),
-"transitions": PoolRealArray( 1, 1, 1, 1 ),
-"update": 0,
-"values": [ 0.0, 0.0, 0.0, 2.0 ]
-}
-tracks/3/type = "value"
-tracks/3/path = NodePath("Scene Root/Armature/Skeleton/ray_from/ray:material/0:shader_param/smoke")
-tracks/3/interp = 1
-tracks/3/loop_wrap = true
-tracks/3/imported = false
-tracks/3/enabled = true
-tracks/3/keys = {
-"times": PoolRealArray( 0, 2, 2.2, 2.6 ),
-"transitions": PoolRealArray( 1, 1, 1, 1 ),
-"update": 0,
-"values": [ 0.0, 0.0, 0.0, 1.0 ]
-}
-tracks/4/type = "value"
-tracks/4/path = NodePath("shoot_light:visible")
-tracks/4/interp = 1
-tracks/4/loop_wrap = true
-tracks/4/imported = false
-tracks/4/enabled = true
-tracks/4/keys = {
-"times": PoolRealArray( 0.2, 1.6, 2, 2.6 ),
-"transitions": PoolRealArray( 1, 1, 1, 1 ),
-"update": 1,
-"values": [ true, false, true, false ]
-}
-tracks/5/type = "value"
-tracks/5/path = NodePath("shoot_light:light_energy")
-tracks/5/interp = 1
-tracks/5/loop_wrap = true
-tracks/5/imported = false
-tracks/5/enabled = true
-tracks/5/keys = {
-"times": PoolRealArray( 0, 0.2, 0.9, 1.6, 2, 2.1, 2.6 ),
-"transitions": PoolRealArray( 1, -2, 4.28709, 1, 1, 1, 1 ),
-"update": 0,
-"values": [ 0.0, 0.0, 1.0, 0.0, 0.0, 5.0, 0.0 ]
-}
-tracks/6/type = "value"
-tracks/6/path = NodePath("Scene Root/Armature/Skeleton/ray_from/Particles:emitting")
-tracks/6/interp = 1
-tracks/6/loop_wrap = true
-tracks/6/imported = false
-tracks/6/enabled = true
-tracks/6/keys = {
-"times": PoolRealArray( 0, 0.2, 1 ),
-"transitions": PoolRealArray( 1, 1, 1 ),
-"update": 1,
-"values": [ false, true, false ]
-}
-tracks/7/type = "value"
-tracks/7/path = NodePath("Scene Root/Armature/Skeleton/ray_from/explosion:emitting")
-tracks/7/interp = 1
-tracks/7/loop_wrap = true
-tracks/7/imported = false
-tracks/7/enabled = true
-tracks/7/keys = {
-"times": PoolRealArray( 2.1 ),
-"transitions": PoolRealArray( 1 ),
-"update": 1,
-"values": [ true ]
-}
-tracks/8/type = "value"
-tracks/8/path = NodePath("AnimationTree:active")
-tracks/8/interp = 1
-tracks/8/loop_wrap = true
-tracks/8/imported = false
-tracks/8/enabled = false
-tracks/8/keys = {
-"times": PoolRealArray( 0, 2.6, 2.9 ),
-"transitions": PoolRealArray( 1, 1, 1 ),
-"update": 1,
-"values": [ true, false, true ]
-}
-tracks/9/type = "method"
-tracks/9/path = NodePath(".")
-tracks/9/interp = 1
-tracks/9/loop_wrap = true
-tracks/9/imported = false
-tracks/9/enabled = true
-tracks/9/keys = {
-"times": PoolRealArray( 1.9, 3 ),
-"transitions": PoolRealArray( 1, 1 ),
-"values": [ {
-"args": [  ],
-"method": "shoot_check"
-}, {
-"args": [  ],
-"method": "resume_approach"
-} ]
-}
-
-[sub_resource type="BoxShape" id=38]
-extents = Vector3( 0.499703, 0.514522, 0.0474423 )
-
-[node name="big_robot" type="KinematicBody"]
-script = ExtResource( 1 )
-
-[node name="Scene Root" parent="." instance=ExtResource( 2 )]
-
-[node name="Skeleton" parent="Scene Root/Armature" index="0"]
-bones/14/bound_children = [ NodePath("ray_from") ]
-
-[node name="ray_from" type="BoneAttachment" parent="Scene Root/Armature/Skeleton" index="4"]
-transform = Transform( -0.999658, -0.0258913, -0.00357359, -0.0259207, 0.999628, 0.00845236, 0.00335341, 0.00854211, -0.999958, -0.0550203, 2.06904, 0.178224 )
-bone_name = "CannonAnimRecoil"
-
-[node name="ray" type="MeshInstance" parent="Scene Root/Armature/Skeleton/ray_from"]
-transform = Transform( 1, 8.40737e-09, -9.31323e-10, -6.55928e-09, 1, -9.31323e-10, 4.65661e-10, 0, 1, 1.67638e-08, 0, -1.21376 )
-mesh = ExtResource( 3 )
-skeleton = NodePath("")
-material/0 = SubResource( 1 )
-
-[node name="Particles" type="Particles" parent="Scene Root/Armature/Skeleton/ray_from"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1.07273 )
-emitting = false
-amount = 64
-process_material = SubResource( 6 )
-draw_pass_1 = SubResource( 8 )
-
-[node name="explosion" type="Particles" parent="Scene Root/Armature/Skeleton/ray_from"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0332087, -10.283 )
-emitting = false
-amount = 64
-lifetime = 0.5
-one_shot = true
-explosiveness = 1.0
-local_coords = false
-process_material = SubResource( 13 )
-draw_pass_1 = SubResource( 15 )
-
-[node name="AnimationTree" type="AnimationTree" parent="."]
-tree_root = SubResource( 34 )
-anim_player = NodePath("../Scene Root/AnimationPlayer")
-active = true
-process_mode = 0
-root_motion_track = NodePath("Armature/Skeleton:MASTER")
-parameters/aim/blend_position = Vector2( 0, 0 )
-parameters/aiming/blend_amount = 0
-parameters/hit1/active = false
-parameters/hit2/active = false
-parameters/hit3/active = false
-parameters/state/current = 0
-
-[node name="CollisionShape" type="CollisionShape" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.11655, -0.0212681 )
-shape = SubResource( 35 )
-
-[node name="area" type="Area" parent="."]
-
-[node name="CollisionShape" type="CollisionShape" parent="area"]
-shape = SubResource( 36 )
-
-[node name="RootMotionView" type="RootMotionView" parent="."]
-animation_path = NodePath("../AnimationTree")
-
-[node name="shoot_anim" type="AnimationPlayer" parent="."]
-anims/shoot = SubResource( 37 )
-
-[node name="shoot_light" type="OmniLight" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.82358, 2.06607 )
-visible = false
-light_color = Color( 0.992157, 0.713726, 0.713726, 1 )
-light_energy = 0.0
-shadow_enabled = true
-omni_range = 8.68993
-omni_shadow_mode = 0
-
-[node name="death" type="Spatial" parent="."]
-
-[node name="part_shield" type="RigidBody" parent="death"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1.81641, 0, 0 )
-
-[node name="mesh" type="MeshInstance" parent="death/part_shield"]
-mesh = ExtResource( 9 )
-material/0 = ExtResource( 10 )
-
-[node name="CollisionShape" type="CollisionShape" parent="death/part_shield"]
-transform = Transform( 1, 0, 0, 0, 0.908425, 0.418048, 0, -0.418048, 0.908425, 1.26196, 1.92252, 0.648781 )
-shape = SubResource( 38 )
-
-[node name="CollisionShape2" type="CollisionShape" parent="death/part_shield"]
-transform = Transform( 1, 0, 0, 0, 0.999275, -0.038063, 0, 0.038063, 0.999275, 1.26196, 0.914196, 0.807968 )
-shape = SubResource( 38 )
-
-[node name="fire" type="Particles" parent="death/part_shield"]
-transform = Transform( -0.999594, 0.0284228, 0.00205158, 0.0284288, 0.999592, 0.00296096, -0.0019666, 0.00301808, -0.999993, 1.84765, 2.51685, 10.484 )
-amount = 32
-process_material = SubResource( 13 )
-draw_pass_1 = SubResource( 15 )
-
-[connection signal="body_entered" from="area" to="." method="_on_area_body_entered"]
-[connection signal="body_exited" from="area" to="." method="_on_area_body_exited"]
-
-[editable path="Scene Root"]

enemies/red_robot/part_head.mtl

@@ -10,7 +10,6 @@ Ke 0.000000 0.000000 0.000000
 Ni 1.000000
 d 1.000000
 illum 0
-map_Kd /home/red/coding/godot/Desktop/RobotMalo/EvilRobo-BaseColor.png
 
 newmtl ShadelessBlack
 Ns 96.078431
@@ -21,4 +20,3 @@ Ke 0.000000 0.000000 0.000000
 Ni 1.000000
 d 1.000000
 illum 0
-map_Kd /home/red/coding/godot/Desktop/RobotMalo/EvilRobo-BaseColor.png

enemies/red_robot/part_head.obj.import

@@ -15,4 +15,5 @@ dest_files=[ "res://.import/part_head.obj-139943756a373f59f2fa564edc1c12f1.mesh"
 
 generate_tangents=true
 scale_mesh=Vector3( 1, 1, 1 )
+offset_mesh=Vector3( 0, 0, 0 )
 optimize_mesh=true

enemies/red_robot/part_shield.mtl

@@ -10,4 +10,3 @@ Ke 0.000000 0.000000 0.000000
 Ni 1.000000
 d 1.000000
 illum 0
-map_Kd /home/red/coding/godot/Desktop/RobotMalo/EvilRobo-BaseColor.png

enemies/red_robot/part_shield.obj.import

@@ -15,4 +15,5 @@ dest_files=[ "res://.import/part_shield.obj-3ee32b2d765fa709ced40b01f8f70521.mes
 
 generate_tangents=true
 scale_mesh=Vector3( 1, 1, 1 )
+offset_mesh=Vector3( 0, 0, 0 )
 optimize_mesh=true

enemies/red_robot/ray.obj.import

@@ -15,4 +15,5 @@ dest_files=[ "res://.import/ray.obj-d36389ed36595462fc2df02b2fefb633.mesh", "res
 
 generate_tangents=true
 scale_mesh=Vector3( 1, 1, 1 )
+offset_mesh=Vector3( 0, 0, 0 )
 optimize_mesh=false

enemies/red_robot/red_robot.tscn

@@ -140,17 +140,14 @@ filters = [ "Armature/Skeleton:Cannon-TrackTurret", "Armature/Skeleton:CannonAni
 [sub_resource type="AnimationNodeOneShot" id=22]
 resource_local_to_scene = true
 fadeout_time = 0.5
-autorestart_random_delay = 0.0
 
 [sub_resource type="AnimationNodeOneShot" id=23]
 resource_local_to_scene = true
 fadeout_time = 0.5
-autorestart_random_delay = 0.0
 
 [sub_resource type="AnimationNodeOneShot" id=24]
 resource_local_to_scene = true
 fadeout_time = 0.5
-autorestart_random_delay = 0.0
 
 [sub_resource type="AnimationNodeTransition" id=25]
 resource_local_to_scene = true
@@ -550,9 +547,6 @@ script = ExtResource( 1 )
 
 [node name="Scene Root" parent="." instance=ExtResource( 2 )]
 
-[node name="Skeleton" parent="Scene Root/Armature" index="0"]
-bones/14/bound_children = [ NodePath("ray_from") ]
-
 [node name="ray_from" type="BoneAttachment" parent="Scene Root/Armature/Skeleton" index="4"]
 transform = Transform( -0.999975, 0.0070746, 0.000551782, 0.00707948, 0.999931, 0.0094271, -0.000485051, 0.00943077, -0.999955, 0.00850569, 2.08377, 0.183162 )
 bone_name = "CannonAnimRecoil"
@@ -571,7 +565,6 @@ mesh = SubResource( 3 )
 emission_shape = 1
 emission_sphere_radius = 1.0
 gravity = Vector3( 0, 0, 0 )
-initial_velocity = 0.0
 angular_velocity = -0.381543
 linear_accel = 1.0
 linear_accel_random = 1.0
@@ -780,7 +773,6 @@ unit_size = 15.0
 stream = ExtResource( 19 )
 unit_db = 3.0
 unit_size = 15.0
-
 [connection signal="body_entered" from="area" to="." method="_on_area_body_entered"]
 [connection signal="body_exited" from="area" to="." method="_on_area_body_exited"]
 

fx/plasma/plasma.tscn

@@ -38,4 +38,3 @@ angular_velocity_random = 1.0
 angle = 720.0
 angle_random = 1.0
 color_ramp = SubResource( 3 )
-

fx/smoke/smoke.tscn

@@ -44,4 +44,3 @@ angular_velocity_random = 1.0
 angle = 720.0
 angle_random = 1.0
 color_ramp = SubResource( 3 )
-

level/forklift/forklift.tscn

@@ -88,4 +88,3 @@ light_bake_mode = 0
 shadow_enabled = true
 spot_range = 7.70138
 spot_angle = 22.7554
-

level/geometry/demolevel.dae

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:53439afdede93060cae01b9471bfda2fb472e8f3c67967539cc87a8e734ecdc3
-size 336814046
+oid sha256:73d3d21e75265b07f2200347acc53e5edf0dc247e7e339e75fede878afb82dca
+size 336813018

level/level.tscn

@@ -20,6 +20,7 @@ ambient_light_sky_contribution = 0.0
 fog_enabled = true
 fog_color = Color( 0.403922, 0.25098, 0.105882, 1 )
 fog_depth_begin = 3.0
+fog_depth_end = 0.0
 fog_depth_curve = 1.27456
 fog_transmit_curve = 1.03526
 fog_height_enabled = true

level/textures/Trims_emissionlights_Normal.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path.s3tc="res://.import/Trims_emissionlights_Normal.png-af72d6befa559f44fdea9bbeba70cbe8.s3tc.stex"
-metadata={
-"imported_formats": [ "s3tc" ],
-"vram_texture": true
-}
-
-[deps]
-
-source_file="res://level/textures/Trims_emissionlights_Normal.png"
-dest_files=[ "res://.import/Trims_emissionlights_Normal.png-af72d6befa559f44fdea9bbeba70cbe8.s3tc.stex" ]
-
-[params]
-
-compress/mode=2
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=1
-flags/repeat=true
-flags/filter=true
-flags/mipmaps=true
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=false
-svg/scale=1.0

level/textures/trim_emissionlights_n.png.import

@@ -2,26 +2,27 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/trim_emissionlights_n.png-159021fb93703b8d8ba1a662d3a5d00e.stex"
+path.s3tc="res://.import/trim_emissionlights_n.png-159021fb93703b8d8ba1a662d3a5d00e.s3tc.stex"
 metadata={
-"vram_texture": false
+"imported_formats": [ "s3tc" ],
+"vram_texture": true
 }
 
 [deps]
 
 source_file="res://level/textures/trim_emissionlights_n.png"
-dest_files=[ "res://.import/trim_emissionlights_n.png-159021fb93703b8d8ba1a662d3a5d00e.stex" ]
+dest_files=[ "res://.import/trim_emissionlights_n.png-159021fb93703b8d8ba1a662d3a5d00e.s3tc.stex" ]
 
 [params]
 
-compress/mode=0
+compress/mode=2
 compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
+compress/normal_map=1
+flags/repeat=true
 flags/filter=true
-flags/mipmaps=false
+flags/mipmaps=true
 flags/anisotropic=false
 flags/srgb=2
 process/fix_alpha_border=true
@@ -30,5 +31,5 @@ process/HDR_as_SRGB=false
 process/invert_color=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false
 svg/scale=1.0

menu/menu.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=37 format=2]
+[gd_scene load_steps=38 format=2]
 
 [ext_resource path="res://menu/menu.gd" type="Script" id=1]
 [ext_resource path="res://menu/experiment.hdr" type="Texture" id=2]
@@ -18,6 +18,7 @@
 [ext_resource path="res://menu/button_focus.tres" type="StyleBox" id=16]
 [ext_resource path="res://menu/button_hover.tres" type="StyleBox" id=17]
 [ext_resource path="res://menu/button_action_pressed.tres" type="StyleBox" id=18]
+[ext_resource path="res://player/fx_step.wav" type="AudioStream" id=19]
 
 [sub_resource type="PanoramaSky" id=1]
 panorama = ExtResource( 2 )
@@ -63,7 +64,7 @@ nodes/Blend2/position = Vector2( 180, 120 )
 nodes/output/position = Vector2( 420, 120 )
 node_connections = [ "output", 0, "Blend2", "Blend2", 0, "Animation", "Blend2", 1, "Animation 2" ]
 
-[sub_resource type="Theme" id=57]
+[sub_resource type="Theme" id=9]
 Button/colors/font_color = Color( 1, 1, 1, 1 )
 Button/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 )
 Button/colors/font_color_hover = Color( 1, 1, 1, 1 )
@@ -87,22 +88,22 @@ Label/styles/normal = null
 
 [sub_resource type="ButtonGroup" id=10]
 
-[sub_resource type="ButtonGroup" id=24]
+[sub_resource type="ButtonGroup" id=11]
 
-[sub_resource type="ButtonGroup" id=39]
+[sub_resource type="ButtonGroup" id=12]
 
-[sub_resource type="ButtonGroup" id=46]
+[sub_resource type="ButtonGroup" id=13]
 
-[sub_resource type="ButtonGroup" id=53]
+[sub_resource type="ButtonGroup" id=14]
 
-[sub_resource type="DynamicFontData" id=49]
+[sub_resource type="DynamicFontData" id=15]
 font_path = "res://menu/font/PT_Sans-Web-Bold.ttf"
 
-[sub_resource type="DynamicFont" id=50]
+[sub_resource type="DynamicFont" id=16]
 size = 40
-font_data = SubResource( 49 )
+font_data = SubResource( 15 )
 
-[sub_resource type="StyleBoxFlat" id=51]
+[sub_resource type="StyleBoxFlat" id=17]
 bg_color = Color( 0.278431, 0.278431, 0.360784, 1 )
 border_width_left = 5
 border_width_top = 5
@@ -114,7 +115,7 @@ corner_radius_top_right = 10
 corner_radius_bottom_right = 10
 corner_radius_bottom_left = 10
 
-[sub_resource type="StyleBoxFlat" id=52]
+[sub_resource type="StyleBoxFlat" id=18]
 bg_color = Color( 0.0901961, 0.0784314, 0.117647, 1 )
 border_width_left = 3
 border_width_top = 3
@@ -134,6 +135,11 @@ environment = SubResource( 2 )
 
 [node name="Scene Root" parent="." instance=ExtResource( 3 )]
 
+[node name="sfx" type="Node" parent="Scene Root"]
+
+[node name="step" type="AudioStreamPlayer" parent="Scene Root/sfx"]
+stream = ExtResource( 19 )
+
 [node name="MeshInstance" type="MeshInstance" parent="."]
 transform = Transform( 15, 0, 0, 0, 0, 15, 0, -15, 0, 0, 0, 0 )
 mesh = SubResource( 3 )
@@ -157,6 +163,11 @@ anim_player = NodePath("../Scene Root/AnimationPlayer")
 active = true
 parameters/Blend2/blend_amount = 0
 
+[node name="sfx" type="Node" parent="."]
+
+[node name="step" type="AudioStreamPlayer" parent="sfx"]
+stream = ExtResource( 19 )
+
 [node name="TextureRect" type="TextureRect" parent="."]
 margin_left = 20.1403
 margin_top = 5.03506
@@ -171,7 +182,7 @@ __meta__ = {
 anchor_left = 0.00106799
 anchor_right = 1.00107
 anchor_bottom = 1.0
-theme = SubResource( 57 )
+theme = SubResource( 9 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -300,7 +311,7 @@ margin_bottom = 57.0
 size_flags_horizontal = 3
 toggle_mode = true
 pressed = true
-group = SubResource( 24 )
+group = SubResource( 11 )
 text = "8x"
 
 [node name="aa_4x" type="Button" parent="ui/settings/aa"]
@@ -309,7 +320,7 @@ margin_right = 870.0
 margin_bottom = 57.0
 size_flags_horizontal = 3
 toggle_mode = true
-group = SubResource( 24 )
+group = SubResource( 11 )
 text = "4x"
 
 [node name="aa_2x" type="Button" parent="ui/settings/aa"]
@@ -318,7 +329,7 @@ margin_right = 1105.0
 margin_bottom = 57.0
 size_flags_horizontal = 3
 toggle_mode = true
-group = SubResource( 24 )
+group = SubResource( 11 )
 text = "2x"
 
 [node name="aa_disabled" type="Button" parent="ui/settings/aa"]
@@ -327,7 +338,7 @@ margin_right = 1342.0
 margin_bottom = 57.0
 size_flags_horizontal = 3
 toggle_mode = true
-group = SubResource( 24 )
+group = SubResource( 11 )
 text = "Disabled"
 
 [node name="ssao" type="HBoxContainer" parent="ui/settings"]
@@ -357,7 +368,7 @@ margin_bottom = 57.0
 size_flags_horizontal = 3
 toggle_mode = true
 pressed = true
-group = SubResource( 39 )
+group = SubResource( 12 )
 text = "High"
 
 [node name="ssao_low" type="Button" parent="ui/settings/ssao"]
@@ -366,7 +377,7 @@ margin_right = 1028.0
 margin_bottom = 57.0
 size_flags_horizontal = 3
 toggle_mode = true
-group = SubResource( 39 )
+group = SubResource( 12 )
 text = "Low"
 
 [node name="ssao_disabled" type="Button" parent="ui/settings/ssao"]
@@ -375,7 +386,7 @@ margin_right = 1342.0
 margin_bottom = 57.0
 size_flags_horizontal = 3
 toggle_mode = true
-group = SubResource( 39 )
+group = SubResource( 12 )
 text = "Disabled"
 
 [node name="resolution" type="HBoxContainer" parent="ui/settings"]
@@ -405,7 +416,7 @@ margin_bottom = 57.0
 size_flags_horizontal = 3
 toggle_mode = true
 pressed = true
-group = SubResource( 46 )
+group = SubResource( 13 )
 text = "Native"
 
 [node name="resolution_1080" type="Button" parent="ui/settings/resolution"]
@@ -414,7 +425,7 @@ margin_right = 870.0
 margin_bottom = 57.0
 size_flags_horizontal = 3
 toggle_mode = true
-group = SubResource( 46 )
+group = SubResource( 13 )
 text = "1080"
 
 [node name="resolution_720" type="Button" parent="ui/settings/resolution"]
@@ -423,7 +434,7 @@ margin_right = 1105.0
 margin_bottom = 57.0
 size_flags_horizontal = 3
 toggle_mode = true
-group = SubResource( 46 )
+group = SubResource( 13 )
 text = "720"
 
 [node name="resolution_576" type="Button" parent="ui/settings/resolution"]
@@ -432,7 +443,7 @@ margin_right = 1342.0
 margin_bottom = 57.0
 size_flags_horizontal = 3
 toggle_mode = true
-group = SubResource( 46 )
+group = SubResource( 13 )
 text = "576"
 
 [node name="fullscreen" type="HBoxContainer" parent="ui/settings"]
@@ -459,7 +470,7 @@ margin_bottom = 57.0
 size_flags_horizontal = 3
 toggle_mode = true
 pressed = true
-group = SubResource( 53 )
+group = SubResource( 14 )
 text = "Yes"
 
 [node name="fullscreen_no" type="Button" parent="ui/settings/fullscreen"]
@@ -468,7 +479,7 @@ margin_right = 1342.0
 margin_bottom = 57.0
 size_flags_horizontal = 3
 toggle_mode = true
-group = SubResource( 53 )
+group = SubResource( 14 )
 text = "No"
 
 [node name="sep" type="Control" parent="ui/settings"]
@@ -489,7 +500,7 @@ margin_bottom = 57.0
 size_flags_horizontal = 3
 custom_styles/hover = ExtResource( 18 )
 custom_styles/pressed = ExtResource( 18 )
-custom_fonts/font = SubResource( 50 )
+custom_fonts/font = SubResource( 16 )
 custom_colors/font_color = Color( 1, 1, 1, 1 )
 custom_colors/font_color_hover = Color( 1, 1, 1, 1 )
 custom_colors/font_color_pressed = Color( 1, 1, 1, 1 )
@@ -505,7 +516,7 @@ margin_bottom = 57.0
 size_flags_horizontal = 3
 custom_styles/hover = ExtResource( 18 )
 custom_styles/pressed = ExtResource( 18 )
-custom_fonts/font = SubResource( 50 )
+custom_fonts/font = SubResource( 16 )
 custom_colors/font_color = Color( 1, 1, 1, 1 )
 custom_colors/font_color_hover = Color( 1, 1, 1, 1 )
 custom_colors/font_color_pressed = Color( 1, 1, 1, 1 )
@@ -538,8 +549,8 @@ margin_right = 1690.0
 margin_bottom = 53.0
 size_flags_horizontal = 3
 size_flags_vertical = 1
-custom_styles/fg = SubResource( 51 )
-custom_styles/bg = SubResource( 52 )
+custom_styles/fg = SubResource( 17 )
+custom_styles/bg = SubResource( 18 )
 __meta__ = {
 "_edit_use_anchors_": false
 }

player/bullet.tscn

@@ -4,7 +4,7 @@
 [ext_resource path="res://player/blue_myst.png" type="Texture" id=2]
 [ext_resource path="res://player/fx_bullet_explodewav.wav" type="AudioStream" id=3]
 
-[sub_resource type="SphereMesh" id=18]
+[sub_resource type="SphereMesh" id=1]
 radial_segments = 9
 rings = 5
 
@@ -175,7 +175,7 @@ script = ExtResource( 1 )
 [node name="MeshInstance" type="MeshInstance" parent="."]
 transform = Transform( 0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0 )
 cast_shadow = 0
-mesh = SubResource( 18 )
+mesh = SubResource( 1 )
 material/0 = null
 
 [node name="Particles" type="Particles" parent="."]

player/player.dae

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4260c9445cee94fb6ea4296407c77fb7cdd6fefc60227bbd0982563e8a114cc3
-size 56666309
+oid sha256:c940404266a2530708b6120429ce7318703357e8b11211b99a155d8e66862ec5
+size 56666131

player/player.tscn

@@ -221,9 +221,6 @@ script = ExtResource( 1 )
 
 [node name="Scene Root" parent="." instance=ExtResource( 2 )]
 
-[node name="Skeleton" parent="Scene Root/Robot_Skeleton" index="0"]
-bones/46/bound_children = [ NodePath("gun_bone") ]
-
 [node name="gun_bone" type="BoneAttachment" parent="Scene Root/Robot_Skeleton/Skeleton" index="5"]
 transform = Transform( 0.90287, -0.253554, 0.347451, -0.259802, -0.965241, -0.0296011, 0.342916, -0.0635128, -0.93723, -0.207006, 1.36658, 0.538869 )
 bone_name = "hand.R"
@@ -256,7 +253,6 @@ transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 1.00
 shape = SubResource( 24 )
 
 [node name="camera_base" type="Spatial" parent="."]
-editor/display_folded = true
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.85456, 0 )
 
 [node name="camera_rot" type="Spatial" parent="camera_base"]
@@ -283,7 +279,6 @@ margin_bottom = 8.16064
 texture = ExtResource( 3 )
 
 [node name="sfx" type="Node" parent="."]
-editor/display_folded = true
 
 [node name="step" type="AudioStreamPlayer" parent="sfx"]
 stream = ExtResource( 4 )

project.godot

@@ -204,3 +204,4 @@ vram_compression/import_etc2=false
 quality/shadow_atlas/size=2048
 quality/filters/msaa=2
 environment/default_environment="res://default_env.tres"
+quality/dynamic_fonts/use_oversampling=false

testlevel/level.tscn

@@ -31,7 +31,7 @@ glow_bloom = 0.04
 glow_blend_mode = 1
 glow_bicubic_upscale = true
 
-[node name="Spatial" type="Spatial"]
+[node name="TestLevel1" type="Spatial"]
 
 [node name="CSGCombiner" type="CSGCombiner" parent="."]
 use_collision = true
@@ -114,4 +114,3 @@ transform = Transform( 0.151595, 0, 0.988443, 0, 1, 0, -0.988443, 0, 0.151595, -
 
 [node name="door" parent="." instance=ExtResource( 4 )]
 transform = Transform( 0.00977782, 0, -0.999952, 0, 1, 0, 0.999952, 0, 0.00977782, 5.99869, -0.231766, -16.1618 )
-

testlevel/level2.tscn

@@ -30,7 +30,7 @@ glow_bloom = 0.04
 glow_blend_mode = 1
 glow_bicubic_upscale = true
 
-[node name="Spatial" type="Spatial"]
+[node name="TestLevel2" type="Spatial"]
 
 [node name="CSGCombiner" type="CSGCombiner" parent="."]
 use_collision = true
@@ -98,4 +98,3 @@ directional_shadow_max_distance = 50.0
 
 [node name="door" parent="." instance=ExtResource( 3 )]
 transform = Transform( 0.00977782, 0, -0.999952, 0, 1, 0, 0.999952, 0, 0.00977782, 5.99869, -0.231766, -16.1618 )
-