Sounds and pause menu

- Added sounds
- Started adding a pause menu
This commit is contained in:
Nolan A Casey 2023-11-11 23:38:59 -05:00
parent fb8a202640
commit a3734bdafd
23 changed files with 156 additions and 73 deletions

View File

@ -1,3 +1,11 @@
Button
VBoxContainer
MarginContainer
PanelContainer
Control
AudioStreamPlayer
AudioStreamPlayer3D
AudioListener3D
OccluderInstance3D OccluderInstance3D
MultiMeshInstance3D MultiMeshInstance3D
Label Label
@ -7,18 +15,13 @@ Node3D
MeshInstance3D MeshInstance3D
Label3D Label3D
RichTextLabel RichTextLabel
Button
TextEdit TextEdit
Control
CheckBox CheckBox
ProgressBar ProgressBar
TextureRect TextureRect
RayCast3D RayCast3D
MultiplayerSynchronizer MultiplayerSynchronizer
MultiplayerSpawner MultiplayerSpawner
VBoxContainer
MarginContainer
PanelContainer
CanvasLayer CanvasLayer
GPUParticles3D GPUParticles3D
AnimationPlayer AnimationPlayer
@ -27,4 +30,3 @@ DirectionalLight2D
Camera3D Camera3D
CollisionShape3D CollisionShape3D
CharacterBody3D CharacterBody3D
Node

View File

@ -19,16 +19,16 @@ dock_filesystem_split=0
dock_filesystem_display_mode=0 dock_filesystem_display_mode=0
dock_filesystem_file_sort=0 dock_filesystem_file_sort=0
dock_filesystem_file_list_display_mode=1 dock_filesystem_file_list_display_mode=1
dock_filesystem_selected_paths=PackedStringArray("res://Scenes/environment.tscn") dock_filesystem_selected_paths=PackedStringArray("res://Sound Effects/weapon_gun_1911_A_41.ogg")
dock_filesystem_uncollapsed_paths=PackedStringArray("res://", "res://Scenes/", "res://addons/kenney_particle_pack/") dock_filesystem_uncollapsed_paths=PackedStringArray("res://", "res://Sound Effects/", "res://Scenes/", "res://Prefabs/", "res://addons/kenney_particle_pack/")
dock_3="Scene,Import" dock_3="Scene,Import"
dock_4="FileSystem" dock_4="FileSystem"
dock_5="Inspector,Node,History" dock_5="Inspector,Node,History"
[EditorNode] [EditorNode]
open_scenes=PackedStringArray("res://Scenes/world.tscn") open_scenes=PackedStringArray("res://Scenes/world.tscn", "res://Prefabs/player.tscn")
center_split_offset=-477 center_split_offset=-279
selected_default_debugger_tab_idx=0 selected_default_debugger_tab_idx=0
selected_main_editor_idx=2 selected_main_editor_idx=2
current_scene="res://Scenes/world.tscn" current_scene="res://Scenes/world.tscn"

View File

