Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert to Godot 4.1, remove binary data from scene files, prevent spurious diffs, and fix load warnings #30

Merged
merged 8 commits into from
Aug 19, 2023
Merged

Convert to Godot 4.1, remove binary data from scene files, prevent spurious diffs, and fix load warnings #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5126d81
Convert to Godot 4.1, breaks compat with Godot 4.0
akien-mga Aug 17, 2023
461fdc1
Remove binary data from grenade.tscn
akien-mga Aug 17, 2023
02a213c
Redo DestroyedBox.tscn by properly inheriting the .glb, removes binar…
akien-mga Aug 17, 2023
4a0d473
Remove binary data from environment.tscn by properly importing meshes…
akien-mga Aug 17, 2023
53e69a9
Remove binary data from Main.tscn by properly importing meshes with p…
akien-mga Aug 17, 2023
9445211
Remove unnecessary `@tool` keyword, deactivate AnimationTree in editor
akien-mga Aug 17, 2023
ad8d0e0
Fix missing `ext_resource` UIDs by resaving all scenes in Godot 4.1.1
akien-mga Aug 17, 2023
dd9decd
stabilize crates
NathanLovato Aug 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions Box/Box.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
[gd_scene load_steps=5 format=3 uid="uid://cmwyiep10m4u4"]
[gd_scene load_steps=6 format=3 uid="uid://cmwyiep10m4u4"]

[ext_resource type="Script" path="res://Box/Box.gd" id="1_oklwc"]
[ext_resource type="PackedScene" uid="uid://cdtq6fyl7hhgm" path="res://Box/BoxVisuals/BoxModel.glb" id="2_ggurh"]
[ext_resource type="PackedScene" uid="uid://cqekaooy1ktfl" path="res://Box/BoxVisuals/BoxModel.glb" id="2_ggurh"]
[ext_resource type="AudioStream" uid="uid://dd7nemvkapogt" path="res://Box/Sounds/crate-break-1-93926.wav" id="3_71fsr"]

[sub_resource type="BoxShape3D" id="BoxShape3D_rxelo"]
[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_sjlkk"]
rough = true

[sub_resource type="BoxShape3D" id="BoxShape3D_vcweg"]

[node name="Box" type="RigidBody3D" groups=["damageables", "targeteables"]]
can_sleep = false
physics_material_override = SubResource("PhysicsMaterial_sjlkk")
lock_rotation = true
script = ExtResource("1_oklwc")

[node name="CollisionShape3d" type="CollisionShape3D" parent="."]
shape = SubResource("BoxShape3D_rxelo")
shape = SubResource("BoxShape3D_vcweg")

[node name="CrateVisual" parent="." instance=ExtResource("2_ggurh")]

Expand Down
35 changes: 34 additions & 1 deletion Box/BoxVisuals/DestroyedBox.glb.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,38 @@ animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
_subresources={
"nodes": {
"PATH:crate_001": {
"generate/physics": true,
"physics/body_type": 1,
"physics/shape_type": 1
},
"PATH:crate_002": {
"generate/physics": true,
"physics/body_type": 1,
"physics/shape_type": 1
},
"PATH:crate_003": {
"generate/physics": true,
"physics/body_type": 1,
"physics/shape_type": 1
},
"PATH:crate_004": {
"generate/physics": true,
"physics/body_type": 1,
"physics/shape_type": 1
},
"PATH:crate_005": {
"generate/physics": true,
"physics/body_type": 1,
"physics/shape_type": 1
},
"PATH:crate_006": {
"generate/physics": true,
"physics/body_type": 1,
"physics/shape_type": 1
}
}
}
gltf/embedded_image_handling=3
2 changes: 1 addition & 1 deletion Box/DestroyedBox.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
extends RigidBody3D
extends Node3D

const FLYING_PIECES := 3
const THROW_STRENGTH := 500
Expand Down
323 changes: 11 additions & 312 deletions Box/DestroyedBox.tscn
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Enemies/BeeBot.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[gd_scene load_steps=16 format=3 uid="uid://rn45gytkk6tv"]

[ext_resource type="Script" path="res://Enemies/BeeBot.gd" id="1_eehkx"]
[ext_resource type="PackedScene" uid="uid://d28tem7s0fqin" path="res://Enemies/BeeBot/bee_root.tscn" id="2_btoc7"]
[ext_resource type="PackedScene" uid="uid://4nwp6xgihjc7" path="res://Enemies/BeeBot/bee_root.tscn" id="2_btoc7"]
[ext_resource type="AudioStream" uid="uid://c66nnoqtanfw2" path="res://Enemies/Sounds/robot_defeat.wav" id="3_1gs12"]

[sub_resource type="Animation" id="Animation_5pcps"]
Expand Down
1 change: 1 addition & 0 deletions Enemies/BeeBot/bee_root.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ extends Node3D
@onready var state_machine: AnimationNodeStateMachinePlayback = $AnimationTree["parameters/StateMachine/playback"]

func _ready():
$AnimationTree.active = true
play_idle()

func play_idle():
Expand Down
74 changes: 38 additions & 36 deletions Enemies/BeeBot/bee_root.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=34 format=3 uid="uid://4nwp6xgihjc7"]
[gd_scene load_steps=33 format=3 uid="uid://4nwp6xgihjc7"]

