diff --git a/Asset Sources/Props/BeerCan/BeerCan NOR.png b/Asset Sources/Props/BeerCan/BeerCan NOR.png index 47e2d26..2f823ce 100644 Binary files a/Asset Sources/Props/BeerCan/BeerCan NOR.png and b/Asset Sources/Props/BeerCan/BeerCan NOR.png differ diff --git a/Asset Sources/Props/BeerCan/BeerCan.blend b/Asset Sources/Props/BeerCan/BeerCan.blend index b393441..0ec3a1a 100644 Binary files a/Asset Sources/Props/BeerCan/BeerCan.blend and b/Asset Sources/Props/BeerCan/BeerCan.blend differ diff --git a/Asset Sources/Weapons/GrenadeLauncher/Grenade.blend b/Asset Sources/Weapons/GrenadeLauncher/Grenade.blend index 0b5c049..79cac04 100644 Binary files a/Asset Sources/Weapons/GrenadeLauncher/Grenade.blend and b/Asset Sources/Weapons/GrenadeLauncher/Grenade.blend differ diff --git a/Asset Sources/Weapons/GrenadeLauncher/GrenadeLauncher.blend b/Asset Sources/Weapons/GrenadeLauncher/GrenadeLauncher.blend index bac2902..0f90101 100644 Binary files a/Asset Sources/Weapons/GrenadeLauncher/GrenadeLauncher.blend and b/Asset Sources/Weapons/GrenadeLauncher/GrenadeLauncher.blend differ diff --git a/Asset Sources/Weapons/GrenadeLauncher/Grenade_Albedo.png b/Asset Sources/Weapons/GrenadeLauncher/Grenade_Albedo.png index 9985679..91c868a 100644 Binary files a/Asset Sources/Weapons/GrenadeLauncher/Grenade_Albedo.png and b/Asset Sources/Weapons/GrenadeLauncher/Grenade_Albedo.png differ diff --git a/Asset Sources/Weapons/GrenadeLauncher/Grenade_Emit.png b/Asset Sources/Weapons/GrenadeLauncher/Grenade_Emit.png index 9484a06..a3ee218 100644 Binary files a/Asset Sources/Weapons/GrenadeLauncher/Grenade_Emit.png and b/Asset Sources/Weapons/GrenadeLauncher/Grenade_Emit.png differ diff --git a/Asset Sources/Weapons/GrenadeLauncher/Grenade_Normal.png b/Asset Sources/Weapons/GrenadeLauncher/Grenade_Normal.png index d7efb08..e68fe2c 100644 Binary files a/Asset Sources/Weapons/GrenadeLauncher/Grenade_Normal.png and b/Asset Sources/Weapons/GrenadeLauncher/Grenade_Normal.png differ diff --git a/Asset Sources/Weapons/GrenadeLauncher/Grenade_ORM.png b/Asset Sources/Weapons/GrenadeLauncher/Grenade_ORM.png index 9e3fe20..cd6140c 100644 Binary files a/Asset Sources/Weapons/GrenadeLauncher/Grenade_ORM.png and b/Asset Sources/Weapons/GrenadeLauncher/Grenade_ORM.png differ diff --git a/Asset Sources/Weapons/Handgun/Handgun.blend b/Asset Sources/Weapons/Handgun/Handgun.blend index e0c8633..3693436 100644 Binary files a/Asset Sources/Weapons/Handgun/Handgun.blend and b/Asset Sources/Weapons/Handgun/Handgun.blend differ diff --git a/Game/.godot/editor/DM1.glb-9d0a731111d6eea69d0dd97fe5ed5e9b.scn-folding-d89f4159bb1e056098b23449bd56577b.cfg b/Game/.godot/editor/DM1.glb-9d0a731111d6eea69d0dd97fe5ed5e9b.scn-folding-d89f4159bb1e056098b23449bd56577b.cfg index 057b13d..e860dd4 100644 --- a/Game/.godot/editor/DM1.glb-9d0a731111d6eea69d0dd97fe5ed5e9b.scn-folding-d89f4159bb1e056098b23449bd56577b.cfg +++ b/Game/.godot/editor/DM1.glb-9d0a731111d6eea69d0dd97fe5ed5e9b.scn-folding-d89f4159bb1e056098b23449bd56577b.cfg @@ -1,3 +1,3 @@ [folding] -sections_unfolded=PackedStringArray( ) +sections_unfolded=PackedStringArray() diff --git a/Game/.godot/editor/Main.tscn-editstate-bcb0d2eb5949c52b6a65bfe9de3e985b.cfg b/Game/.godot/editor/Main.tscn-editstate-bcb0d2eb5949c52b6a65bfe9de3e985b.cfg index dd83539..3fa148e 100644 --- a/Game/.godot/editor/Main.tscn-editstate-bcb0d2eb5949c52b6a65bfe9de3e985b.cfg +++ b/Game/.godot/editor/Main.tscn-editstate-bcb0d2eb5949c52b6a65bfe9de3e985b.cfg @@ -4,10 +4,10 @@ Anim={ "visible": false } 2D={ -"grid_offset": Vector2( 0, 0 ), +"grid_offset": Vector2(0, 0), "grid_snap_active": false, -"grid_step": Vector2( 8, 8 ), -"ofs": Vector2( -165, -110 ), +"grid_step": Vector2(8, 8), +"ofs": Vector2(-165, -110), "primary_grid_steps": 8, "show_edit_locks": true, "show_grid": false, @@ -18,7 +18,6 @@ Anim={ "show_transformation_gizmos": true, "show_viewport": true, "show_zoom_control": true, -"skeleton_show_bones": true, "smart_snap_active": false, "snap_guides": true, "snap_node_anchors": true, @@ -39,7 +38,6 @@ Anim={ "fov": 70.0, "gizmos_status": { "AudioStreamPlayer3D": 0, -"BakedLightmap": 0, "CPUParticles3D": 0, "CSGShape3D": 0, "Camera3D": 0, @@ -47,11 +45,11 @@ Anim={ "CollisionPolygon3D": 0, "CollisionShape3D": 0, "Decal": 0, -"GIProbe": 0, "GPUParticles3D": 0, "GPUParticlesCollision3D": 0, "Joint3D": 0, "Light3D": 0, +"LightmapGI": 0, "LightmapProbe": 0, "NavigationRegion3D": 0, "OccluderInstance3D": 0, @@ -64,7 +62,8 @@ Anim={ "SoftBody3D": 0, "SpringArm3D": 0, "VehicleWheel3D": 0, -"VisibilityNotifier3D": 0 +"VisibleOnScreenNotifier3D": 0, +"VoxelGI": 0 }, "local_coords": false, "preview_sun_env": { @@ -73,14 +72,14 @@ Anim={ "environ_energy": 1.0, "environ_gi_enabled": false, "environ_glow_enabled": true, -"environ_ground_color": Color( 0.121569, 0.121569, 0.129412, 1 ), -"environ_sky_color": Color( 0.568627, 0.698039, 0.807843, 1 ), +"environ_ground_color": Color(0.121569, 0.121569, 0.129412, 1), +"environ_sky_color": Color(0.568627, 0.698039, 0.807843, 1), "environ_tonemap_enabled": true, -"sun_color": Color( 1, 1, 1, 1 ), +"sun_color": Color(1, 1, 1, 1), "sun_disabled": false, "sun_energy": 1.0, "sun_max_distance": 250.0, -"sun_rotation": Basis( -0.707107, -0.5, 0.5, 0, 0.707107, 0.707107, -0.707107, 0.5, -0.5 ) +"sun_rotation": Vector2(0, 0) }, "rotate_snap": 15.0, "scale_snap": 10.0, @@ -89,7 +88,7 @@ Anim={ "snap_enabled": true, "translate_snap": 1.0, "viewport_mode": 1, -"viewports": [ { +"viewports": [{ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, @@ -101,10 +100,10 @@ Anim={ "half_res": false, "information": false, "listener": true, -"position": Vector3( 11.5212, -1.69095, -7.72354 ), +"position": Vector3(11.5212, -1.69095, -7.72354), "use_environment": false, "use_orthogonal": false, -"view_name": "", +"view_type": 0, "x_rotation": 0.292419, "y_rotation": 7.13062 }, { @@ -119,10 +118,10 @@ Anim={ "half_res": false, "information": false, "listener": false, -"position": Vector3( 0, 0, 0 ), +"position": Vector3(0, 0, 0), "use_environment": false, "use_orthogonal": false, -"view_name": "", +"view_type": 0, "x_rotation": 0.5, "y_rotation": -0.5 }, { @@ -137,10 +136,10 @@ Anim={ "half_res": false, "information": false, "listener": false, -"position": Vector3( 0, 0, 0 ), +"position": Vector3(0, 0, 0), "use_environment": false, "use_orthogonal": false, -"view_name": "", +"view_type": 0, "x_rotation": 0.5, "y_rotation": -0.5 }, { @@ -155,19 +154,19 @@ Anim={ "half_res": false, "information": false, "listener": false, -"position": Vector3( 0, 0, 0 ), +"position": Vector3(0, 0, 0), "use_environment": false, "use_orthogonal": false, -"view_name": "", +"view_type": 0, "x_rotation": 0.5, "y_rotation": -0.5 -} ], +}], "zfar": 4000.0, "znear": 0.05 } TextureRegion={ "snap_mode": 0, -"snap_offset": Vector2( 0, 0 ), -"snap_separation": Vector2( 0, 0 ), -"snap_step": Vector2( 10, 10 ) +"snap_offset": Vector2(0, 0), +"snap_separation": Vector2(0, 0), +"snap_step": Vector2(10, 10) } diff --git a/Game/.godot/editor/Main.tscn-folding-bcb0d2eb5949c52b6a65bfe9de3e985b.cfg b/Game/.godot/editor/Main.tscn-folding-bcb0d2eb5949c52b6a65bfe9de3e985b.cfg index 0deb817..0cdfef8 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" ), NodePath("OmniLight3D"), PackedStringArray( "Light", "Omni", "Shadow" ), NodePath("DirectionalLight3D"), PackedStringArray( "Directional Shadow", "Light", "Shadow" ), NodePath("WorldEnvironment"), PackedStringArray( "environment" ), NodePath("Player/Head"), PackedStringArray( "Transform" ), NodePath("Player/Head/Camera3D"), PackedStringArray( "Transform" ), NodePath("Player/CollisionShape3D"), PackedStringArray( "shape" ), NodePath("Player/MeshInstance3D"), PackedStringArray( "mesh" ) ] -resource_unfolds=[ "res://Main.tscn::3", PackedStringArray( "Background", "Glow", "Glow/levels", "SDFGI", "Sky", "Tonemap", "Volumetric Fog", "Volumetric Fog/Temporal Reprojection", "sky" ), "res://Main.tscn::4", PackedStringArray( ), "res://Main.tscn::5", PackedStringArray( ), "res://Main.tscn::6", PackedStringArray( ) ] -nodes_folded=[ NodePath("Player"), NodePath("Player/Head") ] +node_unfolds=[NodePath("."), PackedStringArray("Process")] +resource_unfolds=["res://Map.tscn::GDScript_gjkl2", PackedStringArray()] +nodes_folded=[] diff --git a/Game/.godot/editor/create_recent.Node b/Game/.godot/editor/create_recent.Node index 252308e..9912989 100644 --- a/Game/.godot/editor/create_recent.Node +++ b/Game/.godot/editor/create_recent.Node @@ -1,5 +1,6 @@ +Timer +GPUParticles3D ReflectionProbe -BakedLightmap LightmapProbe OmniLight3D Node3D @@ -8,7 +9,6 @@ WorldEnvironment Camera3D MeshInstance3D CollisionShape3D -KinematicBody3D CSGBox3D CSGCombiner3D CSGTorus3D diff --git a/Game/.godot/editor/default_env.tres-folding-7cf3fd67ad9f55210191d77b582b8209.cfg b/Game/.godot/editor/default_env.tres-folding-7cf3fd67ad9f55210191d77b582b8209.cfg index 057b13d..e860dd4 100644 --- a/Game/.godot/editor/default_env.tres-folding-7cf3fd67ad9f55210191d77b582b8209.cfg +++ b/Game/.godot/editor/default_env.tres-folding-7cf3fd67ad9f55210191d77b582b8209.cfg @@ -1,3 +1,3 @@ [folding] -sections_unfolded=PackedStringArray( ) +sections_unfolded=PackedStringArray() diff --git a/Game/.godot/editor/editor_layout.cfg b/Game/.godot/editor/editor_layout.cfg index 35e4134..04616fd 100644 --- a/Game/.godot/editor/editor_layout.cfg +++ b/Game/.godot/editor/editor_layout.cfg @@ -10,26 +10,91 @@ dock_filesystem_file_list_display_mode=1 dock_split_2=0 dock_split_3=0 dock_hsplit_1=0 -dock_hsplit_2=179 -dock_hsplit_3=-176 +dock_hsplit_2=114 +dock_hsplit_3=-196 dock_hsplit_4=0 [EditorNode] -open_scenes=["res://Main.tscn", "res://Map.tscn", "res://Assets/Characters/Player.tscn"] +open_scenes=["res://Main.tscn", "res://Assets/HUD/HUD.tscn", "res://Map.tscn", "res://Assets/Characters/Player.tscn", "res://Assets/Effects/Gibs.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": 19, +"column": 40, "folded_lines": [], "h_scroll_position": 0, -"row": 76, -"scroll_position": 66.0, +"row": 3, +"scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -38,11 +103,11 @@ open_scripts=[{ "state": { "bookmarks": [], "breakpoints": [], -"column": 0, +"column": 27, "folded_lines": [], "h_scroll_position": 0, -"row": 141, -"scroll_position": 141.0, +"row": 158, +"scroll_position": 154.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -51,14 +116,14 @@ open_scripts=[{ "state": { "bookmarks": [], "breakpoints": [], -"column": 32, +"column": 0, "folded_lines": [], "h_scroll_position": 0, -"row": 76, -"scroll_position": 57.0, +"row": 7, +"scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" } }] -open_help=["LightmapProbe"] -split_offset=39 +open_help=["CharacterBody3D", "Engine", "LightmapProbe", "OS", "RigidBody3D"] +split_offset=18 diff --git a/Game/.godot/editor/filesystem_update4 b/Game/.godot/editor/filesystem_update4 index 3510f36..f395f89 100644 --- a/Game/.godot/editor/filesystem_update4 +++ b/Game/.godot/editor/filesystem_update4 @@ -1,4 +1,15 @@ -res://Assets/Shaders/Base.tres +res://Assets/Characters/Player.gd +res://Assets/Characters/Player.tscn +res://Assets/Effects/Gibs.gd +res://Assets/Effects/Gibs.tscn +res://Assets/Effects/ImpactPlayer.tscn +res://Assets/Effects/ImpactWall.tscn +res://Assets/Effects/MuzzleFlash.tscn +res://Assets/HUD/HUD.tscn +res://Assets/HUD/Theme.tres +res://Assets/Weapons/Handgun/Flash.tscn +res://Assets/Weapons/Weapon.gd +res://Main.gd res://Main.tscn -res://Player.gd +res://Map.tscn res://default_env.tres diff --git a/Game/.godot/editor/project_metadata.cfg b/Game/.godot/editor/project_metadata.cfg index 986be70..215797b 100644 --- a/Game/.godot/editor/project_metadata.cfg +++ b/Game/.godot/editor/project_metadata.cfg @@ -10,8 +10,8 @@ run_debug_instances=2 [recent_files] -scenes=["res://Main.tscn", "res://Assets/Characters/Player.tscn", "res://Assets/HUD/HUD.tscn", "res://Map.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", "res://Assets/Props/BeerCan.glb"] -scripts=["Dictionary", "RigidBody3D", "OS", "Node3D", "Node", "MultiplayerAPI", "MeshInstance3D", "Input", "Callable", "@GlobalScope"] +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"] [script_setup] diff --git a/Game/.godot/editor/recent_dirs b/Game/.godot/editor/recent_dirs index ed7df75..df12f6f 100644 --- a/Game/.godot/editor/recent_dirs +++ b/Game/.godot/editor/recent_dirs @@ -1,4 +1,3 @@ +res://Assets/Effects res://Assets/Maps/DM1 -res://Assets/Materials/ -res://Assets/Materials res:// diff --git a/Game/.godot/imported/DM1.glb-9d0a731111d6eea69d0dd97fe5ed5e9b.md5 b/Game/.godot/imported/DM1.glb-9d0a731111d6eea69d0dd97fe5ed5e9b.md5 index 9723a58..f152231 100644 --- a/Game/.godot/imported/DM1.glb-9d0a731111d6eea69d0dd97fe5ed5e9b.md5 +++ b/Game/.godot/imported/DM1.glb-9d0a731111d6eea69d0dd97fe5ed5e9b.md5 @@ -1,3 +1,3 @@ -source_md5="ce5f7f5df1790298675414be0f691d59" -dest_md5="0f2ecf7ca76edb18cd15678d57907521" +source_md5="4e5934d6814765401873169a2718dba3" +dest_md5="4a273f2e921918faafbc1e2eb88552ec" diff --git a/Game/.godot/imported/DM1.glb-9d0a731111d6eea69d0dd97fe5ed5e9b.scn b/Game/.godot/imported/DM1.glb-9d0a731111d6eea69d0dd97fe5ed5e9b.scn index 69a5ff2..9d9add8 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/Gibs.gd b/Game/Assets/Effects/Gibs.gd new file mode 100644 index 0000000..8b6a91f --- /dev/null +++ b/Game/Assets/Effects/Gibs.gd @@ -0,0 +1,20 @@ +extends CPUParticles3D + + +# Declare member variables here. Examples: +# var a = 2 +# var b = "text" + + +# Called when the node enters the scene tree for the first time. +func _ready(): + emitting = true + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +#func _process(delta): +# pass + + +func _on_Timer_timeout(): + queue_free() diff --git a/Game/Assets/Effects/Gibs.tscn b/Game/Assets/Effects/Gibs.tscn index f8b7ab7..a0e4e3c 100644 --- a/Game/Assets/Effects/Gibs.tscn +++ b/Game/Assets/Effects/Gibs.tscn @@ -1,4 +1,6 @@ -[gd_scene load_steps=4 format=3 uid="uid://egphnvwk6cg"] +[gd_scene load_steps=5 format=3 uid="uid://egphnvwk6cg"] + +[ext_resource type="Script" path="res://Assets/Effects/Gibs.gd" id="1_o0guu"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_3sp1q"] albedo_color = Color(0.509804, 0.0235294, 0, 1) @@ -28,4 +30,12 @@ spread = 180.0 initial_velocity_min = 1.0 initial_velocity_max = 4.0 scale_amount_curve = SubResource( "Curve_0e5oj" ) +script = ExtResource( "1_o0guu" ) + +[node name="Timer" type="Timer" parent="."] +wait_time = 5.0 +one_shot = true +autostart = true script = null + +[connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"] diff --git a/Game/Assets/HUD/Crosshair.png b/Game/Assets/HUD/Crosshair.png index 892681f..1f14945 100644 Binary files a/Game/Assets/HUD/Crosshair.png and b/Game/Assets/HUD/Crosshair.png differ diff --git a/Game/Assets/Maps/Materials/dev_materials/textures/dev_blue.png b/Game/Assets/Maps/Materials/dev_materials/textures/dev_blue.png index f81663b..7d09de9 100644 Binary files a/Game/Assets/Maps/Materials/dev_materials/textures/dev_blue.png and b/Game/Assets/Maps/Materials/dev_materials/textures/dev_blue.png differ diff --git a/Game/Assets/Maps/Materials/dev_materials/textures/dev_brown.png b/Game/Assets/Maps/Materials/dev_materials/textures/dev_brown.png index 4557bbd..cff4509 100644 Binary files a/Game/Assets/Maps/Materials/dev_materials/textures/dev_brown.png and b/Game/Assets/Maps/Materials/dev_materials/textures/dev_brown.png differ diff --git a/Game/Assets/Maps/Materials/dev_materials/textures/dev_green.png b/Game/Assets/Maps/Materials/dev_materials/textures/dev_green.png index 731d50c..744b6a4 100644 Binary files a/Game/Assets/Maps/Materials/dev_materials/textures/dev_green.png and b/Game/Assets/Maps/Materials/dev_materials/textures/dev_green.png differ diff --git a/Game/Assets/Maps/Materials/dev_materials/textures/dev_grey_dark.png b/Game/Assets/Maps/Materials/dev_materials/textures/dev_grey_dark.png index b9f2662..fe199a7 100644 Binary files a/Game/Assets/Maps/Materials/dev_materials/textures/dev_grey_dark.png and b/Game/Assets/Maps/Materials/dev_materials/textures/dev_grey_dark.png differ diff --git a/Game/Assets/Maps/Materials/dev_materials/textures/dev_grey_light.png b/Game/Assets/Maps/Materials/dev_materials/textures/dev_grey_light.png index 3c7fd94..3161c8c 100644 Binary files a/Game/Assets/Maps/Materials/dev_materials/textures/dev_grey_light.png and b/Game/Assets/Maps/Materials/dev_materials/textures/dev_grey_light.png differ diff --git a/Game/Assets/Maps/Materials/dev_materials/textures/dev_orange.png b/Game/Assets/Maps/Materials/dev_materials/textures/dev_orange.png index b9c24ae..fdf0a30 100644 Binary files a/Game/Assets/Maps/Materials/dev_materials/textures/dev_orange.png and b/Game/Assets/Maps/Materials/dev_materials/textures/dev_orange.png differ diff --git a/Game/Assets/Maps/Materials/dev_materials/textures/dev_red.png b/Game/Assets/Maps/Materials/dev_materials/textures/dev_red.png index 196e89b..d3f1f66 100644 Binary files a/Game/Assets/Maps/Materials/dev_materials/textures/dev_red.png and b/Game/Assets/Maps/Materials/dev_materials/textures/dev_red.png differ diff --git a/Game/Assets/Maps/Materials/dev_materials/textures/dev_red_dark.png b/Game/Assets/Maps/Materials/dev_materials/textures/dev_red_dark.png index 6ff1fb5..544c04f 100644 Binary files a/Game/Assets/Maps/Materials/dev_materials/textures/dev_red_dark.png and b/Game/Assets/Maps/Materials/dev_materials/textures/dev_red_dark.png differ diff --git a/Game/Assets/SFX/UI_Accept.wav b/Game/Assets/SFX/UI_Accept.wav index a969dd1..470c1c9 100644 Binary files a/Game/Assets/SFX/UI_Accept.wav and b/Game/Assets/SFX/UI_Accept.wav differ diff --git a/Game/Assets/SFX/UI_Cancel.wav b/Game/Assets/SFX/UI_Cancel.wav index f1ef54c..afd45b5 100644 Binary files a/Game/Assets/SFX/UI_Cancel.wav and b/Game/Assets/SFX/UI_Cancel.wav differ diff --git a/Game/Assets/SFX/UI_Click.wav b/Game/Assets/SFX/UI_Click.wav index e2e12c9..dc9bbf3 100644 Binary files a/Game/Assets/SFX/UI_Click.wav and b/Game/Assets/SFX/UI_Click.wav differ diff --git a/Game/Assets/SFX/UI_Confirm_Hit.wav b/Game/Assets/SFX/UI_Confirm_Hit.wav index efc85f8..ec83157 100644 Binary files a/Game/Assets/SFX/UI_Confirm_Hit.wav and b/Game/Assets/SFX/UI_Confirm_Hit.wav differ diff --git a/Game/Assets/SFX/UI_Confirm_Kill.wav b/Game/Assets/SFX/UI_Confirm_Kill.wav index d4f2083..7ea86d3 100644 Binary files a/Game/Assets/SFX/UI_Confirm_Kill.wav and b/Game/Assets/SFX/UI_Confirm_Kill.wav differ diff --git a/Game/Assets/SFX/UI_Hover.wav b/Game/Assets/SFX/UI_Hover.wav index 8b17c89..00fdf9c 100644 Binary files a/Game/Assets/SFX/UI_Hover.wav and b/Game/Assets/SFX/UI_Hover.wav differ diff --git a/Game/icon.png b/Game/icon.png index c98fbb6..0b4d74e 100644 Binary files a/Game/icon.png and b/Game/icon.png differ