@ -1,6 +1,6 @@
ea4bc82a6ad023ab7ee23ee620429895 ea4bc82a6ad023ab7ee23ee620429895
::res://::1699665352 ::res://::1699751602
export_presets.cfg::TextFile::-1::1699581370::0::1::::<><>:: export_presets.cfg::TextFile::-1::1699670416::0::1::::<><>::
icon.svg::CompressedTexture2D::8963615070695796116::1699485144::1699485149::1::::<><>:: icon.svg::CompressedTexture2D::8963615070695796116::1699485144::1699485149::1::::<><>::
::res://addons/::1699501524 ::res://addons/::1699501524
::res://addons/godot-jolt/::1699501524 ::res://addons/godot-jolt/::1699501524
@ -201,10 +201,6 @@ texture_10.png::CompressedTexture2D::6835967146403121001::1699489408::1699489895
texture_11.png::CompressedTexture2D::8064263700985635432::1699489408::1699489530::1::::<><>:: texture_11.png::CompressedTexture2D::8064263700985635432::1699489408::1699489530::1::::<><>::
texture_12.png::CompressedTexture2D::3434104090182459261::1699489408::1699489610::1::::<><>:: texture_12.png::CompressedTexture2D::3434104090182459261::1699489408::1699489610::1::::<><>::
texture_13.png::CompressedTexture2D::5776305603809460978::1699489408::1699489409::1::::<><>:: texture_13.png::CompressedTexture2D::5776305603809460978::1699489408::1699489409::1::::<><>::
::res://Exports/::1699579871
::res://Exports/Linux/::1699498450
::res://Exports/Mac/::1699579871
::res://Exports/Windows/::1699665448
::res://Models/::1699663923 ::res://Models/::1699663923
environment.glb::PackedScene::4824975578803230025::1699489383::1699489726::1::::<><>:: environment.glb::PackedScene::4824975578803230025::1699489383::1699489726::1::::<><>::
::res://Models/bag_on_the_head/::1699663940 ::res://Models/bag_on_the_head/::1699663940
@ -227,18 +223,18 @@ license.txt::TextFile::-1::1699502355::0::1::::<><>::
scene.gltf::PackedScene::7236983511912392510::1699502355::1699502357::1::::<><>:: scene.gltf::PackedScene::7236983511912392510::1699502355::1699502357::1::::<><>::
::res://Models/funny_rubber_chicken/textures/::1699502357 ::res://Models/funny_rubber_chicken/textures/::1699502357
material_baseColor.png::CompressedTexture2D::3333604071972615928::1699502355::1699502357::1::::<><>:: material_baseColor.png::CompressedTexture2D::3333604071972615928::1699502355::1699502357::1::::<><>::
::res://Models/Hats/::1699664961 ::res://Models/Hats/::1699669323
1.tscn::PackedScene::4633592451811745265::1699664699::0::1::::<><>::uid://11ijaox7vxiu::::res://Models/bag_on_the_head/scene.gltf<>res://Scripts/HatHider.gd 1.tscn::PackedScene::4633592451811745265::1699669272::0::1::::<><>::uid://11ijaox7vxiu
2.tscn::PackedScene::6033455281131072458::1699664779::0::1::::<><>::uid://dhsc3iy03ivnm::::res://Models/christmas_hat/scene.gltf<>res://Scripts/HatHider.gd 2.tscn::PackedScene::6033455281131072458::1699669323::0::1::::<><>::uid://dhsc3iy03ivnm
3.tscn::PackedScene::3080896278927798763::1699664797::0::1::::<><>::uid://06cjtpwfher7::::res://Models/mask/scene.gltf<>res://Scripts/HatHider.gd 3.tscn::PackedScene::3080896278927798763::1699669319::0::1::::<><>::uid://06cjtpwfher7
4.tscn::PackedScene::1296374358449724479::1699664834::0::1::::<><>::uid://s0n1hxn4gxfc::::res://Models/pokemon_masters_cap/scene.gltf<>res://Scripts/HatHider.gd 4.tscn::PackedScene::1296374358449724479::1699669314::0::1::::<><>::uid://s0n1hxn4gxfc
5.tscn::PackedScene::3110035738857408728::1699664855::0::1::::<><>::uid://nsyxaulf1ylw::::res://Models/propeller_hat/scene.gltf<>res://Scripts/HatHider.gd 5.tscn::PackedScene::3110035738857408728::1699669309::0::1::::<><>::uid://nsyxaulf1ylw
6.tscn::PackedScene::8296779063485550882::1699664879::0::1::::<><>::uid://bjr8cts018f8k::::res://Models/stylized_wizard_hat/scene.gltf<>res://Scripts/HatHider.gd 6.tscn::PackedScene::8296779063485550882::1699669302::0::1::::<><>::uid://bjr8cts018f8k
7.tscn::PackedScene::6197203197177333710::1699664895::0::1::::<><>::uid://bo3noe8hcgwy1::::res://Models/top_hat__free_download/scene.gltf<>res://Scripts/HatHider.gd 7.tscn::PackedScene::6197203197177333710::1699669299::0::1::::<><>::uid://bo3noe8hcgwy1
8.tscn::PackedScene::5100560850496020936::1699664912::0::1::::<><>::uid://b5kwhin0tcp5k::::res://Models/vintage_helmet/scene.gltf<>res://Scripts/HatHider.gd 8.tscn::PackedScene::5100560850496020936::1699669295::0::1::::<><>::uid://b5kwhin0tcp5k
9.tscn::PackedScene::6915533129009635369::1699664929::0::1::::<><>::uid://b3hnc8dr5t0wn::::res://Models/white_mask/scene.gltf<>res://Scripts/HatHider.gd 9.tscn::PackedScene::6915533129009635369::1699669288::0::1::::<><>::uid://b3hnc8dr5t0wn
10.tscn::PackedScene::6033990381811318978::1699664945::0::1::::<><>::uid://cgts35q6i48q::::res://Models/winter_hat/scene.gltf<>res://Scripts/HatHider.gd 10.tscn::PackedScene::6033990381811318978::1699669283::0::1::::<><>::uid://cgts35q6i48q
11.tscn::PackedScene::3046542352293480112::1699664961::0::1::::<><>::uid://n70gb1n6316k::::res://Models/worn_baseball_ball/scene.gltf<>res://Scripts/HatHider.gd 11.tscn::PackedScene::3046542352293480112::1699669279::0::1::::<><>::uid://n70gb1n6316k
::res://Models/kimber_1911/::1699490880 ::res://Models/kimber_1911/::1699490880
license.txt::TextFile::-1::1699490878::0::1::::<><>:: license.txt::TextFile::-1::1699490878::0::1::::<><>::
scene.gltf::PackedScene::7213921404618298609::1699490878::1699490880::1::::<><>:: scene.gltf::PackedScene::7213921404618298609::1699490878::1699490880::1::::<><>::
@ -312,13 +308,17 @@ scene.gltf::PackedScene::980043788328408320::1699662585::1699662585::1::::<><>::
lambert1_baseColor.png::CompressedTexture2D::8743841377959562879::1699662585::1699662585::1::::<><>:: lambert1_baseColor.png::CompressedTexture2D::8743841377959562879::1699662585::1699662585::1::::<><>::
lambert1_metallicRoughness.png::CompressedTexture2D::8931258458639185901::1699662585::1699662585::1::::<><>:: lambert1_metallicRoughness.png::CompressedTexture2D::8931258458639185901::1699662585::1699662585::1::::<><>::
lambert1_normal.png::CompressedTexture2D::3998376482152544164::1699662585::1699662585::1::::<><>:: lambert1_normal.png::CompressedTexture2D::3998376482152544164::1699662585::1699662585::1::::<><>::
::res://Prefabs/::1699667272 ::res://Occlusion Data/::1699669336
player.tscn::PackedScene::4444783912067201683::1699667272::0::1::::<><>::res://Scripts/Player.gd<>uid://da1qh4xri24f2::::res://Models/kimber_1911/scene.gltf<>uid://d164amgdtaa5k::::res://Models/funny_rubber_chicken/chicken.tscn<>uid://bx0esoasfh733::::res://addons/kenney_particle_pack/star_06.png environment.occ::ArrayOccluder3D::2660494726846166203::1699668360::0::1::::<><>::
::res://Scenes/::1699667272 ::res://Prefabs/::1699751580
environment.tscn::PackedScene::8256961957080777526::1699490330::0::1::::<><>::uid://ca0iv4endjdmn player.tscn::PackedScene::4444783912067201683::1699751580::0::1::::<><>::res://Scripts/Player.gd<>uid://da1qh4xri24f2::::res://Models/kimber_1911/scene.gltf<>uid://d164amgdtaa5k::::res://Models/funny_rubber_chicken/chicken.tscn<>uid://bx0esoasfh733::::res://addons/kenney_particle_pack/star_06.png
world.tscn::PackedScene::1877808985457939721::1699667272::0::1::::<><>::res://Scripts/world.gd<>uid://dpvy7sm57pjn7::::res://Scenes/environment.tscn<>uid://dhytg0w8gqdob::::res://addons/kenney_particle_pack/circle_05.png ::res://Scenes/::1699669972
::res://Scripts/::1699665144 environment.tscn::PackedScene::8256961957080777526::1699669972::0::1::::<><>::uid://ca0iv4endjdmn
world.tscn::PackedScene::1877808985457939721::1699669012::0::1::::<><>::res://Scripts/world.gd<>uid://dpvy7sm57pjn7
::res://Scripts/::1699670218
chicken.gd::GDScript::-1::1699544273::0::1::::<>Node3D<>:: chicken.gd::GDScript::-1::1699544273::0::1::::<>Node3D<>::
HatHider.gd::GDScript::-1::1699664681::0::1::::<>Node3D<>:: HatHider.gd::GDScript::-1::1699664681::0::1::::<>Node3D<>::
Player.gd::GDScript::-1::1699665144::0::1::::<>CharacterBody3D<>:: Player.gd::GDScript::-1::1699670218::0::1::::<>CharacterBody3D<>::
world.gd::GDScript::-1::1699662585::0::1::::<>Node<>:: world.gd::GDScript::-1::1699662585::0::1::::<>Node<>::
::res://Sound Effects/::1699751712
weapon_gun_1911_A_41.ogg::AudioStreamOggVorbis::5170645470017560819::1699751712::1699751713::1::::<><>::

