Update to 4.4.1

This commit is contained in:
Ethan Weber 2025-07-12 12:32:02 -06:00
parent 4ae45deca1
commit ceb10e9a06
160 changed files with 491 additions and 71 deletions

View file

@ -0,0 +1 @@
uid://dajdn0jgdwgkh

View file

@ -1,6 +1,6 @@
[gd_scene load_steps=20 format=3 uid="uid://c0mo8tek77du4"]
[ext_resource type="Script" path="res://player/model/character_skin.gd" id="2_cp6td"]
[ext_resource type="Script" uid="uid://dajdn0jgdwgkh" path="res://player/model/character_skin.gd" id="2_cp6td"]
[ext_resource type="PackedScene" uid="uid://db7wkegkjmixy" path="res://player/model/gdbot.glb" id="2_v8h3f"]
[ext_resource type="Material" uid="uid://dh42cdejchkr3" path="res://player/model/materials/face_mat.tres" id="3_fvn82"]
[ext_resource type="AnimationNodeBlendTree" uid="uid://ctycm6blx4sw4" path="res://player/model/character_blend_tree.tres" id="3_hscum"]
@ -2595,19 +2595,19 @@ tracks/51/keys = {
[sub_resource type="AnimationLibrary" id="AnimationLibrary_c1lpt"]
_data = {
"Idle": SubResource("Animation_kkfn2"),
"fall": SubResource("Animation_euk6e"),
"ground_impact": SubResource("Animation_1u2px"),
"jump": SubResource("Animation_83u3k"),
"run": SubResource("Animation_8540a"),
"simple_punch": SubResource("Animation_73jd5"),
"walk": SubResource("Animation_mcme0")
&"Idle": SubResource("Animation_kkfn2"),
&"fall": SubResource("Animation_euk6e"),
&"ground_impact": SubResource("Animation_1u2px"),
&"jump": SubResource("Animation_83u3k"),
&"run": SubResource("Animation_8540a"),
&"simple_punch": SubResource("Animation_73jd5"),
&"walk": SubResource("Animation_mcme0")
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_8q8s6"]
_data = {
"default_heartbeat": ExtResource("3_xjurk"),
"simple_blink": ExtResource("4_5i6m7")
&"default_heartbeat": ExtResource("3_xjurk"),
&"simple_blink": ExtResource("4_5i6m7")
}
[node name="CharacterSkin" type="Node3D" node_paths=PackedStringArray("main_animation_player")]

View file

@ -17,6 +17,8 @@ nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
nodes/use_node_type_suffixes=true
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
@ -28,6 +30,7 @@ animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
_subresources={
"animations": {

View file

@ -0,0 +1 @@
uid://cn2hf5o4glv8b

View file

@ -1,15 +1,15 @@
[gd_resource type="ShaderMaterial" load_steps=3 format=3 uid="uid://dh42cdejchkr3"]
[ext_resource type="Shader" path="res://player/model/materials/face_mat.gdshader" id="1_u8nh3"]
[ext_resource type="Texture2D" uid="uid://ci7cn145ld3l5" path="res://player/model/faces/closed.png" id="2_r4pvf"]
[ext_resource type="Shader" uid="uid://cn2hf5o4glv8b" path="res://player/model/materials/face_mat.gdshader" id="1_u8nh3"]
[ext_resource type="Texture2D" uid="uid://dbag7f8i27ub1" path="res://player/model/faces/open.png" id="2_mx10w"]
[resource]
render_priority = 0
shader = ExtResource("1_u8nh3")
shader_parameter/face_texture = ExtResource("2_mx10w")
shader_parameter/intensity = 4.0
shader_parameter/screen_color = Color(0.0784314, 0.556863, 1, 0.00784314)
shader_parameter/screen_red_offset = Vector2(0, 0)
shader_parameter/screen_green_offset = Vector2(0, 0)
shader_parameter/screen_blue_offset = Vector2(0, 0)
shader_parameter/pixel_size = 44.0
shader_parameter/face_texture = ExtResource("2_r4pvf")

View file

@ -4,4 +4,4 @@
albedo_color = Color(0, 0, 0, 1)
emission_enabled = true
emission = Color(0, 1, 0.392157, 1)
emission_energy_multiplier = 0.831129
emission_energy_multiplier = 2.38987