Merge branch 'main' of ssh://git.gieszer.link:2222/unfa/liblast

remotes/1705377932733043820/tmp_refs/heads/unbroken
Jan Heemstra 2021-09-11 16:39:14 +02:00
commit 75c6657730
2 changed files with 4 additions and 38 deletions

View File

@ -223,6 +223,7 @@ __meta__ = {
}
[node name="RespawnCountdown" type="Label" parent="."]
visible = false
anchor_left = 0.5
anchor_right = 0.5
offset_left = -220.0
@ -246,8 +247,6 @@ anchor_bottom = 0.5
offset_left = -116.0
offset_top = -27.0
offset_bottom = 27.0
text = "SCORE: X
RANK: Y"
align = 2
valign = 1
structured_text_bidi_override_options = []

View File

@ -1,35 +1,9 @@
[gd_scene load_steps=12 format=3 uid="uid://b1078bn8gy2qf"]
[gd_scene load_steps=11 format=3 uid="uid://b1078bn8gy2qf"]
[ext_resource type="PackedScene" path="res://Assets/MapComponents/SpawnPoint.tscn" id="1"]
[ext_resource type="PackedScene" uid="uid://bfs2skkrik1xb" path="res://Assets/Props/BeerCan.glb" id="3"]
[ext_resource type="PackedScene" uid="uid://w476ulvte1f6" path="res://Assets/Maps/DM1/DM1.glb" id="6"]
[sub_resource type="GDScript" id="GDScript_gjkl2"]
script/source = "extends Node3D
# Declare member variables here. Examples:
# var a = 2
# var b = \"text\"
#var time := .0
# Called when the node enters the scene tree for the first time.
#func _ready():
# $ReflectionProbe.hide()
# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta):
# time += delta
# if round (time / 2.0) == 0:
# $ReflectionProbe.show()
# elif round (time / 1.0) == 0:
# $ReflectionProbe.hide()
func _on_Timer_timeout():
$ReflectionProbe.update_mode = ReflectionProbe.UPDATE_ONCE
"
[sub_resource type="PhysicalSkyMaterial" id="1"]
[sub_resource type="Sky" id="2"]
@ -94,7 +68,7 @@ dof_blur_amount = 1.0
override_exposure = 0.0
[node name="Map" type="Node3D"]
script = SubResource( "GDScript_gjkl2" )
script = null
[node name="OmniLight3D" type="OmniLight3D" parent="."]
transform = Transform3D(-0.462097, -0.0829879, -0.882938, -0.612372, 0.75, 0.25, 0.641457, 0.656211, -0.397392, 0.124393, 4.30152, -8.12432)
@ -130,6 +104,7 @@ script = null
[node name="ReflectionProbe" type="ReflectionProbe" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 13, -0.943157)
visible = false
update_mode = 1
extents = Vector3(39.3789, 13, 29)
box_projection = true
@ -137,12 +112,6 @@ enable_shadows = true
ambient_color = Color(1, 1, 1, 1)
script = null
[node name="Timer" type="Timer" parent="ReflectionProbe"]
wait_time = 5.0
one_shot = true
autostart = true
script = null
[node name="DM1" parent="." instance=ExtResource( "6" )]
[node name="StaticBody3D" type="StaticBody3D" parent="DM1/Main" index="0"]
@ -193,6 +162,4 @@ transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 30, 2.
[node name="BeerCan3" parent="." instance=ExtResource( "3" )]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 29.3, 2.6, 3.6)
[connection signal="timeout" from="ReflectionProbe/Timer" to="." method="_on_Timer_timeout"]
[editable path="DM1"]