View File

@ -1,21 +1,4 @@
res://Models/vintage_helmet/hat.tscn
res://Models/white_mask/hat.tscn
res://Models/winter_hat/hat.tscn
res://Prefabs/player.tscn res://Prefabs/player.tscn
res://Models/worn_baseball_ball/hat.tscn
res://Scenes/world.tscn res://Scenes/world.tscn
res://Scripts/Player.gd res://Scripts/Player.gd
res://Models/Hats/11.tscn res://Scripts/world.gd
res://Models/Hats/1.tscn
res://Scripts/Hat1.gd
res://Scripts/HatHider.gd
res://Models/Hats/2.tscn
res://Models/Hats/3.tscn
res://Models/Hats/4.tscn
res://Models/Hats/5.tscn
res://Models/Hats/6.tscn
res://Models/Hats/7.tscn
res://Models/Hats/8.tscn
res://Models/Hats/9.tscn
res://Models/Hats/10.tscn
res://Scenes/environment.tscn

View File

@ -98,7 +98,7 @@ Anim={
"auto_orthogonal_enabled": true, "auto_orthogonal_enabled": true,
"cinematic_preview": false, "cinematic_preview": false,
"display_mode": 20, "display_mode": 20,
"distance": 4.75337, "distance": 2.99543,
"doppler": false, "doppler": false,
"frame_time": false, "frame_time": false,
"gizmos": true, "gizmos": true,
@ -174,4 +174,4 @@ Anim={
"zfar": 4000.01, "zfar": 4000.01,
"znear": 0.05 "znear": 0.05
} }
selected_nodes=Array[NodePath]([]) selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17665/@Control@697/@Panel@698/@VBoxContainer@706/@HSplitContainer@709/@HSplitContainer@717/@HSplitContainer@725/@VBoxContainer@726/@VSplitContainer@728/@VSplitContainer@754/@VBoxContainer@755/@PanelContainer@800/MainScreen/@CanvasItemEditor@10090/@VSplitContainer@9915/@HSplitContainer@9917/@HSplitContainer@9919/@Control@9920/@SubViewportContainer@9921/@SubViewport@9922/World")])

