diff --git a/Asset Sources/HUD/Vignette.svg b/Asset Sources/HUD/Vignette.svg new file mode 100644 index 0000000..da1de94 --- /dev/null +++ b/Asset Sources/HUD/Vignette.svg @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/Game/Assets/Characters/Player.gd b/Game/Assets/Characters/Player.gd index 1da776e..ab09bea 100644 --- a/Game/Assets/Characters/Player.gd +++ b/Game/Assets/Characters/Player.gd @@ -78,7 +78,7 @@ func _input(event) -> void: tween.remove_all() tween.interpolate_property(self, "view_zoom", view_zoom, 1.0, 0.25, Tween.TRANS_SINE, Tween.EASE_IN_OUT) tween.start() - + aim(event) func _physics_process(delta): @@ -148,8 +148,7 @@ func _physics_process(delta): # climb_tween.interpolate_property(body, "shape/translation.y", body.translation.y, body.translation.y - (climb / 2), 1, Tween.TRANS_LINEAR, Tween.EASE_IN_OUT) # climb_tween.start() - - if not is_on_floor(): # while in mid-air collisions affect momentum + if not is_on_floor() and not ground_check.is_colliding(): # while in mid-air collisions affect momentum velocity.x = slide.x velocity.z = slide.z gravity_vec.y = slide.y diff --git a/Game/Assets/Characters/Player.tscn b/Game/Assets/Characters/Player.tscn index b08dec4..4a98b29 100644 --- a/Game/Assets/Characters/Player.tscn +++ b/Game/Assets/Characters/Player.tscn @@ -33,6 +33,9 @@ current = true fov = 90.0 script = null +[node name="Tween" type="Tween" parent="Head/Camera"] +script = null + [node name="Hand" type="Node3D" parent="Head/Camera"] script = null diff --git a/Game/Assets/HUD/Vignette.png b/Game/Assets/HUD/Vignette.png new file mode 100644 index 0000000..293a311 Binary files /dev/null and b/Game/Assets/HUD/Vignette.png differ diff --git a/Game/Assets/HUD/Vignette.png.import b/Game/Assets/HUD/Vignette.png.import new file mode 100644 index 0000000..6152e18 --- /dev/null +++ b/Game/Assets/HUD/Vignette.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture2D" +path="res://.godot/imported/Vignette.png-91c9a8d7fb2c16e38f32b60a556ba3a5.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/HUD/Vignette.png" +dest_files=[ "res://.godot/imported/Vignette.png-91c9a8d7fb2c16e38f32b60a556ba3a5.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=0 +compress/channel_pack=0 +compress/streamed=false +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/invert_color=false +process/HDR_as_SRGB=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 diff --git a/Game/Main.tscn b/Game/Main.tscn index 672a365..efeabe0 100644 --- a/Game/Main.tscn +++ b/Game/Main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=15 format=2] +[gd_scene load_steps=17 format=2] [ext_resource path="res://Assets/Characters/Player.tscn" type="PackedScene" id=1] [ext_resource path="res://Assets/HUD/Crosshair.png" type="Texture2D" id=2] @@ -6,6 +6,8 @@ [ext_resource path="res://Assets/HUD/Crosshair.gd" type="Script" id=4] [ext_resource path="res://Assets/SFX/UI_Confirm_Hit.wav" type="AudioStream" id=5] [ext_resource path="res://Assets/SFX/UI_Confirm_Kill.wav" type="AudioStream" id=6] +[ext_resource path="res://Assets/Props/BeerCan.tscn" type="PackedScene" id=7] +[ext_resource path="res://Assets/HUD/Vignette.png" type="Texture2D" id=8] [sub_resource type="PhysicalSkyMaterial" id=1] @@ -59,7 +61,6 @@ tracks/0/keys = { } [sub_resource type="Animation" id=7] -resource_name = "Hit" length = 0.2 step = 0.05 tracks/0/type = "value" @@ -90,7 +91,6 @@ tracks/1/keys = { } [sub_resource type="Animation" id=8] -resource_name = "Kill" length = 0.5 step = 0.05 tracks/0/type = "value" @@ -170,7 +170,6 @@ __meta__ = { } [node name="Crosshair" type="TextureRect" parent="HUD/Crosshair"] -modulate = Color( 1, 0.716667, 0, 1 ) texture_filter = 2 anchor_left = 0.5 anchor_top = 0.5 @@ -200,6 +199,17 @@ script = null stream = ExtResource( 6 ) script = null +[node name="Vignette" type="TextureRect" parent="HUD"] +anchor_right = 1.0 +anchor_bottom = 1.0 +texture = ExtResource( 8 ) +expand = true +stretch_mode = 7 +script = null +__meta__ = { +"_edit_use_anchors_": false +} + [node name="Player" parent="." instance=ExtResource( 1 )] [node name="ReflectionProbe" type="ReflectionProbe" parent="."] @@ -209,4 +219,7 @@ box_projection = true enable_shadows = true script = null +[node name="BeerCan" parent="." instance=ExtResource( 7 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 22, 11, -3 ) + [editable path="DM1"] diff --git a/Game/project.godot b/Game/project.godot index 51d2bb0..8a2cb1e 100644 --- a/Game/project.godot +++ b/Game/project.godot @@ -100,4 +100,5 @@ weapon_3={ global_illumination/sdfgi/probe_ray_count=2 global_illumination/sdfgi/frames_to_converge=0 global_illumination/sdfgi/frames_to_update_lights=4 +anti_aliasing/quality/use_debanding=true environment/defaults/default_environment="res://default_env.tres"