diff --git a/assets/materials/woodgrain.ptex b/assets/materials/woodgrain.ptex index 27e0b164..4fc57a45 100644 --- a/assets/materials/woodgrain.ptex +++ b/assets/materials/woodgrain.ptex @@ -65,6 +65,12 @@ "from_port": 0, "to": "normal_map2", "to_port": 0 + }, + { + "from": "fbm2_2", + "from_port": 0, + "to": "buffer_2", + "to_port": 0 } ], "label": "Graph", @@ -210,8 +216,8 @@ { "name": "fbm2_2", "node_position": { - "x": -1524.254761, - "y": -291.327667 + "x": -1716.615845, + "y": -289.244354 }, "parameters": { "folds": 0, @@ -219,8 +225,8 @@ "noise": 9, "offset": -0.29, "persistence": 0.5, - "scale_x": 440, - "scale_y": 32 + "scale_x": 654, + "scale_y": 69 }, "seed_int": 1364257280, "type": "fbm2" @@ -254,6 +260,19 @@ }, "seed_int": 0, "type": "math" + }, + { + "name": "buffer_2", + "node_position": { + "x": -1417.878784, + "y": -288.169067 + }, + "parameters": { + "size": 11 + }, + "seed_int": 0, + "type": "buffer", + "version": 1 } ], "parameters": { diff --git a/assets/models/weapons/revolver.blend b/assets/models/weapons/revolver.blend new file mode 100644 index 00000000..b2047441 Binary files /dev/null and b/assets/models/weapons/revolver.blend differ diff --git a/assets/models/weapons/revolver.blend1 b/assets/models/weapons/revolver.blend1 new file mode 100644 index 00000000..2f832370 Binary files /dev/null and b/assets/models/weapons/revolver.blend1 differ diff --git a/project/assets/models/weapons/revolver.blend b/project/assets/models/weapons/revolver.blend new file mode 100644 index 00000000..ad6b646d Binary files /dev/null and b/project/assets/models/weapons/revolver.blend differ diff --git a/project/assets/models/weapons/revolver.blend.import b/project/assets/models/weapons/revolver.blend.import new file mode 100644 index 00000000..e458a392 --- /dev/null +++ b/project/assets/models/weapons/revolver.blend.import @@ -0,0 +1,59 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://bkw6pt33nbn2" +path="res://.godot/imported/revolver.blend-cea136e0c382a02d20e79eb233faa662.scn" + +[deps] + +source_file="res://assets/models/weapons/revolver.blend" +dest_files=["res://.godot/imported/revolver.blend-cea136e0c382a02d20e79eb233faa662.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/root_script=null +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" +_subresources={} +blender/nodes/visible=0 +blender/nodes/active_collection_only=false +blender/nodes/punctual_lights=true +blender/nodes/cameras=true +blender/nodes/custom_properties=true +blender/nodes/modifiers=1 +blender/meshes/colors=false +blender/meshes/uvs=true +blender/meshes/normals=true +blender/meshes/export_geometry_nodes_instances=false +blender/meshes/tangents=true +blender/meshes/skins=2 +blender/meshes/export_bones_deforming_mesh_only=false +blender/materials/unpack_enabled=true +blender/materials/export_materials=1 +blender/animation/limit_playback=true +blender/animation/always_sample=true +blender/animation/group_tracks=true +gltf/naming_version=2 diff --git a/project/assets/models/weapons/revolver.blend1 b/project/assets/models/weapons/revolver.blend1 new file mode 100644 index 00000000..9256836d Binary files /dev/null and b/project/assets/models/weapons/revolver.blend1 differ diff --git a/project/assets/models/weapons/rifle.blend b/project/assets/models/weapons/rifle.blend index ee36f016..25fbf2f2 100644 Binary files a/project/assets/models/weapons/rifle.blend and b/project/assets/models/weapons/rifle.blend differ diff --git a/project/assets/models/weapons/rifle.blend1 b/project/assets/models/weapons/rifle.blend1 index 97cb1690..eb331000 100644 Binary files a/project/assets/models/weapons/rifle.blend1 and b/project/assets/models/weapons/rifle.blend1 differ diff --git a/project/assets/textures/woodgrain/woodgrain_albedo.png b/project/assets/textures/woodgrain/woodgrain_albedo.png index 62aee700..656bcd26 100644 Binary files a/project/assets/textures/woodgrain/woodgrain_albedo.png and b/project/assets/textures/woodgrain/woodgrain_albedo.png differ diff --git a/project/assets/textures/woodgrain/woodgrain_metal.exr b/project/assets/textures/woodgrain/woodgrain_metal.exr index d2d1ec78..604ec848 100644 Binary files a/project/assets/textures/woodgrain/woodgrain_metal.exr and b/project/assets/textures/woodgrain/woodgrain_metal.exr differ diff --git a/project/assets/textures/woodgrain/woodgrain_normal.png b/project/assets/textures/woodgrain/woodgrain_normal.png index c030f4b2..20ab2010 100644 Binary files a/project/assets/textures/woodgrain/woodgrain_normal.png and b/project/assets/textures/woodgrain/woodgrain_normal.png differ diff --git a/project/assets/textures/woodgrain/woodgrain_rough.exr b/project/assets/textures/woodgrain/woodgrain_rough.exr index d2d1ec78..604ec848 100644 Binary files a/project/assets/textures/woodgrain/woodgrain_rough.exr and b/project/assets/textures/woodgrain/woodgrain_rough.exr differ diff --git a/project/maps/industrial_area.tscn b/project/maps/industrial_area.tscn index 53469e2f..fb702318 100644 --- a/project/maps/industrial_area.tscn +++ b/project/maps/industrial_area.tscn @@ -14,6 +14,8 @@ sky_material = SubResource("ProceduralSkyMaterial_ien74") [sub_resource type="Environment" id="Environment_uqqn3"] background_mode = 2 sky = SubResource("Sky_41t38") +ambient_light_source = 2 +ambient_light_color = Color(0.4645986, 0.46674252, 0.5062494, 1) tonemap_mode = 2 glow_enabled = true @@ -25,6 +27,7 @@ environment = SubResource("Environment_uqqn3") [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] transform = Transform3D(-0.8660254, -0.43301278, 0.25, 0, 0.49999997, 0.86602545, -0.50000006, 0.75, -0.43301266, 0, 0, 0) shadow_enabled = true +directional_shadow_max_distance = 500.0 [node name="SubViewportContainer" type="SubViewportContainer" parent="."] anchors_preset = 15 diff --git a/project/maps/industrial_area_map.tscn b/project/maps/industrial_area_map.tscn index 9ff3a98e..e540b3fd 100644 --- a/project/maps/industrial_area_map.tscn +++ b/project/maps/industrial_area_map.tscn @@ -640,9 +640,6 @@ material = ExtResource("4_fwhga") [node name="DemoPackPickup" parent="." instance=ExtResource("11_foo0w")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.609407, 0.8542257, 2.3071413) -[node name="DemoPackPickup2" parent="." instance=ExtResource("11_foo0w")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.9200053, 3.1410234, 1.3128887) - [node name="DestructableGate1" type="CSGBox3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -18.062351, 2.0328617, 5.9408145) use_collision = true @@ -694,7 +691,7 @@ size = Vector3(1.3518066, 2.4836426, 0.08312988) script = SubResource("GDScript_ug5on") [node name="DestructableGate" type="CSGCombiner3D" parent="."] -transform = Transform3D(0.9910509, 0, -0.13348459, 0, 1, 0, 0.13348459, 0, 0.9910509, -17.516602, 0.804224, -9.395113) +transform = Transform3D(0.9910509, 0, -0.13348459, 0, 1, 0, 0.13348459, 0, 0.9910509, -17.43851, 0.804224, -9.974887) use_collision = true collision_layer = 19 diff --git a/project/project.godot b/project/project.godot index eb43caa4..ba365857 100644 --- a/project/project.godot +++ b/project/project.godot @@ -15,6 +15,11 @@ run/main_scene="uid://dti7d1rslmhgp" config/features=PackedStringArray("4.5", "Forward Plus") config/icon="res://icon.svg" +[display] + +window/size/mode=3 +window/size/borderless=true + [editor] version_control/plugin_name="GitPlugin"