View File

@ -1,5 +1,5 @@
[folding] [folding]
node_unfolds=[NodePath("."), PackedStringArray("Collision"), NodePath("chicken"), PackedStringArray("Transform"), NodePath("CollisionShape3D"), PackedStringArray("Transform"), NodePath("Camera3D/gun"), PackedStringArray("Transform"), NodePath("Camera3D/gun/MuzzleFlash"), PackedStringArray("Drawing", "Process Material", "process_material", "Draw Passes", "draw_pass_1", "Time"), NodePath("Username"), PackedStringArray("Text", "Flags")] node_unfolds=[NodePath("."), PackedStringArray("Collision"), NodePath("chicken"), PackedStringArray("Transform"), NodePath("CollisionShape3D"), PackedStringArray("Transform"), NodePath("Camera3D/gun"), PackedStringArray("Transform"), NodePath("Camera3D/gun/MuzzleFlash"), PackedStringArray("Drawing", "Process Material", "process_material", "Draw Passes", "draw_pass_1", "Time"), NodePath("Username"), PackedStringArray("Text", "Flags"), NodePath("AudioListener3D"), PackedStringArray("Transform")]
resource_unfolds=["res://Prefabs/player.tscn::CapsuleShape3D_ruebo", PackedStringArray(), "res://Prefabs/player.tscn::ParticleProcessMaterial_qufyg", PackedStringArray(), "res://Prefabs/player.tscn::PlaneMesh_yxv4l", PackedStringArray()] resource_unfolds=["res://Prefabs/player.tscn::CapsuleShape3D_ruebo", PackedStringArray(), "res://Prefabs/player.tscn::ParticleProcessMaterial_qufyg", PackedStringArray(), "res://Prefabs/player.tscn::PlaneMesh_yxv4l", PackedStringArray()]
nodes_folded=[] nodes_folded=[]

View File

@ -7,7 +7,7 @@ use_advanced_connections=false
run_live_debug=true run_live_debug=true
run_reload_scripts=true run_reload_scripts=true
run_debug_instances=2 run_debug_instances=1
[dialog_bounds] [dialog_bounds]
@ -19,8 +19,8 @@ export=Rect2(830, 371, 900, 708)
[recent_files] [recent_files]
scenes=["res://Models/environment.glb", "res://Scenes/environment.tscn", "res://Models/Hats/11.tscn", "res://Models/Hats/10.tscn", "res://Models/Hats/9.tscn", "res://Models/Hats/8.tscn", "res://Models/Hats/7.tscn", "res://Models/Hats/6.tscn", "res://Models/Hats/5.tscn", "res://Models/Hats/4.tscn"] scenes=["res://Prefabs/player.tscn", "res://Scenes/world.tscn", "res://Models/environment.glb", "res://Scenes/environment.tscn", "res://Models/Hats/11.tscn", "res://Models/Hats/10.tscn", "res://Models/Hats/9.tscn", "res://Models/Hats/8.tscn", "res://Models/Hats/7.tscn", "res://Models/Hats/6.tscn"]
scripts=["res://Scripts/Hat1.gd", "InputEventMouseMotion", "InputEventJoypadMotion", "GeometryInstance3D", "ENetPacketPeer", "ENetMultiplayerPeer", "@GlobalScope", "res://Scripts/chicken.gd", "PackedScene", "res://Scripts/world.gd"] scripts=["InputEventMouseMotion", "InputEventJoypadMotion", "GeometryInstance3D", "ENetPacketPeer", "ENetMultiplayerPeer", "@GlobalScope", "res://Scripts/Hat1.gd", "res://Scripts/chicken.gd", "PackedScene", "res://Scripts/world.gd"]
[linked_properties] [linked_properties]
@ -54,6 +54,8 @@ OptionButton:scale=true
MultiMeshInstance3D:scale=true MultiMeshInstance3D:scale=true
OccluderInstance3D:scale=true OccluderInstance3D:scale=true
StaticBody3D:scale=true StaticBody3D:scale=true
AudioListener3D:scale=true
AudioStreamPlayer3D:scale=true
[script_setup] [script_setup]

