Godot 4.4 Upgrade

This commit is contained in:
derek
2025-03-05 09:27:42 -06:00
parent 0da561f425
commit 9a7013a0a5
589 changed files with 1500 additions and 959 deletions

View File

@@ -1,11 +1,11 @@
[gd_scene load_steps=55 format=4 uid="uid://dqwkal3t4gf2p"]
[ext_resource type="Script" path="res://scripts/weapon_uberscript.gd" id="1_d2orx"]
[ext_resource type="Script" uid="uid://dhr2xfj3qow4c" path="res://scripts/weapon_uberscript.gd" id="1_d2orx"]
[ext_resource type="PackedScene" uid="uid://717hhehp83k8" path="res://assets/shotgun_pellet.tscn" id="2_6ms5m"]
[ext_resource type="Script" path="res://scripts/bullet_resource.gd" id="3_64qwm"]
[ext_resource type="Script" uid="uid://6s14vpfr5pio" path="res://scripts/bullet_resource.gd" id="3_64qwm"]
[ext_resource type="Texture2D" uid="uid://74id2drhfp2s" path="res://assets/Textures/ObjectTextures/Blunderbus.png" id="4_sf1mx"]
[ext_resource type="Script" path="res://scripts/weapon_resource.gd" id="5_yt5ea"]
[ext_resource type="Shader" path="res://assets/viewmodel_shader.gdshader" id="6_4f3qc"]
[ext_resource type="Script" uid="uid://d0cf6xsxkf0h" path="res://scripts/weapon_resource.gd" id="5_yt5ea"]
[ext_resource type="Shader" uid="uid://caxpqlxuwucd0" path="res://assets/viewmodel_shader.gdshader" id="6_4f3qc"]
[ext_resource type="Texture2D" uid="uid://cvbmjv42lox3f" path="res://assets/Models/SubstancePainterTest/blunderbus_model_blunderbus.stock_BaseColor.png" id="7_6no5y"]
[ext_resource type="Texture2D" uid="uid://nrje6j28qwq2" path="res://assets/Models/Quixel/blunderbus/blunderbus_blunderbus.stock_Metalness.png" id="8_kjvhf"]
[ext_resource type="Texture2D" uid="uid://dmha1jlmeshfv" path="res://assets/Models/SubstancePainterTest/blunderbus_model_blunderbus.stock_Normal.png" id="9_7tojq"]
@@ -53,18 +53,18 @@ render_priority = 0
shader = ExtResource("6_4f3qc")
shader_parameter/viewmodel_fov = 90.0
shader_parameter/albedo = Color(1, 1, 1, 1)
shader_parameter/texture_albedo = ExtResource("7_6no5y")
shader_parameter/specular = 0.5
shader_parameter/metallic = 0.0
shader_parameter/roughness = 1.0
shader_parameter/texture_metallic = ExtResource("8_kjvhf")
shader_parameter/metallic_texture_channel = Vector4(1, 0, 0, 0)
shader_parameter/texture_roughness = ExtResource("10_8xopx")
shader_parameter/roughness_texture_channel = Vector4(1, 0, 0, 0)
shader_parameter/texture_normal = ExtResource("9_7tojq")
shader_parameter/normal_scale = 1.0
shader_parameter/uv1_scale = Vector3(1, 1, 1)
shader_parameter/uv1_offset = Vector3(0, 0, 0)
shader_parameter/texture_albedo = ExtResource("7_6no5y")
shader_parameter/texture_metallic = ExtResource("8_kjvhf")
shader_parameter/texture_roughness = ExtResource("10_8xopx")
shader_parameter/texture_normal = ExtResource("9_7tojq")
[sub_resource type="ShaderMaterial" id="ShaderMaterial_fms28"]
resource_name = "blunderbus.metal"
@@ -72,17 +72,17 @@ render_priority = 0
shader = ExtResource("6_4f3qc")
shader_parameter/viewmodel_fov = 90.0
shader_parameter/albedo = Color(1, 1, 1, 1)
shader_parameter/texture_albedo = ExtResource("11_ksmus")
shader_parameter/specular = 0.5
shader_parameter/metallic = 0.9
shader_parameter/roughness = 1.0
shader_parameter/metallic_texture_channel = Vector4(1, 0, 0, 0)
shader_parameter/texture_roughness = ExtResource("13_qb0ve")
shader_parameter/roughness_texture_channel = Vector4(1, 0, 0, 0)
shader_parameter/texture_normal = ExtResource("12_afrx4")
shader_parameter/normal_scale = 1.0
shader_parameter/uv1_scale = Vector3(1, 1, 1)
shader_parameter/uv1_offset = Vector3(0, 0, 0)
shader_parameter/texture_albedo = ExtResource("11_ksmus")
shader_parameter/texture_roughness = ExtResource("13_qb0ve")
shader_parameter/texture_normal = ExtResource("12_afrx4")
[sub_resource type="ArrayMesh" id="ArrayMesh_l8jkd"]
_surfaces = [{
@@ -148,17 +148,17 @@ render_priority = 0
shader = ExtResource("6_4f3qc")
shader_parameter/viewmodel_fov = 90.0
shader_parameter/albedo = Color(1, 1, 1, 1)
shader_parameter/texture_albedo = ExtResource("11_ksmus")
shader_parameter/specular = 0.5
shader_parameter/metallic = 0.9
shader_parameter/roughness = 1.0
shader_parameter/metallic_texture_channel = Vector4(1, 0, 0, 0)
shader_parameter/texture_roughness = ExtResource("13_qb0ve")
shader_parameter/roughness_texture_channel = Vector4(1, 0, 0, 0)
shader_parameter/texture_normal = ExtResource("12_afrx4")
shader_parameter/normal_scale = 1.0
shader_parameter/uv1_scale = Vector3(1, 1, 1)
shader_parameter/uv1_offset = Vector3(0, 0, 0)
shader_parameter/texture_albedo = ExtResource("11_ksmus")
shader_parameter/texture_roughness = ExtResource("13_qb0ve")
shader_parameter/texture_normal = ExtResource("12_afrx4")
[sub_resource type="ShaderMaterial" id="ShaderMaterial_d7nbh"]
resource_name = "blunderbus.flint"
@@ -239,17 +239,17 @@ render_priority = 0
shader = ExtResource("6_4f3qc")
shader_parameter/viewmodel_fov = 90.0
shader_parameter/albedo = Color(1, 1, 1, 1)
shader_parameter/texture_albedo = ExtResource("11_ksmus")
shader_parameter/specular = 0.5
shader_parameter/metallic = 0.9
shader_parameter/roughness = 1.0
shader_parameter/metallic_texture_channel = Vector4(1, 0, 0, 0)
shader_parameter/texture_roughness = ExtResource("13_qb0ve")
shader_parameter/roughness_texture_channel = Vector4(1, 0, 0, 0)
shader_parameter/texture_normal = ExtResource("12_afrx4")
shader_parameter/normal_scale = 1.0
shader_parameter/uv1_scale = Vector3(1, 1, 1)
shader_parameter/uv1_offset = Vector3(0, 0, 0)
shader_parameter/texture_albedo = ExtResource("11_ksmus")
shader_parameter/texture_roughness = ExtResource("13_qb0ve")
shader_parameter/texture_normal = ExtResource("12_afrx4")
[sub_resource type="ArrayMesh" id="ArrayMesh_tnfi6"]
_surfaces = [{
@@ -291,17 +291,17 @@ render_priority = 0
shader = ExtResource("6_4f3qc")
shader_parameter/viewmodel_fov = 90.0
shader_parameter/albedo = Color(1, 1, 1, 1)
shader_parameter/texture_albedo = ExtResource("11_ksmus")
shader_parameter/specular = 0.5
shader_parameter/metallic = 0.9
shader_parameter/roughness = 1.0
shader_parameter/metallic_texture_channel = Vector4(1, 0, 0, 0)
shader_parameter/texture_roughness = ExtResource("13_qb0ve")
shader_parameter/roughness_texture_channel = Vector4(1, 0, 0, 0)
shader_parameter/texture_normal = ExtResource("12_afrx4")
shader_parameter/normal_scale = 1.0
shader_parameter/uv1_scale = Vector3(1, 1, 1)
shader_parameter/uv1_offset = Vector3(0, 0, 0)
shader_parameter/texture_albedo = ExtResource("11_ksmus")
shader_parameter/texture_roughness = ExtResource("13_qb0ve")
shader_parameter/texture_normal = ExtResource("12_afrx4")
[sub_resource type="ArrayMesh" id="ArrayMesh_3f3hx"]
_surfaces = [{
@@ -351,7 +351,7 @@ colors = PackedColorArray(1, 1, 1, 1, 1, 1, 1, 0)
gradient = SubResource("Gradient_0viso")
[sub_resource type="Curve" id="Curve_hewln"]
min_value = -1.0
_limits = [-1.0, 1.0, 0.0, 1.0]
_data = [Vector2(0, -1), 0.0, 2.8, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0]
point_count = 2
@@ -396,7 +396,7 @@ point_count = 2
curve = SubResource("Curve_rmltw")
[sub_resource type="Curve" id="Curve_6gtuk"]
min_value = -1.0
_limits = [-1.0, 1.0, 0.0, 1.0]
_data = [Vector2(0, -1), 0.0, 2.8, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0]
point_count = 2
@@ -718,12 +718,12 @@ tracks/2/keys = {
[sub_resource type="AnimationLibrary" id="AnimationLibrary_mcns2"]
_data = {
"RESET": SubResource("Animation_r6as6"),
"empty": SubResource("Animation_f2rv4"),
"reload": SubResource("Animation_qb0kb"),
"shoot": SubResource("Animation_k667n"),
"swap_in": SubResource("Animation_yakxm"),
"swap_out": SubResource("Animation_jrppn")
&"RESET": SubResource("Animation_r6as6"),
&"empty": SubResource("Animation_f2rv4"),
&"reload": SubResource("Animation_qb0kb"),
&"shoot": SubResource("Animation_k667n"),
&"swap_in": SubResource("Animation_yakxm"),
&"swap_out": SubResource("Animation_jrppn")
}
[node name="Blunderbus" type="Node3D" node_paths=PackedStringArray("anim_player", "barrel_ray", "audio_fire", "audio_empty", "audio_reload")]