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

32
assets/machete.tscn
View File

@@ -1,10 +1,10 @@
[gd_scene load_steps=26 format=4 uid="uid://bshuvj6xeaiiq"]
[ext_resource type="Script" path="res://scripts/weapon_uberscript.gd" id="1_3j502"]
[ext_resource type="Script" uid="uid://dhr2xfj3qow4c" path="res://scripts/weapon_uberscript.gd" id="1_3j502"]
[ext_resource type="Texture2D" uid="uid://dtjnn8f8165dg" path="res://assets/Models/SubstancePainterTest/machete.blade_BaseColor.png" id="1_n1eld"]
[ext_resource type="Texture2D" uid="uid://rglx87b6ctrf" path="res://assets/Models/SubstancePainterTest/machete.blade_Metallic.png" id="2_ktp8c"]
[ext_resource type="Resource" uid="uid://cn6axgvd75xt7" path="res://assets/weaponresources/machete.tres" id="2_vu874"]
[ext_resource type="Shader" path="res://assets/viewmodel_shader.gdshader" id="3_8w0n7"]
[ext_resource type="Shader" uid="uid://caxpqlxuwucd0" path="res://assets/viewmodel_shader.gdshader" id="3_8w0n7"]
[ext_resource type="Texture2D" uid="uid://mcronh7q6ba3" path="res://assets/Models/SubstancePainterTest/machete.blade_Normal.png" id="3_lthmb"]
[ext_resource type="Texture2D" uid="uid://b42jj71wsavpb" path="res://assets/Models/SubstancePainterTest/machete.blade_Roughness.png" id="4_nqv4m"]
[ext_resource type="Texture2D" uid="uid://8pa8yccol7ar" path="res://assets/Models/SubstancePainterTest/machete.grip_BaseColor.png" id="5_w7p1o"]
@@ -12,7 +12,7 @@
[ext_resource type="Texture2D" uid="uid://cjn2sbu0prtve" path="res://assets/Models/SubstancePainterTest/machete.grip_Normal.png" id="7_fu24n"]
[ext_resource type="Texture2D" uid="uid://0kbuhwdcpb3" path="res://assets/Models/SubstancePainterTest/machete.grip_Roughness.png" id="8_7iucj"]
[ext_resource type="AudioStream" uid="uid://cc6qqjl8yq5hw" path="res://assets/Audio/Foley Sports/Tennis/Generic Swing Powerful.wav" id="11_muqkq"]
[ext_resource type="Script" path="res://scripts/melee_collision.gd" id="12_u0mbp"]
[ext_resource type="Script" uid="uid://dij338ar58dw1" path="res://scripts/melee_collision.gd" id="12_u0mbp"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_t68e8"]
resource_name = "machete.blade"
@@ -20,18 +20,18 @@ render_priority = 0
shader = ExtResource("3_8w0n7")
shader_parameter/viewmodel_fov = 90.0
shader_parameter/albedo = Color(0.906332, 0.906332, 0.906332, 1)
shader_parameter/texture_albedo = ExtResource("1_n1eld")
shader_parameter/specular = 0.5
shader_parameter/metallic = 1.0
shader_parameter/roughness = 1.0
shader_parameter/texture_metallic = ExtResource("2_ktp8c")
shader_parameter/metallic_texture_channel = Vector4(1, 0, 0, 0)
shader_parameter/texture_roughness = ExtResource("4_nqv4m")
shader_parameter/roughness_texture_channel = Vector4(1, 0, 0, 0)
shader_parameter/texture_normal = ExtResource("3_lthmb")
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("1_n1eld")
shader_parameter/texture_metallic = ExtResource("2_ktp8c")
shader_parameter/texture_roughness = ExtResource("4_nqv4m")
shader_parameter/texture_normal = ExtResource("3_lthmb")
[sub_resource type="ShaderMaterial" id="ShaderMaterial_xbkpr"]
resource_name = "machete.grip"
@@ -39,18 +39,18 @@ render_priority = 0
shader = ExtResource("3_8w0n7")
shader_parameter/viewmodel_fov = 90.0
shader_parameter/albedo = Color(0.906332, 0.906332, 0.906332, 1)
shader_parameter/texture_albedo = ExtResource("5_w7p1o")
shader_parameter/specular = 0.5
shader_parameter/metallic = 1.0
shader_parameter/roughness = 1.0
shader_parameter/texture_metallic = ExtResource("6_vwold")
shader_parameter/metallic_texture_channel = Vector4(1, 0, 0, 0)
shader_parameter/texture_roughness = ExtResource("8_7iucj")
shader_parameter/roughness_texture_channel = Vector4(1, 0, 0, 0)
shader_parameter/texture_normal = ExtResource("7_fu24n")
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("5_w7p1o")
shader_parameter/texture_metallic = ExtResource("6_vwold")
shader_parameter/texture_roughness = ExtResource("8_7iucj")
shader_parameter/texture_normal = ExtResource("7_fu24n")
[sub_resource type="ArrayMesh" id="ArrayMesh_g3fr5"]
_surfaces = [{
@@ -256,11 +256,11 @@ tracks/2/keys = {
[sub_resource type="AnimationLibrary" id="AnimationLibrary_gmno4"]
_data = {
"RESET": SubResource("Animation_bmneo"),
"inspect": SubResource("Animation_8gebu"),
"shoot": SubResource("Animation_0mcf4"),
"swap_in": SubResource("Animation_xlf2w"),
"swap_out": SubResource("Animation_u7d31")
&"RESET": SubResource("Animation_bmneo"),
&"inspect": SubResource("Animation_8gebu"),
&"shoot": SubResource("Animation_0mcf4"),
&"swap_in": SubResource("Animation_xlf2w"),
&"swap_out": SubResource("Animation_u7d31")
}
[node name="Machete" type="Node3D" node_paths=PackedStringArray("anim_player", "audio_fire", "melee_collision_shape")]