View File

@ -3,11 +3,11 @@
state={ state={
"bookmarks": PackedInt32Array(), "bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(), "breakpoints": PackedInt32Array(),
"column": 16, "column": 5,
"folded_lines": Array[int]([]), "folded_lines": Array[int]([]),
"h_scroll_position": 0, "h_scroll_position": 0,
"row": 113, "row": 132,
"scroll_position": 95.0, "scroll_position": 92.0,
"selection": false, "selection": false,
"syntax_highlighter": "GDScript" "syntax_highlighter": "GDScript"
} }
@ -17,11 +17,11 @@ state={
state={ state={
"bookmarks": PackedInt32Array(), "bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(), "breakpoints": PackedInt32Array(),
"column": 30, "column": 45,
"folded_lines": Array[int]([]), "folded_lines": Array[int]([]),
"h_scroll_position": 0, "h_scroll_position": 0,
"row": 64, "row": 87,
"scroll_position": 57.0, "scroll_position": 29.75,
"selection": false, "selection": false,
"syntax_highlighter": "GDScript" "syntax_highlighter": "GDScript"
} }

View File

@ -0,0 +1,3 @@
[folding]
sections_unfolded=PackedStringArray()

View File

@ -0,0 +1,3 @@
[folding]
sections_unfolded=PackedStringArray()

View File

@ -8,7 +8,7 @@ Anim={
"grid_snap_active": false, "grid_snap_active": false,
"grid_step": Vector2(8, 8), "grid_step": Vector2(8, 8),
"grid_visibility": 1, "grid_visibility": 1,
"ofs": Vector2(-413, -111), "ofs": Vector2(39.1031, 90.431),
"primary_grid_steps": 8, "primary_grid_steps": 8,
"show_edit_locks": true, "show_edit_locks": true,
"show_guides": true, "show_guides": true,
@ -32,7 +32,7 @@ Anim={
"snap_rotation_step": 0.261799, "snap_rotation_step": 0.261799,
"snap_scale": false, "snap_scale": false,
"snap_scale_step": 0.1, "snap_scale_step": 0.1,
"zoom": 1.0 "zoom": 1.49831
} }
3D={ 3D={
"fov": 70.01, "fov": 70.01,
@ -173,4 +173,4 @@ Anim={
"zfar": 4000.01, "zfar": 4000.01,
"znear": 0.05 "znear": 0.05
} }
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17665/@Control@697/@Panel@698/@VBoxContainer@706/@HSplitContainer@709/@HSplitContainer@717/@HSplitContainer@725/@VBoxContainer@726/@VSplitContainer@728/@VSplitContainer@754/@VBoxContainer@755/@PanelContainer@800/MainScreen/@CanvasItemEditor@10090/@VSplitContainer@9915/@HSplitContainer@9917/@HSplitContainer@9919/@Control@9920/@SubViewportContainer@9921/@SubViewport@9922/Player/Camera3D/gun")]) selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17665/@Control@697/@Panel@698/@VBoxContainer@706/@HSplitContainer@709/@HSplitContainer@717/@HSplitContainer@725/@VBoxContainer@726/@VSplitContainer@728/@VSplitContainer@754/@VBoxContainer@755/@PanelContainer@800/MainScreen/@CanvasItemEditor@10090/@VSplitContainer@9915/@HSplitContainer@9917/@HSplitContainer@9919/@Control@9920/@SubViewportContainer@9921/@SubViewport@9922/World")])

View File