[ext_resource type="Script" path="res://Enemies/BeeBot/bee_root.gd" id="1_eu6t5"]
[ext_resource type="PackedScene" uid="uid://f0vfmhexafmx" path="res://Enemies/BeeBot/bee_bot.glb" id="1_icaj7"]
Expand Down Expand Up @@ -1361,47 +1361,51 @@ nodes/StateMachine/position = Vector2(200, 80)
nodes/output/position = Vector2(400, 80)
node_connections = [&"output", 0, &"StateMachine"]

[sub_resource type="AnimationNodeStateMachinePlayback" id="AnimationNodeStateMachinePlayback_oe0gs"]

[node name="bee_root" type="Node3D"]
script = ExtResource("1_eu6t5")

[node name="bee_bot" parent="." instance=ExtResource("1_icaj7")]

[node name="Skeleton3D" parent="bee_bot/Armature" index="0"]
bones/1/position = Vector3(-3.34694e-10, 0.231858, 0.169885)
bones/2/rotation = Quaternion(2.3909e-08, 0.852809, 0.522224, 3.72774e-08)
bones/3/rotation = Quaternion(0.374547, 4.07077e-08, -1.74392e-08, 0.927208)
bones/5/rotation = Quaternion(0.750098, 1.02458e-13, 9.03326e-14, 0.661327)
bones/6/rotation = Quaternion(0.485844, 4.87665e-08, 4.86565e-08, 0.874045)
bones/8/rotation = Quaternion(0.750098, 1.02458e-13, 9.03326e-14, 0.661327)
bones/4/rotation = Quaternion(-0.474436, 0.154473, -0.13916, 0.855385)
bones/5/rotation = Quaternion(0.80971, -7.25163e-09, 9.51585e-09, 0.58683)
bones/6/rotation = Quaternion(0.485844, 4.87666e-08, 4.86565e-08, 0.874045)
bones/7/rotation = Quaternion(-0.474436, -0.154473, 0.13916, 0.855385)
bones/8/rotation = Quaternion(0.80971, 7.25173e-09, -9.51573e-09, 0.58683)
bones/9/rotation = Quaternion(0.485844, -4.87664e-08, -4.86564e-08, 0.874045)
bones/10/rotation = Quaternion(-0.826842, 2.78253e-08, 3.74132e-08, 0.562435)
bones/11/rotation = Quaternion(-0.0478532, -2.18719e-10, -7.09773e-09, 0.998854)
bones/12/rotation = Quaternion(0.62955, 0.572958, 0.414391, -0.321974)
bones/13/rotation = Quaternion(0.00204147, 2.01131e-07, -1.64139e-08, 0.999998)
bones/14/rotation = Quaternion(0.0745919, -2.42969e-07, 1.0562e-08, 0.997214)
bones/15/rotation = Quaternion(0.0745919, -2.42969e-07, 1.0562e-08, 0.997214)
bones/16/rotation = Quaternion(0.63253, 0.569062, 0.419725, -0.316079)
bones/17/rotation = Quaternion(0.0233004, 0.0119179, 0.000278118, 0.999657)
bones/18/rotation = Quaternion(0.0626944, -0.0118978, 0.000747142, 0.997962)
bones/19/rotation = Quaternion(0.0626944, -0.0118978, 0.000747138, 0.997962)
bones/20/rotation = Quaternion(0.641721, 0.571721, 0.412266, -0.302268)
bones/21/rotation = Quaternion(0.0365516, 0.0361402, 5.92996e-05, 0.998678)
bones/22/rotation = Quaternion(0.0557267, -0.0188655, 0.0010531, 0.998267)
bones/23/rotation = Quaternion(0.0557267, -0.0188655, 0.0010531, 0.998267)
bones/24/rotation = Quaternion(0.894672, -8.07353e-08, -7.60767e-08, -0.446723)
bones/26/rotation = Quaternion(0.62955, -0.572958, -0.414391, -0.321974)
bones/27/rotation = Quaternion(0.00204146, -1.56447e-07, 7.00948e-09, 0.999998)
bones/28/rotation = Quaternion(0.0745919, 2.42969e-07, -1.0562e-08, 0.997214)
bones/29/rotation = Quaternion(0.0745919, 2.42969e-07, -1.0562e-08, 0.997214)
bones/30/rotation = Quaternion(0.63253, -0.569062, -0.419725, -0.316079)
bones/31/rotation = Quaternion(0.0233004, -0.0119179, -0.000278118, 0.999657)
bones/32/rotation = Quaternion(0.0626944, 0.0118978, -0.000747142, 0.997962)
bones/33/rotation = Quaternion(0.0626944, 0.0118978, -0.000747137, 0.997962)
bones/34/rotation = Quaternion(0.641721, -0.571721, -0.412266, -0.302268)
bones/35/rotation = Quaternion(0.0365516, -0.0361402, -5.92814e-05, 0.998678)
bones/36/rotation = Quaternion(0.0557267, 0.0188655, -0.00105309, 0.998267)
bones/37/rotation = Quaternion(0.0557267, 0.0188655, -0.0010531, 0.998267)
bones/38/rotation = Quaternion(0.894672, 4.04933e-08, -1.84153e-09, -0.446723)
bones/10/rotation = Quaternion(-0.999547, 3.36553e-09, 4.65045e-08, 0.0300911)
bones/11/rotation = Quaternion(-0.14132, 4.47907e-10, -7.08696e-09, 0.989964)
bones/12/rotation = Quaternion(-0.465373, -0.488461, -0.738123, 0.00285091)
bones/13/rotation = Quaternion(-0.480394, 1.66609e-07, 6.76836e-08, 0.877053)
bones/14/rotation = Quaternion(0.285637, -0.0185918, -0.129195, 0.949407)
bones/15/rotation = Quaternion(0.285637, 0.0185914, 0.129195, 0.949407)
bones/16/rotation = Quaternion(-0.00901972, 0.641118, 0.766993, 0.0246584)
bones/17/rotation = Quaternion(-0.554293, 0.00960304, 0.00706364, 0.832236)
bones/18/rotation = Quaternion(0.191757, -0.0204129, -0.127952, 0.972852)
bones/19/rotation = Quaternion(0.188652, -0.0027866, 0.132486, 0.973062)
bones/20/rotation = Quaternion(-0.777935, -0.394029, -0.417762, 0.255016)
bones/21/rotation = Quaternion(-0.408922, 0.0323869, 0.0160376, 0.911853)
bones/22/rotation = Quaternion(0.352159, -0.0496994, -0.119865, 0.926902)
bones/23/rotation = Quaternion(0.347378, 0.0146428, 0.133085, 0.928118)
bones/24/rotation = Quaternion(-0.361782, -0.0456319, -0.753329, 0.547291)
bones/25/rotation = Quaternion(3.93465e-08, -2.4489e-09, 0.0261977, 0.999657)
bones/26/rotation = Quaternion(-0.465142, 0.507448, 0.725201, 0.0149241)
bones/27/rotation = Quaternion(-0.399628, -1.25243e-07, -6.04819e-08, 0.916678)
bones/28/rotation = Quaternion(0.285637, 0.0185918, 0.129195, 0.949407)
bones/29/rotation = Quaternion(0.285637, -0.0185914, -0.129195, 0.949407)
bones/30/rotation = Quaternion(-0.00901979, -0.641118, -0.766993, 0.0246584)
bones/31/rotation = Quaternion(-0.47965, -0.0101822, -0.00619982, 0.877379)
bones/32/rotation = Quaternion(0.357778, 0.0423214, 0.122463, 0.924774)
bones/33/rotation = Quaternion(0.354757, -0.0202617, -0.130958, 0.92552)
bones/34/rotation = Quaternion(-0.777935, 0.394029, 0.417762, 0.255016)
bones/35/rotation = Quaternion(-0.408922, -0.0323869, -0.0160376, 0.911853)
bones/36/rotation = Quaternion(0.185854, 0.0281299, 0.126675, 0.973972)
bones/37/rotation = Quaternion(0.180935, 0.00868968, -0.133606, 0.974339)
bones/38/rotation = Quaternion(-0.361782, 0.0456318, 0.753329, 0.547291)
bones/39/rotation = Quaternion(2.79963e-09, -2.05163e-09, -0.0252876, 0.99968)

