derekdz/fps_project_1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Godot 4.4 Upgrade

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

42
assets/mac_10.tscn
View File

@@ -1,6 +1,6 @@
[gd_scene load_steps=47 format=4 uid="uid://brl0bsqjl5dg3"]
[ext_resource type="Script" path="res://scripts/weapon_uberscript.gd" id="2_rdhyh"]
[ext_resource type="Script" uid="uid://dhr2xfj3qow4c" path="res://scripts/weapon_uberscript.gd" id="2_rdhyh"]
[ext_resource type="Resource" uid="uid://byimj60rup3an" path="res://assets/weaponresources/mac10_uberresource.tres" id="3_h7i0a"]
[ext_resource type="AudioStream" uid="uid://t50i483xmj3a" path="res://assets/Audio/Weapons/toy-click-spin-SBA-300071143.wav" id="5_rn7j1"]
[ext_resource type="AudioStream" uid="uid://db3iy0f1pa5lg" path="res://assets/Audio/Weapons/gun-m-16-reload-full-clip-magazine-SBA-300121257.wav" id="6_3atx1"]
@@ -8,7 +8,7 @@
[ext_resource type="AudioStream" uid="uid://32yw7q0c0h03" path="res://assets/Audio/Weapons/9mm Full Size Pistol/Gunshots/9mm Full Size Pistol - Gunshot A 001.wav" id="8_joo44"]
[ext_resource type="Texture2D" uid="uid://cws4rxue4glq0" path="res://assets/Models/SubstancePainterTest/mac10_mac10_BaseColor.png" id="9_4ewuh"]
[ext_resource type="Texture2D" uid="uid://cf2ierpxlyks5" path="res://assets/Models/SubstancePainterTest/mac10_mac10_Metallic.png" id="10_7lee1"]
[ext_resource type="Shader" path="res://assets/viewmodel_shader.gdshader" id="10_m7cwp"]
[ext_resource type="Shader" uid="uid://caxpqlxuwucd0" path="res://assets/viewmodel_shader.gdshader" id="10_m7cwp"]
[ext_resource type="Texture2D" uid="uid://dh16l44sy073b" path="res://assets/Models/SubstancePainterTest/mac10_mac10_Normal.png" id="11_2e5kr"]
[ext_resource type="Texture2D" uid="uid://dlewa3pu5b0wd" path="res://assets/Models/SubstancePainterTest/mac10_mac10_Roughness.png" id="12_ja231"]
[ext_resource type="Texture2D" uid="uid://bkpxs8j5t5t2i" path="res://assets/Models/mac10.albedo2.png" id="16_u3fyo"]
@@ -23,18 +23,18 @@ render_priority = 0
shader = ExtResource("10_m7cwp")
shader_parameter/viewmodel_fov = 90.0
shader_parameter/albedo = Color(1, 1, 1, 1)
shader_parameter/texture_albedo = ExtResource("9_4ewuh")
shader_parameter/specular = 1.0
shader_parameter/metallic = 1.0
shader_parameter/roughness = 1.0
shader_parameter/texture_metallic = ExtResource("10_7lee1")
shader_parameter/metallic_texture_channel = Vector4(1, 0, 0, 0)
shader_parameter/texture_roughness = ExtResource("12_ja231")
shader_parameter/roughness_texture_channel = Vector4(1, 0, 0, 0)
shader_parameter/texture_normal = ExtResource("11_2e5kr")
shader_parameter/normal_scale = 0.3
shader_parameter/uv1_scale = Vector3(1, 1, 1)
shader_parameter/uv1_offset = Vector3(0, 0, 0)
shader_parameter/texture_albedo = ExtResource("9_4ewuh")
shader_parameter/texture_metallic = ExtResource("10_7lee1")
shader_parameter/texture_roughness = ExtResource("12_ja231")
shader_parameter/texture_normal = ExtResource("11_2e5kr")
[sub_resource type="ShaderMaterial" id="ShaderMaterial_2u20w"]
resource_name = "screws"
@@ -115,18 +115,18 @@ render_priority = 0
shader = ExtResource("10_m7cwp")
shader_parameter/viewmodel_fov = 90.0
shader_parameter/albedo = Color(1, 1, 1, 1)
shader_parameter/texture_albedo = ExtResource("16_u3fyo")
shader_parameter/specular = 0.5
shader_parameter/metallic = 1.0
shader_parameter/roughness = 1.0
shader_parameter/texture_metallic = ExtResource("17_yhh5u")
shader_parameter/metallic_texture_channel = Vector4(1, 0, 0, 0)
shader_parameter/texture_roughness = ExtResource("17_yhh5u")
shader_parameter/roughness_texture_channel = Vector4(1, 0, 0, 0)
shader_parameter/texture_normal = ExtResource("18_kr5hy")
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("16_u3fyo")
shader_parameter/texture_metallic = ExtResource("17_yhh5u")
shader_parameter/texture_roughness = ExtResource("17_yhh5u")
shader_parameter/texture_normal = ExtResource("18_kr5hy")
[sub_resource type="ArrayMesh" id="ArrayMesh_th0jv"]
_surfaces = [{
@@ -255,17 +255,17 @@ render_priority = 0
shader = ExtResource("10_m7cwp")
shader_parameter/viewmodel_fov = 90.0
shader_parameter/albedo = Color(1, 1, 1, 1)
shader_parameter/texture_albedo = ExtResource("19_250un")
shader_parameter/specular = 0.5
shader_parameter/metallic = 0.545455
shader_parameter/roughness = 1.0
shader_parameter/texture_metallic = ExtResource("20_qs0y6")
shader_parameter/metallic_texture_channel = Vector4(1, 0, 0, 0)
shader_parameter/texture_roughness = ExtResource("20_qs0y6")
shader_parameter/roughness_texture_channel = Vector4(1, 0, 0, 0)
shader_parameter/normal_scale = 0.5
shader_parameter/uv1_scale = Vector3(1, 1, 1)
shader_parameter/uv1_offset = Vector3(0, 0, 0)
shader_parameter/texture_albedo = ExtResource("19_250un")
shader_parameter/texture_metallic = ExtResource("20_qs0y6")
shader_parameter/texture_roughness = ExtResource("20_qs0y6")
[sub_resource type="ArrayMesh" id="ArrayMesh_c0y67"]
_surfaces = [{
@@ -719,14 +719,14 @@ tracks/2/keys = {
[sub_resource type="AnimationLibrary" id="AnimationLibrary_vkrtt"]
_data = {
"RESET": SubResource("Animation_bdeey"),
"empty": SubResource("Animation_u008m"),
"inspect": SubResource("Animation_cifop"),
"reload": SubResource("Animation_svhrs"),
"shoot": SubResource("Animation_bsc1a"),
"sprint": SubResource("Animation_tikvk"),
"swap_in": SubResource("Animation_0sp0s"),
"swap_out": SubResource("Animation_i5303")
&"RESET": SubResource("Animation_bdeey"),
&"empty": SubResource("Animation_u008m"),
&"inspect": SubResource("Animation_cifop"),
&"reload": SubResource("Animation_svhrs"),
&"shoot": SubResource("Animation_bsc1a"),
&"sprint": SubResource("Animation_tikvk"),
&"swap_in": SubResource("Animation_0sp0s"),
&"swap_out": SubResource("Animation_i5303")
}
[node name="mac10" type="Node3D" node_paths=PackedStringArray("anim_player", "barrel_ray", "casing_ejector", "mag_ejector", "audio_fire", "audio_empty", "audio_reload")]