@ -1,5 +1,5 @@
[folding] [folding]
node_unfolds=[NodePath("environment"), PackedStringArray("Transform"), NodePath("DirectionalLight3D"), PackedStringArray("Shadow", "Light"), NodePath("CanvasLayer/MainMenu"), PackedStringArray("Theme Overrides", "Theme Overrides/styles"), NodePath("CanvasLayer/MainMenu/MarginContainer"), PackedStringArray("Theme Overrides", "Theme Overrides/constants"), NodePath("CanvasLayer/MainMenu/MarginContainer/VBoxContainer"), PackedStringArray("Theme Overrides", "Theme Overrides/constants"), NodePath("CanvasLayer/HUD"), PackedStringArray("Mouse"), NodePath("CanvasLayer/HUD/HealthBar"), PackedStringArray("Theme Overrides", "Theme Overrides/styles", "theme_override_styles/fill", "theme_override_styles/background"), NodePath("MultiplayerSpawner"), PackedStringArray("_spawnable_scene_count_array")] node_unfolds=[NodePath("environment"), PackedStringArray("Transform"), NodePath("DirectionalLight3D"), PackedStringArray("Shadow", "Light"), NodePath("CanvasLayer/MainMenu"), PackedStringArray("Theme Overrides", "Theme Overrides/styles"), NodePath("CanvasLayer/MainMenu/MarginContainer"), PackedStringArray("Theme Overrides", "Theme Overrides/constants"), NodePath("CanvasLayer/MainMenu/MarginContainer/VBoxContainer"), PackedStringArray("Theme Overrides", "Theme Overrides/constants"), NodePath("CanvasLayer/HUD"), PackedStringArray("Mouse"), NodePath("CanvasLayer/HUD/HealthBar"), PackedStringArray("Theme Overrides", "Theme Overrides/styles", "theme_override_styles/fill", "theme_override_styles/background"), NodePath("CanvasLayer/PauseMenu"), PackedStringArray("Layout"), NodePath("CanvasLayer/PauseMenu/MarginContainer/VBoxContainer"), PackedStringArray("Theme Overrides", "Theme Overrides/constants"), NodePath("MultiplayerSpawner"), PackedStringArray("_spawnable_scene_count_array")]
resource_unfolds=["res://Scenes/world.tscn::StyleBoxFlat_cdng2", PackedStringArray(), "res://Scenes/world.tscn::StyleBoxFlat_ufa2v", PackedStringArray()] resource_unfolds=["res://Scenes/world.tscn::StyleBoxFlat_cdng2", PackedStringArray(), "res://Scenes/world.tscn::StyleBoxFlat_ufa2v", PackedStringArray()]
nodes_folded=[NodePath("CanvasLayer")] nodes_folded=[NodePath("CanvasLayer/MainMenu"), NodePath("CanvasLayer/MainMenu/MarginContainer"), NodePath("CanvasLayer/HUD")]

View File

@ -0,0 +1,3 @@
source_md5="cbf405a3344fee1bcac44cd9f44bb244"
dest_md5="3d64eafd4f402986cde5a299c96f3fff"

View File

@ -0,0 +1,3 @@
source_md5="7bacb7603f35e1ee212fc541ecfa5cf0"
dest_md5="443607c7e2110348f60bfe7cf07b50a2"

View File

@ -0,0 +1,2 @@
44039
/home/nc543/Documents/Godot/Versions/Godot_v4.1.3-stable_mono_linux_x86_64/Godot_v4.1.3-stable_mono_linux.x86_64

Binary file not shown.

View File

