Added respawn countdown display and commited some updated scene formats
parent
c5ab13fd17
commit
b59c8ed790
|
|
@ -253,7 +253,7 @@ func _physics_process(delta):
|
|||
elif jetpack_fuel < jetpack_tank:
|
||||
jetpack_fuel = min(jetpack_tank, jetpack_fuel + jetpack_recharge * delta)
|
||||
|
||||
print("Jetpack fuel: ", jetpack_fuel, " active: ", jetpack_active, " delta: ", delta, " gravity vec: ", gravity_vec)
|
||||
#print("Jetpack fuel: ", jetpack_fuel, " active: ", jetpack_active, " delta: ", delta, " gravity vec: ", gravity_vec)
|
||||
|
||||
if direction.length() > 0: # normalized() will return a null
|
||||
direction = direction.normalized()
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
extends Control
|
||||
|
||||
@onready var main = get_tree().get_root().get_node("Main")
|
||||
|
||||
# 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():
|
||||
pass # Replace with function body.
|
||||
|
||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||
func _process(delta):
|
||||
# if main.local_player == null: # player is dead ATM
|
||||
# print("local_player is null; PID is ", get_tree().multiplayer.get_network_unique_id(),"; respawn queue: ", main.respawn_queue)
|
||||
if main.spawn_queue.has(get_tree().multiplayer.get_network_unique_id()):
|
||||
var countdown = main.spawn_queue[get_tree().multiplayer.get_network_unique_id()] - main.uptime
|
||||
# countdown = round(countdown * 10) / 10
|
||||
$RespawnCountdown.text = "RESPAWNING IN " + str("%1.2f" % countdown) + " SECONDS..."
|
||||
$RespawnCountdown.visible = true
|
||||
else:
|
||||
$RespawnCountdown.visible = false
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
[gd_scene load_steps=11 format=3 uid="uid://bff5uslrxesjx"]
|
||||
[gd_scene load_steps=12 format=3 uid="uid://bff5uslrxesjx"]
|
||||
|
||||
[ext_resource type="Texture2D" uid="uid://blnjjtjifk22i" path="res://Assets/HUD/Vignette.png" id="1"]
|
||||
[ext_resource type="Script" path="res://Assets/HUD/HUD.gd" id="1_wc430"]
|
||||
[ext_resource type="Texture2D" uid="uid://cvckx0ssydl4d" path="res://Assets/HUD/Crosshair.png" id="2"]
|
||||
[ext_resource type="AudioStream" uid="uid://bomutmdekfv3m" path="res://Assets/SFX/UI_Confirm_Kill.wav" id="3"]
|
||||
[ext_resource type="AudioStream" uid="uid://184gasqdlb20" path="res://Assets/SFX/UI_Confirm_Hit.wav" id="4"]
|
||||
|
|
@ -87,7 +88,7 @@ tracks/1/keys = {
|
|||
[node name="HUD" type="Control"]
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
script = null
|
||||
script = ExtResource( "1_wc430" )
|
||||
__meta__ = {
|
||||
"_edit_use_anchors_": false
|
||||
}
|
||||
|
|
@ -221,4 +222,20 @@ __meta__ = {
|
|||
"_edit_use_anchors_": false
|
||||
}
|
||||
|
||||
[node name="RespawnCountdown" type="Label" parent="."]
|
||||
anchor_left = 0.5
|
||||
anchor_right = 0.5
|
||||
offset_left = -220.0
|
||||
offset_right = 220.0
|
||||
offset_bottom = 221.0
|
||||
theme_override_font_sizes/font_size = 32
|
||||
text = "RESPAWNING IN 5.0 seconds"
|
||||
align = 1
|
||||
valign = 1
|
||||
structured_text_bidi_override_options = []
|
||||
script = null
|
||||
__meta__ = {
|
||||
"_edit_use_anchors_": false
|
||||
}
|
||||
|
||||
[connection signal="text_submitted" from="Chat/VBoxContainer/Typing/Editor" to="Chat" method="_on_Editor_text_submitted"]
|
||||
|
|
|
|||
|
|
@ -1,38 +1,38 @@
|
|||
[gd_resource type="Theme" load_steps=10 format=3 uid="uid://ddtu7o1dbp0s8"]
|
||||
|
||||
[ext_resource type="FontData" uid="uid://sv606h1wylsm" path="res://Assets/Fonts/Liberation Sans/LiberationSans-Italic.ttf" id="1"]
|
||||
[ext_resource type="FontData" uid="uid://dedcmqi18s2mk" path="res://Assets/Fonts/Liberation Sans/LiberationSans-Bold.ttf" id="2"]
|
||||
[ext_resource type="FontData" uid="uid://vokxbnewve4p" path="res://Assets/Fonts/Liberation Sans/LiberationMono-Regular.ttf" id="3"]
|
||||
[ext_resource type="FontData" uid="uid://y4ub4mqw3ok4" path="res://Assets/Fonts/Liberation Sans/LiberationSans-Regular.ttf" id="4"]
|
||||
[ext_resource type="FontData" uid="uid://bvp75f670ewmh" path="res://Assets/Fonts/Liberation Sans/LiberationSans-Italic.ttf" id="1"]
|
||||
[ext_resource type="FontData" uid="uid://bu513u0hckm6v" path="res://Assets/Fonts/Liberation Sans/LiberationSans-Bold.ttf" id="2"]
|
||||
[ext_resource type="FontData" uid="uid://c1efeg0l6epya" path="res://Assets/Fonts/Liberation Sans/LiberationMono-Regular.ttf" id="3"]
|
||||
[ext_resource type="FontData" uid="uid://dm2ua4ixk71jw" path="res://Assets/Fonts/Liberation Sans/LiberationSans-Regular.ttf" id="4"]
|
||||
|
||||
[sub_resource type="Font" id="Font_prcom"]
|
||||
[sub_resource type="Font" id="Font_5hkhv"]
|
||||
variation_coordinates = {
|
||||
}
|
||||
data/0 = ExtResource( "2" )
|
||||
|
||||
[sub_resource type="Font" id="Font_o6jis"]
|
||||
[sub_resource type="Font" id="Font_tn7wr"]
|
||||
variation_coordinates = {
|
||||
}
|
||||
data/0 = ExtResource( "1" )
|
||||
|
||||
[sub_resource type="Font" id="Font_xvs2n"]
|
||||
[sub_resource type="Font" id="Font_58xsl"]
|
||||
variation_coordinates = {
|
||||
}
|
||||
data/0 = ExtResource( "1" )
|
||||
|
||||
[sub_resource type="Font" id="Font_i54w7"]
|
||||
[sub_resource type="Font" id="Font_eosbb"]
|
||||
variation_coordinates = {
|
||||
}
|
||||
data/0 = ExtResource( "3" )
|
||||
|
||||
[sub_resource type="Font" id="Font_px26m"]
|
||||
[sub_resource type="Font" id="Font_m8svi"]
|
||||
variation_coordinates = {
|
||||
}
|
||||
data/0 = ExtResource( "4" )
|
||||
|
||||
[resource]
|
||||
RichTextLabel/fonts/bold_font = SubResource( "Font_prcom" )
|
||||
RichTextLabel/fonts/bold_italics_font = SubResource( "Font_o6jis" )
|
||||
RichTextLabel/fonts/italics_font = SubResource( "Font_xvs2n" )
|
||||
RichTextLabel/fonts/mono_font = SubResource( "Font_i54w7" )
|
||||
RichTextLabel/fonts/normal_font = SubResource( "Font_px26m" )
|
||||
RichTextLabel/fonts/bold_font = SubResource( "Font_5hkhv" )
|
||||
RichTextLabel/fonts/bold_italics_font = SubResource( "Font_tn7wr" )
|
||||
RichTextLabel/fonts/italics_font = SubResource( "Font_58xsl" )
|
||||
RichTextLabel/fonts/mono_font = SubResource( "Font_eosbb" )
|
||||
RichTextLabel/fonts/normal_font = SubResource( "Font_m8svi" )
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
[gd_scene load_steps=5 format=3 uid="uid://o68cawatyat2"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://b1078bn8gy2qf" path="res://Map.tscn" id="1"]
|
||||
[ext_resource type="PackedScene" uid="uid://b856vwmg8a6o4" path="res://Assets/UI/GUI.tscn" id="2"]
|
||||
[ext_resource type="PackedScene" path="res://Assets/UI/GUI.tscn" id="2"]
|
||||
[ext_resource type="Script" path="res://Main.gd" id="3"]
|
||||
[ext_resource type="PackedScene" uid="uid://bff5uslrxesjx" path="res://Assets/HUD/HUD.tscn" id="4"]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
[gd_scene load_steps=12 format=3 uid="uid://b1078bn8gy2qf"]
|
||||
|
||||
[ext_resource type="PackedScene" path="res://Assets/MapComponents/SpawnPoint.tscn" id="1"]
|
||||
[ext_resource type="PackedScene" uid="uid://831g53oe7qt8" path="res://Assets/Props/BeerCan.glb" id="3"]
|
||||
[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"]
|
||||
|
|
|
|||
Reference in New Issue