Merge branch 'main' of https://github.com/unfa/liblast into HEAD
commit
4da7fe7925
|
|
@ -0,0 +1,108 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="1920"
|
||||
height="1080"
|
||||
viewBox="0 0 507.99999 285.75001"
|
||||
version="1.1"
|
||||
id="svg856"
|
||||
inkscape:version="1.0.2 (e86c870879, 2021-01-15, custom)"
|
||||
sodipodi:docname="Vignette.svg"
|
||||
inkscape:export-filename="/data/Projects/Games/Liblast/Game/Assets/HUD/Vignette.png"
|
||||
inkscape:export-xdpi="96"
|
||||
inkscape:export-ydpi="96">
|
||||
<defs
|
||||
id="defs850">
|
||||
<filter
|
||||
inkscape:collect="always"
|
||||
style="color-interpolation-filters:sRGB"
|
||||
id="filter1509"
|
||||
x="-0.49932388"
|
||||
width="1.9986478"
|
||||
y="-0.49932388"
|
||||
height="1.9986478">
|
||||
<feGaussianBlur
|
||||
inkscape:collect="always"
|
||||
stdDeviation="165.18799"
|
||||
id="feGaussianBlur1511" />
|
||||
</filter>
|
||||
<mask
|
||||
maskUnits="userSpaceOnUse"
|
||||
id="mask1517">
|
||||
<g
|
||||
id="g1523"
|
||||
transform="matrix(3.7795276,0,0,3.7795276,-4294.4845,-4.57192e-5)">
|
||||
<rect
|
||||
style="opacity:1;fill:#ffffff;stroke-linecap:round;stroke-miterlimit:16;paint-order:markers stroke fill"
|
||||
id="rect1519"
|
||||
width="1920"
|
||||
height="1080"
|
||||
x="0"
|
||||
y="0"
|
||||
transform="matrix(0.26458333,0,0,0.26458333,1136.249,1.8e-6)" />
|
||||
<circle
|
||||
style="fill:#000000;stroke-linecap:round;stroke-miterlimit:16;paint-order:markers stroke fill;filter:url(#filter1509)"
|
||||
id="circle1521"
|
||||
cx="904.63379"
|
||||
cy="547.9386"
|
||||
transform="matrix(0.5253879,0,0,0.5253879,914.96538,-145.00531)"
|
||||
r="396.98801" />
|
||||
</g>
|
||||
</mask>
|
||||
</defs>
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="0.24748737"
|
||||
inkscape:cx="1507.5388"
|
||||
inkscape:cy="521.49705"
|
||||
inkscape:document-units="mm"
|
||||
inkscape:current-layer="layer1"
|
||||
inkscape:document-rotation="0"
|
||||
showgrid="false"
|
||||
units="px"
|
||||
inkscape:snap-page="true"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1006"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="0"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:pagecheckerboard="true"
|
||||
borderlayer="true" />
|
||||
<metadata
|
||||
id="metadata853">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1">
|
||||
<rect
|
||||
style="fill:#000000;stroke-linecap:round;stroke-miterlimit:16;paint-order:markers stroke fill"
|
||||
id="rect1419"
|
||||
width="1920"
|
||||
height="1080"
|
||||
x="0"
|
||||
y="0"
|
||||
transform="scale(0.26458333)"
|
||||
mask="url(#mask1517)" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 3.2 KiB |
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 164 KiB |
|
|
@ -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
|
||||
|
|
@ -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"]
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
Reference in New Issue