diff --git a/Game/.godot/editor/Main.tscn-editstate-bcb0d2eb5949c52b6a65bfe9de3e985b.cfg b/Game/.godot/editor/Main.tscn-editstate-bcb0d2eb5949c52b6a65bfe9de3e985b.cfg index 3fa148e..5c16b94 100644 --- a/Game/.godot/editor/Main.tscn-editstate-bcb0d2eb5949c52b6a65bfe9de3e985b.cfg +++ b/Game/.godot/editor/Main.tscn-editstate-bcb0d2eb5949c52b6a65bfe9de3e985b.cfg @@ -37,6 +37,7 @@ Anim={ 3D={ "fov": 70.0, "gizmos_status": { +"AudioListener3D": 0, "AudioStreamPlayer3D": 0, "CPUParticles3D": 0, "CSGShape3D": 0, @@ -45,6 +46,7 @@ Anim={ "CollisionPolygon3D": 0, "CollisionShape3D": 0, "Decal": 0, +"FogVolume": 0, "GPUParticles3D": 0, "GPUParticlesCollision3D": 0, "Joint3D": 0, @@ -59,7 +61,7 @@ Anim={ "RayCast3D": 0, "ReflectionProbe": 0, "Skeleton3D": 0, -"SoftBody3D": 0, +"SoftDynamicBody3D": 0, "SpringArm3D": 0, "VehicleWheel3D": 0, "VisibleOnScreenNotifier3D": 0, @@ -79,7 +81,7 @@ Anim={ "sun_disabled": false, "sun_energy": 1.0, "sun_max_distance": 250.0, -"sun_rotation": Vector2(0, 0) +"sun_rotation": Vector2(0, 2.61799) }, "rotate_snap": 15.0, "scale_snap": 10.0, diff --git a/Game/.godot/editor/Main.tscn-folding-bcb0d2eb5949c52b6a65bfe9de3e985b.cfg b/Game/.godot/editor/Main.tscn-folding-bcb0d2eb5949c52b6a65bfe9de3e985b.cfg index 0cdfef8..ccd35b1 100644 --- a/Game/.godot/editor/Main.tscn-folding-bcb0d2eb5949c52b6a65bfe9de3e985b.cfg +++ b/Game/.godot/editor/Main.tscn-folding-bcb0d2eb5949c52b6a65bfe9de3e985b.cfg @@ -1,5 +1,5 @@ [folding] node_unfolds=[NodePath("."), PackedStringArray("Process")] -resource_unfolds=["res://Map.tscn::GDScript_gjkl2", PackedStringArray()] +resource_unfolds=[] nodes_folded=[] diff --git a/Game/.godot/editor/editor_layout.cfg b/Game/.godot/editor/editor_layout.cfg index 04616fd..4854529 100644 --- a/Game/.godot/editor/editor_layout.cfg +++ b/Game/.godot/editor/editor_layout.cfg @@ -16,114 +16,19 @@ dock_hsplit_4=0 [EditorNode] -open_scenes=["res://Main.tscn", "res://Assets/HUD/HUD.tscn", "res://Map.tscn", "res://Assets/Characters/Player.tscn", "res://Assets/Effects/Gibs.tscn"] +open_scenes=["res://Main.tscn", "res://Assets/HUD/HUD.tscn", "res://Map.tscn", "res://Assets/Characters/Player.tscn", "res://Assets/Effects/Gibs.tscn", "res://Assets/Maps/DM1.tscn"] [ScriptEditor] -open_scripts=[{ -"path": "res://Assets/Weapons/Handgun/Casing.gd", -"state": { -"bookmarks": [], -"breakpoints": [], -"column": 0, -"folded_lines": [], -"h_scroll_position": 0, -"row": 9, -"scroll_position": 0.0, -"selection": false, -"syntax_highlighter": "GDScript" -} -}, { -"path": "res://Assets/HUD/Crosshair.gd", -"state": { -"bookmarks": [], -"breakpoints": [], -"column": 0, -"folded_lines": [], -"h_scroll_position": 0, -"row": 0, -"scroll_position": 0.0, -"selection": false, -"syntax_highlighter": "GDScript" -} -}, { -"path": "res://Assets/Weapons/Handgun/Flash.gd", -"state": { -"bookmarks": [], -"breakpoints": [], -"column": 0, -"folded_lines": [], -"h_scroll_position": 0, -"row": 0, -"scroll_position": 0.0, -"selection": false, -"syntax_highlighter": "GDScript" -} -}, { -"path": "res://Assets/Effects/Gibs.gd", -"state": { -"bookmarks": [], -"breakpoints": [], -"column": 13, -"folded_lines": [], -"h_scroll_position": 0, -"row": 19, -"scroll_position": 0.0, -"selection": false, -"syntax_highlighter": "GDScript" -} -}, { -"path": "res://Assets/Effects/Impact.gd", -"state": { -"bookmarks": [], -"breakpoints": [], -"column": 0, -"folded_lines": [], -"h_scroll_position": 0, -"row": 0, -"scroll_position": 0.0, -"selection": false, -"syntax_highlighter": "GDScript" -} -}, { -"path": "res://Main.gd", -"state": { -"bookmarks": [], -"breakpoints": [], -"column": 40, -"folded_lines": [], -"h_scroll_position": 0, -"row": 3, -"scroll_position": 0.0, -"selection": false, -"syntax_highlighter": "GDScript" -} -}, { -"path": "res://Assets/Characters/Player.gd", -"state": { -"bookmarks": [], -"breakpoints": [], -"column": 27, -"folded_lines": [], -"h_scroll_position": 0, -"row": 158, -"scroll_position": 154.0, -"selection": false, -"syntax_highlighter": "GDScript" -} -}, { -"path": "res://Assets/Weapons/Weapon.gd", -"state": { -"bookmarks": [], -"breakpoints": [], -"column": 0, -"folded_lines": [], -"h_scroll_position": 0, -"row": 7, -"scroll_position": 0.0, -"selection": false, -"syntax_highlighter": "GDScript" -} -}] -open_help=["CharacterBody3D", "Engine", "LightmapProbe", "OS", "RigidBody3D"] +open_scripts=["res://Assets/Weapons/Handgun/Casing.gd", "res://Assets/HUD/Crosshair.gd", "res://Assets/Weapons/Handgun/Flash.gd", "res://Assets/Effects/Gibs.gd", "res://Assets/Effects/Impact.gd", "res://Main.gd", "res://Assets/Maps/MapImporter.gd", "res://Assets/Characters/Player.gd", "res://Assets/Weapons/Weapon.gd"] +open_help=["", "CharacterBody3D", "Engine", "LightmapProbe", "OS"] split_offset=18 + +[editor_log] + +log_filter_0=true +log_filter_1=false +log_filter_2=true +log_filter_3=true +collapse=false +show_search=true diff --git a/Game/.godot/editor/project_metadata.cfg b/Game/.godot/editor/project_metadata.cfg index 215797b..056b07d 100644 --- a/Game/.godot/editor/project_metadata.cfg +++ b/Game/.godot/editor/project_metadata.cfg @@ -1,6 +1,6 @@ [editor_metadata] -executable_path="/data/Projects/Games/Liblast/Godot/godot" +executable_path="/home/zekiah/Documents/liblast/Godot/godot-linux-nightly-x86_64/godot" [debug_options] @@ -10,8 +10,8 @@ run_debug_instances=2 [recent_files] -scenes=["res://Assets/Effects/Gibs.tscn", "res://Map.tscn", "res://Assets/Characters/Player.tscn", "res://Assets/HUD/HUD.tscn", "res://Main.tscn", "res://Server.tscn", "res://Assets/Weapons/Handgun/Flash.tscn", "res://Assets/Weapons/Handgun/Casing.tscn", "res://Assets/Weapons/Weapon.tscn", "res://Assets/Maps/DM1/DM1.glb"] -scripts=["res://Assets/Effects/Gibs.gd", "Dictionary", "RigidBody3D", "OS", "Node3D", "Node", "MultiplayerAPI", "MeshInstance3D", "Input", "Callable"] +scenes=["res://Assets/Maps/DM1.tscn", "res://Assets/Effects/Gibs.tscn", "res://Assets/Characters/Player.tscn", "res://Map.tscn", "res://Assets/HUD/HUD.tscn", "res://Main.tscn", "res://Server.tscn", "res://Assets/Weapons/Handgun/Flash.tscn", "res://Assets/Weapons/Handgun/Casing.tscn", "res://Assets/Weapons/Weapon.tscn"] +scripts=["res://Assets/Maps/MapImporter.gd", "RigidBody3D", "OS", "LightmapProbe", "Engine", "CharacterBody3D", "res://Assets/Effects/Gibs.gd", "Dictionary", "Node3D", "Node"] [script_setup] diff --git a/Game/.godot/imported/DM1.glb-9d0a731111d6eea69d0dd97fe5ed5e9b.md5 b/Game/.godot/imported/DM1.glb-9d0a731111d6eea69d0dd97fe5ed5e9b.md5 index f152231..eaf088e 100644 --- a/Game/.godot/imported/DM1.glb-9d0a731111d6eea69d0dd97fe5ed5e9b.md5 +++ b/Game/.godot/imported/DM1.glb-9d0a731111d6eea69d0dd97fe5ed5e9b.md5 @@ -1,3 +1,3 @@ -source_md5="4e5934d6814765401873169a2718dba3" -dest_md5="4a273f2e921918faafbc1e2eb88552ec" +source_md5="2c047b2ebc813cb3589d4b4d8bb2b547" +dest_md5="28f363899fd8c74bb12b935caf02ffd8" diff --git a/Game/.godot/imported/DM1.glb-9d0a731111d6eea69d0dd97fe5ed5e9b.scn b/Game/.godot/imported/DM1.glb-9d0a731111d6eea69d0dd97fe5ed5e9b.scn index 9d9add8..9402ef4 100644 Binary files a/Game/.godot/imported/DM1.glb-9d0a731111d6eea69d0dd97fe5ed5e9b.scn and b/Game/.godot/imported/DM1.glb-9d0a731111d6eea69d0dd97fe5ed5e9b.scn differ diff --git a/Game/Assets/Effects/BulletTracer.gltf.import b/Game/Assets/Effects/BulletTracer.gltf.import index dc1aecf..b11f5e7 100644 --- a/Game/Assets/Effects/BulletTracer.gltf.import +++ b/Game/Assets/Effects/BulletTracer.gltf.import @@ -23,7 +23,6 @@ meshes/light_baking=2 meshes/lightmap_texel_size=0.1 skins/use_named_skins=true animation/import=true -animation/bake_reset_animation=true animation/fps=15 import_script/path="" _subresources={ diff --git a/Game/Assets/HUD/Theme.tres b/Game/Assets/HUD/Theme.tres index 369d5de..3aef49f 100644 --- a/Game/Assets/HUD/Theme.tres +++ b/Game/Assets/HUD/Theme.tres @@ -1,33 +1,23 @@ [gd_resource type="Theme" load_steps=10 format=3 uid="uid://ddtu7o1dbp0s8"] -[ext_resource type="FontData" uid="uid://bvp75f670ewmh" path="res://Assets/Fonts/Liberation Sans/LiberationSans-Italic.ttf" id="1"] -[ext_resource type="FontData" uid="uid://bu513u0hckm6v" path="res://Assets/Fonts/Liberation Sans/LiberationSans-Bold.ttf" id="2"] -[ext_resource type="FontData" uid="uid://c1efeg0l6epya" path="res://Assets/Fonts/Liberation Sans/LiberationMono-Regular.ttf" id="3"] -[ext_resource type="FontData" uid="uid://dm2ua4ixk71jw" path="res://Assets/Fonts/Liberation Sans/LiberationSans-Regular.ttf" id="4"] +[ext_resource type="FontData" uid="uid://sv606h1wylsm" path="res://Assets/Fonts/Liberation Sans/LiberationSans-Italic.ttf" id="1"] +[ext_resource type="FontData" uid="uid://dedcmqi18s2mk" path="res://Assets/Fonts/Liberation Sans/LiberationSans-Bold.ttf" id="2"] +[ext_resource type="FontData" uid="uid://vokxbnewve4p" path="res://Assets/Fonts/Liberation Sans/LiberationMono-Regular.ttf" id="3"] +[ext_resource type="FontData" uid="uid://y4ub4mqw3ok4" path="res://Assets/Fonts/Liberation Sans/LiberationSans-Regular.ttf" id="4"] [sub_resource type="Font" id="Font_5hkhv"] -variation_coordinates = { -} data/0 = ExtResource( "2" ) [sub_resource type="Font" id="Font_tn7wr"] -variation_coordinates = { -} data/0 = ExtResource( "1" ) [sub_resource type="Font" id="Font_58xsl"] -variation_coordinates = { -} data/0 = ExtResource( "1" ) [sub_resource type="Font" id="Font_eosbb"] -variation_coordinates = { -} data/0 = ExtResource( "3" ) [sub_resource type="Font" id="Font_m8svi"] -variation_coordinates = { -} data/0 = ExtResource( "4" ) [resource] diff --git a/Game/Assets/Maps/DM1.tscn b/Game/Assets/Maps/DM1.tscn index fe09bb8..66a83cd 100644 --- a/Game/Assets/Maps/DM1.tscn +++ b/Game/Assets/Maps/DM1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=36 format=3 uid="uid://dm18jgmxy1b78"] +[gd_scene load_steps=38 format=3 uid="uid://dm18jgmxy1b78"] [ext_resource type="PackedScene" uid="uid://cbh6i7mi0aqjs" path="res://Map.tscn" id="1_5amr5"] [ext_resource type="PackedScene" uid="uid://k4alrsehhfbc" path="res://Assets/Maps/DM1/DM1.glb" id="2_ov63e"] @@ -29,6 +29,12 @@ points = PackedVector3Array(0.273373, 32.0947, 0.273373, -0.294675, -32.0947, -0 [sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_f3tv6"] points = PackedVector3Array(0.273373, 32.0947, 0.273373, -0.294675, -32.0947, -0.294675, -0.294675, 32.0947, -0.294675, 0.273373, -32.0947, 0.273373) +[sub_resource type="BoxShape3D" id="BoxShape3D_pdpdu"] +size = Vector3(0, 26.6, 5.5) + +[sub_resource type="BoxShape3D" id="BoxShape3D_bv1nw"] +size = Vector3(0, 9.3, 7.5) + [sub_resource type="OpenSimplexNoise" id="OpenSimplexNoise_lsg7q"] persistence = 0.9 @@ -379,6 +385,18 @@ shape = SubResource( "ConvexPolygonShape3D_awdhf" ) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1) shape = SubResource( "ConvexPolygonShape3D_f3tv6" ) +[node name="CollisionShape3D4" type="CollisionShape3D" parent="Geometry/StaticBody3D" index="3"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.4, -8, -1.75) +shape = SubResource( "BoxShape3D_pdpdu" ) + +[node name="CollisionShape3D5" type="CollisionShape3D" parent="Geometry/StaticBody3D" index="4"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.4, -16.65, 4.75) +shape = SubResource( "BoxShape3D_bv1nw" ) + +[node name="CollisionShape3D6" type="CollisionShape3D" parent="Geometry/StaticBody3D" index="5"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.4, 0.65, 4.75) +shape = SubResource( "BoxShape3D_bv1nw" ) + [node name="MeshInstance3D" type="MeshInstance3D" parent="Geometry" index="3"] transform = Transform3D(1, 0, 0, 0, 0, -1, 0, 1, 0, 39.7, -18.5, 8) material_override = SubResource( "StandardMaterial3D_jqv3s" ) diff --git a/Game/Assets/Maps/Materials/dev_materials/textures/dev_brown.png.import b/Game/Assets/Maps/Materials/dev_materials/textures/dev_brown.png.import index 2ec6e3f..fec1315 100644 --- a/Game/Assets/Maps/Materials/dev_materials/textures/dev_brown.png.import +++ b/Game/Assets/Maps/Materials/dev_materials/textures/dev_brown.png.import @@ -24,7 +24,7 @@ compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 compress/streamed=false -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -33,5 +33,5 @@ process/premult_alpha=false process/normal_map_invert_y=false process/HDR_as_SRGB=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 svg/scale=1.0 diff --git a/Game/Assets/Maps/Materials/dev_materials/textures/dev_green.png.import b/Game/Assets/Maps/Materials/dev_materials/textures/dev_green.png.import index cad7c5a..9ff01f3 100644 --- a/Game/Assets/Maps/Materials/dev_materials/textures/dev_green.png.import +++ b/Game/Assets/Maps/Materials/dev_materials/textures/dev_green.png.import @@ -24,7 +24,7 @@ compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 compress/streamed=false -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -33,5 +33,5 @@ process/premult_alpha=false process/normal_map_invert_y=false process/HDR_as_SRGB=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 svg/scale=1.0 diff --git a/Game/Assets/Maps/Materials/dev_materials/textures/dev_grey_light.png.import b/Game/Assets/Maps/Materials/dev_materials/textures/dev_grey_light.png.import index 6ada03d..9f03171 100644 --- a/Game/Assets/Maps/Materials/dev_materials/textures/dev_grey_light.png.import +++ b/Game/Assets/Maps/Materials/dev_materials/textures/dev_grey_light.png.import @@ -24,7 +24,7 @@ compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 compress/streamed=false -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -33,5 +33,5 @@ process/premult_alpha=false process/normal_map_invert_y=false process/HDR_as_SRGB=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 svg/scale=1.0 diff --git a/Game/Assets/Maps/Materials/dev_materials/textures/dev_orange.png.import b/Game/Assets/Maps/Materials/dev_materials/textures/dev_orange.png.import index 2228d24..90f8114 100644 --- a/Game/Assets/Maps/Materials/dev_materials/textures/dev_orange.png.import +++ b/Game/Assets/Maps/Materials/dev_materials/textures/dev_orange.png.import @@ -24,7 +24,7 @@ compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 compress/streamed=false -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -33,5 +33,5 @@ process/premult_alpha=false process/normal_map_invert_y=false process/HDR_as_SRGB=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 svg/scale=1.0 diff --git a/Game/Assets/Maps/Materials/dev_materials/textures/dev_red.png.import b/Game/Assets/Maps/Materials/dev_materials/textures/dev_red.png.import index d454c0e..132eb5d 100644 --- a/Game/Assets/Maps/Materials/dev_materials/textures/dev_red.png.import +++ b/Game/Assets/Maps/Materials/dev_materials/textures/dev_red.png.import @@ -24,7 +24,7 @@ compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 compress/streamed=false -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -33,5 +33,5 @@ process/premult_alpha=false process/normal_map_invert_y=false process/HDR_as_SRGB=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 svg/scale=1.0 diff --git a/Game/Assets/Maps/Materials/dev_materials/textures/dev_red_dark.png.import b/Game/Assets/Maps/Materials/dev_materials/textures/dev_red_dark.png.import index 26d6692..1dc213c 100644 --- a/Game/Assets/Maps/Materials/dev_materials/textures/dev_red_dark.png.import +++ b/Game/Assets/Maps/Materials/dev_materials/textures/dev_red_dark.png.import @@ -24,7 +24,7 @@ compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 compress/streamed=false -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -33,5 +33,5 @@ process/premult_alpha=false process/normal_map_invert_y=false process/HDR_as_SRGB=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 svg/scale=1.0 diff --git a/Game/Assets/Props/BeerCan.glb.import b/Game/Assets/Props/BeerCan.glb.import index 6f2035d..129d7fa 100644 --- a/Game/Assets/Props/BeerCan.glb.import +++ b/Game/Assets/Props/BeerCan.glb.import @@ -23,7 +23,6 @@ meshes/light_baking=2 meshes/lightmap_texel_size=0.1 skins/use_named_skins=true animation/import=true -animation/bake_reset_animation=true animation/fps=15 import_script/path="" _subresources={ diff --git a/Game/Assets/Props/Resonator/Lowpoly 04.glb.import b/Game/Assets/Props/Resonator/Lowpoly 04.glb.import index f28bdcb..91deb54 100644 --- a/Game/Assets/Props/Resonator/Lowpoly 04.glb.import +++ b/Game/Assets/Props/Resonator/Lowpoly 04.glb.import @@ -23,7 +23,6 @@ meshes/light_baking=2 meshes/lightmap_texel_size=0.1 skins/use_named_skins=true animation/import=true -animation/bake_reset_animation=true animation/fps=15 import_script/path="" _subresources={ diff --git a/Game/Assets/Weapons/Handgun/Casing.gltf.import b/Game/Assets/Weapons/Handgun/Casing.gltf.import index eb0796d..cfbc3ef 100644 --- a/Game/Assets/Weapons/Handgun/Casing.gltf.import +++ b/Game/Assets/Weapons/Handgun/Casing.gltf.import @@ -23,7 +23,6 @@ meshes/light_baking=2 meshes/lightmap_texel_size=0.1 skins/use_named_skins=true animation/import=true -animation/bake_reset_animation=true animation/fps=15 import_script/path="" _subresources={