[node name="bee_bot2" parent="bee_bot/Armature/Skeleton3D" index="0"]
surface_material_override/1 = SubResource("StandardMaterial3D_pylk6")
Expand All @@ -1417,8 +1421,6 @@ libraries = {
[node name="AnimationTree" type="AnimationTree" parent="."]
tree_root = SubResource("AnimationNodeBlendTree_ifc16")
anim_player = NodePath("../bee_bot/AnimationPlayer")
active = true
parameters/StateMachine/playback = SubResource("AnimationNodeStateMachinePlayback_oe0gs")
parameters/StateMachine/power_off/Add2/add_amount = 1.0
parameters/StateMachine/spit_attack/Blend2/blend_amount = 1.0

Expand Down
4 changes: 2 additions & 2 deletions Enemies/Beetle.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[gd_scene load_steps=11 format=3 uid="uid://oxyn25v5khuk"]

[ext_resource type="Script" path="res://Enemies/Beetle.gd" id="1_mefon"]
[ext_resource type="PackedScene" path="res://Enemies/beetle_bot/beetlebot_skin.tscn" id="2_1wpkj"]
[ext_resource type="PackedScene" uid="uid://cxt8d0d4ift6" path="res://Enemies/beetle_bot/beetlebot_skin.tscn" id="2_1wpkj"]
[ext_resource type="AudioStream" uid="uid://c66nnoqtanfw2" path="res://Enemies/Sounds/robot_defeat.wav" id="3_w5eam"]

[sub_resource type="Animation" id="Animation_5pcps"]
Expand Down Expand Up @@ -144,7 +144,7 @@ disabled = true

[node name="NavigationAgent3D" type="NavigationAgent3D" parent="."]
target_desired_distance = 0.1
agent_height_offset = 1.0
path_height_offset = 1.0

[node name="DefeatSound" type="AudioStreamPlayer3D" parent="."]
stream = ExtResource("3_w5eam")
Expand Down
1 change: 1 addition & 0 deletions Enemies/beetle_bot/beetlebot_skin.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ extends Node3D
@onready var _secondary_action_timer : Timer = $SecondaryActionTimer

func _ready():
_animation_tree.active = true
for animation_name in _force_loop:
var anim : Animation = $beetle_bot/AnimationPlayer.get_animation(animation_name)
anim.loop_mode = Animation.LOOP_LINEAR
Expand Down
76 changes: 35 additions & 41 deletions Enemies/beetle_bot/beetlebot_skin.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=42 format=3]
[gd_scene load_steps=41 format=3 uid="uid://cxt8d0d4ift6"]