@ -1,9 +1,10 @@
[gd_scene load_steps=17 format=3 uid="uid://b4lc7asimanmh"] [gd_scene load_steps=18 format=3 uid="uid://b4lc7asimanmh"]
[ext_resource type="Script" path="res://Scripts/Player.gd" id="1_iv0wx"] [ext_resource type="Script" path="res://Scripts/Player.gd" id="1_iv0wx"]
[ext_resource type="PackedScene" uid="uid://da1qh4xri24f2" path="res://Models/kimber_1911/scene.gltf" id="2_0x8c2"] [ext_resource type="PackedScene" uid="uid://da1qh4xri24f2" path="res://Models/kimber_1911/scene.gltf" id="2_0x8c2"]
[ext_resource type="PackedScene" uid="uid://d164amgdtaa5k" path="res://Models/funny_rubber_chicken/chicken.tscn" id="2_607tw"] [ext_resource type="PackedScene" uid="uid://d164amgdtaa5k" path="res://Models/funny_rubber_chicken/chicken.tscn" id="2_607tw"]
[ext_resource type="Texture2D" uid="uid://bx0esoasfh733" path="res://addons/kenney_particle_pack/star_06.png" id="3_cnxpw"] [ext_resource type="Texture2D" uid="uid://bx0esoasfh733" path="res://addons/kenney_particle_pack/star_06.png" id="3_cnxpw"]
[ext_resource type="AudioStream" uid="uid://cfwx1moklfkfj" path="res://Sound Effects/weapon_gun_1911_A_41.ogg" id="5_fpyjq"]
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_ruebo"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_ruebo"]
radius = 0.4 radius = 0.4
@ -195,6 +196,9 @@ local_coords = true
process_material = SubResource("ParticleProcessMaterial_qufyg") process_material = SubResource("ParticleProcessMaterial_qufyg")
draw_pass_1 = SubResource("PlaneMesh_yxv4l") draw_pass_1 = SubResource("PlaneMesh_yxv4l")
[node name="Gunshot" type="AudioStreamPlayer3D" parent="Camera3D/gun"]
stream = ExtResource("5_fpyjq")
[node name="RayCast3D" type="RayCast3D" parent="Camera3D"] [node name="RayCast3D" type="RayCast3D" parent="Camera3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.0776906) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.0776906)
target_position = Vector3(0, 0, -100) target_position = Vector3(0, 0, -100)
@ -212,5 +216,8 @@ libraries = {
[node name="MultiplayerSynchronizer" type="MultiplayerSynchronizer" parent="."] [node name="MultiplayerSynchronizer" type="MultiplayerSynchronizer" parent="."]
replication_config = SubResource("SceneReplicationConfig_nfq0k") replication_config = SubResource("SceneReplicationConfig_nfq0k")
[node name="AudioListener3D" type="AudioListener3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0)
[connection signal="animation_finished" from="AnimationPlayer" to="." method="_on_animation_player_animation_finished"] [connection signal="animation_finished" from="AnimationPlayer" to="." method="_on_animation_player_animation_finished"]
[connection signal="synchronized" from="MultiplayerSynchronizer" to="." method="_on_multiplayer_synchronizer_synchronized"] [connection signal="synchronized" from="MultiplayerSynchronizer" to="." method="_on_multiplayer_synchronizer_synchronized"]

View File

@ -269,10 +269,49 @@ max_value = 3.0
value = 3.0 value = 3.0
show_percentage = false show_percentage = false
[node name="PauseMenu" type="PanelContainer" parent="CanvasLayer"]
visible = false
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = 315.0
offset_top = 253.0
offset_right = -315.0
offset_bottom = -252.0
grow_horizontal = 2
grow_vertical = 2
[node name="MarginContainer" type="MarginContainer" parent="CanvasLayer/PauseMenu"]
layout_mode = 2
theme_override_constants/margin_left = 15
theme_override_constants/margin_top = 15
theme_override_constants/margin_right = 15
theme_override_constants/margin_bottom = 15
[node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/PauseMenu/MarginContainer"]
layout_mode = 2
theme_override_constants/separation = 10
[node name="Resume" type="Button" parent="CanvasLayer/PauseMenu/MarginContainer/VBoxContainer"]
layout_mode = 2
size_flags_vertical = 4
text = "Resume"
[node name="MainMenu" type="Button" parent="CanvasLayer/PauseMenu/MarginContainer/VBoxContainer"]
layout_mode = 2
size_flags_vertical = 4
text = "Main Menu"
[node name="Quit" type="Button" parent="CanvasLayer/PauseMenu/MarginContainer/VBoxContainer"]
layout_mode = 2
text = "Quit"
[node name="MultiplayerSpawner" type="MultiplayerSpawner" parent="."] [node name="MultiplayerSpawner" type="MultiplayerSpawner" parent="."]
_spawnable_scenes = PackedStringArray("res://Prefabs/player.tscn") _spawnable_scenes = PackedStringArray("res://Prefabs/player.tscn")
spawn_path = NodePath("..") spawn_path = NodePath("..")
[node name="Music" type="AudioStreamPlayer" parent="."]
[connection signal="pressed" from="CanvasLayer/MainMenu/MarginContainer/VBoxContainer/Hosting/HostButton" to="." method="_on_host_button_pressed"] [connection signal="pressed" from="CanvasLayer/MainMenu/MarginContainer/VBoxContainer/Hosting/HostButton" to="." method="_on_host_button_pressed"]
[connection signal="pressed" from="CanvasLayer/MainMenu/MarginContainer/VBoxContainer/Hosting/Back" to="." method="_on_back_pressed_1"] [connection signal="pressed" from="CanvasLayer/MainMenu/MarginContainer/VBoxContainer/Hosting/Back" to="." method="_on_back_pressed_1"]
[connection signal="pressed" from="CanvasLayer/MainMenu/MarginContainer/VBoxContainer/Joining/JoinButton" to="." method="_on_join_button_pressed"] [connection signal="pressed" from="CanvasLayer/MainMenu/MarginContainer/VBoxContainer/Joining/JoinButton" to="." method="_on_join_button_pressed"]

View File

@ -12,6 +12,8 @@ const JUMP_VELOCITY: float = 10
@onready var chickenModel = $chicken @onready var chickenModel = $chicken
@onready var nametag = $Username @onready var nametag = $Username
@onready var syncronizer = $MultiplayerSynchronizer @onready var syncronizer = $MultiplayerSynchronizer
@onready var gunshot = $Camera3D/gun/Gunshot
@onready var listener = $AudioListener3D
@export var username: String = "Chicken" @export var username: String = "Chicken"
@export var hat: int = 0 @export var hat: int = 0
@ -36,6 +38,7 @@ func _ready():
updateUsername() updateUsername()
hat = get_node("/root/World/CanvasLayer/MainMenu/MarginContainer/VBoxContainer/BaseMenu/HatSelection:OptionButton").selected hat = get_node("/root/World/CanvasLayer/MainMenu/MarginContainer/VBoxContainer/BaseMenu/HatSelection:OptionButton").selected
makeHat() makeHat()
listener.make_current()
func updateUsername(): func updateUsername():
nametag.text = username nametag.text = username
@ -57,6 +60,7 @@ func _unhandled_input(event):
if Input.is_action_just_pressed("shoot") and animations.current_animation != "shoot": if Input.is_action_just_pressed("shoot") and animations.current_animation != "shoot":
shoot.rpc() shoot.rpc()
gunshot.play()
if raycast.is_colliding(): if raycast.is_colliding():
var hit_player = raycast.get_collider() var hit_player = raycast.get_collider()
hit_player.receiveDamage.rpc_id(hit_player.get_multiplayer_authority()) hit_player.receiveDamage.rpc_id(hit_player.get_multiplayer_authority())
@ -124,3 +128,6 @@ func makeHat():
add_child(result) add_child(result)
if is_multiplayer_authority(): if is_multiplayer_authority():
result.hideMesh() result.hideMesh()
func pause():
pass

View File

@ -4,6 +4,7 @@ extends Node
@onready var baseMenu = $CanvasLayer/MainMenu/MarginContainer/VBoxContainer/BaseMenu @onready var baseMenu = $CanvasLayer/MainMenu/MarginContainer/VBoxContainer/BaseMenu
@onready var hostMenu = $CanvasLayer/MainMenu/MarginContainer/VBoxContainer/Hosting @onready var hostMenu = $CanvasLayer/MainMenu/MarginContainer/VBoxContainer/Hosting
@onready var joinMenu = $CanvasLayer/MainMenu/MarginContainer/VBoxContainer/Joining @onready var joinMenu = $CanvasLayer/MainMenu/MarginContainer/VBoxContainer/Joining
@onready var pauseMenu = $CanvasLayer/PauseMenu
@onready var addressEntry = $CanvasLayer/MainMenu/MarginContainer/VBoxContainer/Joining/AddressEntry @onready var addressEntry = $CanvasLayer/MainMenu/MarginContainer/VBoxContainer/Joining/AddressEntry
@onready var username = $CanvasLayer/MainMenu/MarginContainer/VBoxContainer/BaseMenu/Username @onready var username = $CanvasLayer/MainMenu/MarginContainer/VBoxContainer/BaseMenu/Username
@onready var hud = $CanvasLayer/HUD @onready var hud = $CanvasLayer/HUD
@ -13,12 +14,21 @@ extends Node
const Player = preload("res://Prefabs/player.tscn") const Player = preload("res://Prefabs/player.tscn")
const PORT = 25565 const PORT = 25565
var enet_peer = ENetMultiplayerPeer.new() var enet_peer = ENetMultiplayerPeer.new()
var paused: bool = false
var chimkin
@export var spawnpoint: Vector3 = Vector3(0, 6.376, 0) @export var spawnpoint: Vector3 = Vector3(0, 6.376, 0)
func _unhandled_input(event): func _unhandled_input(event):
if Input.is_action_just_pressed("quit"): if Input.is_action_just_pressed("quit") and mainMenu.visible:
get_tree().quit() pause()
#get_tree().quit()
func pause():
if paused:
pauseMenu.hide()
else:
pauseMenu.show()
func _on_join_pressed(): func _on_join_pressed():
baseMenu.hide() baseMenu.hide()

Binary file not shown.

View File

@ -0,0 +1,19 @@
[remap]
importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://cfwx1moklfkfj"
path="res://.godot/imported/weapon_gun_1911_A_41.ogg-f33a234b3c6d44eef721749683361c47.oggvorbisstr"
[deps]
source_file="res://Sound Effects/weapon_gun_1911_A_41.ogg"
dest_files=["res://.godot/imported/weapon_gun_1911_A_41.ogg-f33a234b3c6d44eef721749683361c47.oggvorbisstr"]
[params]
loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4