[ext_resource type="Script" path="res://Enemies/beetle_bot/beetlebot_skin.gd" id="1_1smde"]
[ext_resource type="PackedScene" uid="uid://dbqoj8oam1dsg" path="res://Enemies/beetle_bot/beetle_bot_fused.glb" id="1_r7amh"]
Expand Down Expand Up @@ -2140,72 +2140,68 @@ transitions = ["Start", "Idle", SubResource("AnimationNodeStateMachineTransition
graph_offset = Vector2(-130, -175)

[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_eteu8"]
graph_offset = Vector2(-407.383, 19.9611)
nodes/StateMachine/node = SubResource("AnimationNodeStateMachine_mavgj")
nodes/StateMachine/position = Vector2(60, 140)
node_connections = [&"output", 0, &"StateMachine"]

[sub_resource type="AnimationNodeStateMachinePlayback" id="AnimationNodeStateMachinePlayback_qj0j4"]

[node name="BeetlebotSkin" type="Node3D"]
script = ExtResource("1_1smde")
_force_loop = PackedStringArray("Bob", "walk")

[node name="beetle_bot" parent="." instance=ExtResource("1_r7amh")]

[node name="Skeleton3D" parent="beetle_bot/Armature" index="0"]
bones/1/position = Vector3(-0.56787, 0.177317, 0.00443449)
bones/1/position = Vector3(-0.4584, 0.1718, 0.00443449)
bones/1/rotation = Quaternion(0, 0, 0.689081, 0.724685)
bones/2/position = Vector3(-0.0032875, -0.0180639, -0.00289629)
bones/2/rotation = Quaternion(-0.707107, 0, 0, 0.707107)
bones/2/position = Vector3(1.92784e-06, 1.4035e-05, -6.77304e-06)
bones/2/rotation = Quaternion(-0.707107, 1.05367e-08, -1.05367e-08, 0.707107)
bones/3/rotation = Quaternion(0.560986, 0.560986, 0.430459, 0.430459)
bones/4/rotation = Quaternion(0.430459, 0.430459, 0.560986, 0.560986)
bones/6/position = Vector3(-0.341455, -0.46553, 0.00443449)
bones/6/position = Vector3(-0.2685, -0.383726, 0.00443449)
bones/6/rotation = Quaternion(0, 0, 0.934429, 0.356148)
bones/7/position = Vector3(9.53674e-07, 9.46224e-06, -1.09896e-05)
bones/7/rotation = Quaternion(-0.707107, 0, 0, 0.707107)
bones/7/position = Vector3(5.54323e-06, 3.11732e-05, -2.6606e-05)
bones/7/rotation = Quaternion(-0.707107, -3.74339e-23, -6.28037e-16, 0.707107)
bones/8/rotation = Quaternion(0.560986, 0.560986, 0.430459, 0.430459)
bones/9/rotation = Quaternion(0.430459, 0.430459, 0.560986, 0.560986)
bones/11/position = Vector3(-0.34543, 0.4905, 0.00443466)
bones/11/rotation = Quaternion(9.96793e-09, -2.4383e-08, 0.386951, 0.9221)
bones/12/position = Vector3(-2.07338e-06, 1.90794e-05, -2.03374e-06)
bones/12/rotation = Quaternion(-0.707107, 3.013e-07, -2.34345e-07, 0.707107)
bones/12/position = Vector3(-4.30854e-06, 3.20733e-05, -1.70988e-05)
bones/12/rotation = Quaternion(-0.707107, 3.44213e-07, -2.54651e-07, 0.707107)
bones/13/rotation = Quaternion(0.560985, 0.560986, 0.430459, 0.430459)
bones/14/rotation = Quaternion(0.430459, 0.430459, 0.560986, 0.560985)
bones/16/position = Vector3(0.032, -0.0663337, 0.16)
bones/16/rotation = Quaternion(0, 0, 4.03807e-17, 1)
bones/17/rotation = Quaternion(0.0416477, 0.0754527, 0.620896, 0.779141)
bones/18/rotation = Quaternion(-0.00224686, -0.0160954, -7.29905e-05, 0.999868)
bones/19/rotation = Quaternion(0.156166, 0.382646, 0.799077, 0.436658)
bones/20/rotation = Quaternion(-0.586313, -0.0139527, -0.0190566, 0.80974)
bones/21/position = Vector3(-0.0227838, 0.286506, -0.174586)
bones/21/rotation = Quaternion(0.280546, 0.114268, 0.440523, 0.845089)
bones/22/rotation = Quaternion(-0.542679, -0.014165, -0.0175538, 0.839637)
bones/24/rotation = Quaternion(0.20071, -0.201625, -0.588757, 0.75659)
bones/25/rotation = Quaternion(-0.383542, 0.0148631, 0.0124597, 0.92332)
bones/26/rotation = Quaternion(0.190199, -0.455262, -0.78442, 0.375827)
bones/27/rotation = Quaternion(-0.702173, 0.0122605, 0.0228224, 0.711535)
bones/28/position = Vector3(0.0227838, 0.286506, -0.174586)
bones/28/rotation = Quaternion(0.136619, -0.0563563, -0.392018, 0.908009)
bones/29/rotation = Quaternion(-0.257371, 0.0162991, 0.00832513, 0.966139)
bones/30/position = Vector3(0.56787, 0.177317, 0.00443449)
bones/16/position = Vector3(-0.000908208, -0.02, 0.355193)
bones/17/rotation = Quaternion(0.150477, 0.162574, 0.623931, 0.749424)
bones/18/rotation = Quaternion(-0.63206, -0.0124683, -0.020533, 0.774547)
bones/19/rotation = Quaternion(0.0904182, 0.274054, 0.854507, 0.431899)
bones/20/rotation = Quaternion(-0.784901, -0.0106661, -0.0255112, 0.619004)
bones/21/position = Vector3(-0.0239784, 0.285311, -0.245566)
bones/21/rotation = Quaternion(0.205085, 0.0747264, 0.478651, 0.850441)
bones/22/rotation = Quaternion(-0.645844, -0.0128734, -0.0208909, 0.763075)
bones/24/rotation = Quaternion(0.149023, -0.161278, -0.624557, 0.749473)
bones/25/rotation = Quaternion(-0.628241, 0.0125182, 0.0204089, 0.77765)
bones/26/rotation = Quaternion(0.0899026, -0.273359, -0.853764, 0.433911)
bones/27/rotation = Quaternion(-0.782821, 0.0107114, 0.0254436, 0.621634)
bones/28/position = Vector3(0.0239784, 0.285311, -0.245566)
bones/28/rotation = Quaternion(0.197596, -0.0721769, -0.46983, 0.857325)
bones/29/rotation = Quaternion(-0.630188, 0.0130925, 0.0203845, 0.776065)
bones/30/position = Vector3(0.4584, 0.1718, 0.00443449)
bones/30/rotation = Quaternion(0, 0, -0.689081, 0.724685)
bones/31/position = Vector3(-2.76417e-06, 2.2891e-05, -8.7996e-06)
bones/31/rotation = Quaternion(-0.707107, 0, 0, 0.707107)
bones/31/position = Vector3(-1.63913e-06, 1.20485e-05, -5.83427e-06)
bones/31/rotation = Quaternion(-0.707107, -1.05367e-08, 1.05367e-08, 0.707107)
bones/32/rotation = Quaternion(0.560986, -0.560986, -0.430459, 0.430459)
bones/33/rotation = Quaternion(0.430459, -0.430459, -0.560986, 0.560986)
bones/35/position = Vector3(0.341455, -0.46553, 0.00443449)
bones/35/position = Vector3(0.2685, -0.383726, 0.00443449)
bones/35/rotation = Quaternion(0, 0, -0.934429, 0.356148)
bones/36/position = Vector3(-9.89437e-06, 3.99202e-05, -2.84091e-05)
bones/36/rotation = Quaternion(-0.707107, 0, 0, 0.707107)
bones/36/position = Vector3(-5.46873e-06, 3.0145e-05, -2.54139e-05)
bones/36/rotation = Quaternion(-0.707107, 3.74339e-23, 6.28037e-16, 0.707107)
bones/37/rotation = Quaternion(0.560986, -0.560986, -0.430459, 0.430459)
bones/38/rotation = Quaternion(0.430459, -0.430459, -0.560986, 0.560986)
bones/40/position = Vector3(0.42365, 0.577037, 0.00443466)
bones/40/position = Vector3(0.345431, 0.500251, 0.00443466)
bones/40/rotation = Quaternion(9.96793e-09, 2.4383e-08, -0.386951, 0.9221)
bones/41/position = Vector3(2.12215e-09, 9.08076e-06, -1.74787e-07)
bones/41/rotation = Quaternion(-0.707107, -3.013e-07, 2.34345e-07, 0.707107)
bones/42/rotation = Quaternion(-0.560985, 0.560986, 0.430459, -0.430459)
bones/43/rotation = Quaternion(-0.430459, 0.430459, 0.560986, -0.560985)
bones/41/position = Vector3(3.27291e-06, 2.70814e-05, -1.34628e-05)
bones/41/rotation = Quaternion(-0.707107, -3.44213e-07, 2.54651e-07, 0.707107)
bones/42/rotation = Quaternion(0.560985, -0.560986, -0.430459, 0.430459)
bones/43/rotation = Quaternion(0.430459, -0.430459, -0.560986, 0.560985)

[node name="Beetle" parent="beetle_bot/Armature/Skeleton3D" index="0"]
surface_material_override/1 = SubResource("ShaderMaterial_awqgi")
Expand All @@ -2220,8 +2216,6 @@ libraries = {
[node name="AnimationTree" type="AnimationTree" parent="."]
tree_root = SubResource("AnimationNodeBlendTree_eteu8")
anim_player = NodePath("../beetle_bot/AnimationPlayer")
active = true
parameters/StateMachine/playback = SubResource("AnimationNodeStateMachinePlayback_qj0j4")
parameters/StateMachine/PowerOff/Add2/add_amount = 1.0

[node name="SecondaryActionTimer" type="Timer" parent="."]
Expand Down
3 changes: 0 additions & 3 deletions Enemies/smoke_puff/smoke_ball.tres
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions Enemies/smoke_puff/smoke_puff.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ noise = SubResource("FastNoiseLite_sxisx")
resource_local_to_scene = true
render_priority = 10
shader = ExtResource("4_bh8q1")
shader_parameter/base_scale = 0.1
shader_parameter/deformation_scale = 1.0
shader_parameter/ease = 3.0
shader_parameter/progress = 1.0
shader_parameter/smoothness = 0.2
shader_parameter/ease = 3.0
shader_parameter/base_scale = 0.1
shader_parameter/deformation_scale = 1.0
shader_parameter/texture_offset = 0.0
shader_parameter/voronoi_sampler = SubResource("NoiseTexture2D_a2w6x")

Expand Down
6 changes: 3 additions & 3 deletions Environment/bushes/bush.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=9 format=3]
[gd_scene load_steps=9 format=3 uid="uid://cn8o7sv1osssk"]

[ext_resource type="ArrayMesh" uid="uid://dbvyvmrfv7b41" path="res://Environment/bushes/bush.obj" id="1_s7d1x"]
[ext_resource type="Shader" path="res://Environment/bushes/bush_wind.gdshader" id="2_p862b"]
Expand All @@ -16,10 +16,10 @@ noise = SubResource("FastNoiseLite_rfln0")
[sub_resource type="ShaderMaterial" id="ShaderMaterial_5ghrf"]
render_priority = 0
shader = ExtResource("2_p862b")
shader_parameter/wind_noise_sampler = SubResource("NoiseTexture2D_p2vx3")
shader_parameter/albedo_sampler = ExtResource("2_tqhpl")
shader_parameter/normal_sampler = ExtResource("3_w64c0")
shader_parameter/orm_sampler = ExtResource("4_ug63l")
shader_parameter/wind_noise_sampler = SubResource("NoiseTexture2D_p2vx3")
shader_parameter/normal_sampler = ExtResource("3_w64c0")

[node name="Bush1" type="MeshInstance3D"]
material_override = SubResource("ShaderMaterial_5ghrf")
Expand Down
Loading