Compare commits
No commits in common. "bc2aa0ba2c8fc6c1f3c5859b41f162046714ab18" and "921db0e9eb92d59912d0bff2445b754a29aae61f" have entirely different histories.
bc2aa0ba2c
...
921db0e9eb
5 changed files with 8 additions and 34 deletions
|
@ -200,7 +200,7 @@ tracks/0/keys = {
|
|||
"times": PackedFloat32Array(0, 0.7, 2),
|
||||
"transitions": PackedFloat32Array(1, 1, 1),
|
||||
"update": 0,
|
||||
"values": [Vector2(0, 35), Vector2(120, 36.868), Vector2(330, 72)]
|
||||
"values": [Vector2(92.1386, 36.868), Vector2(120, 36.868), Vector2(330, 72)]
|
||||
}
|
||||
tracks/1/type = "value"
|
||||
tracks/1/imported = false
|
||||
|
@ -485,15 +485,6 @@ libraries = {
|
|||
&"": SubResource("AnimationLibrary_wuihg")
|
||||
}
|
||||
|
||||
[node name="fps_label" type="Label" parent="hud"]
|
||||
visible = false
|
||||
offset_left = 1028.0
|
||||
offset_top = 12.0
|
||||
offset_right = 1117.0
|
||||
offset_bottom = 56.0
|
||||
theme_override_font_sizes/font_size = 28
|
||||
text = "60 FPS"
|
||||
|
||||
[node name="Camera2D" type="Camera2D" parent="."]
|
||||
|
||||
[node name="cars" type="Node" parent="."]
|
||||
|
|
|
@ -321,18 +321,11 @@ scale = Vector2(2, 2)
|
|||
theme_override_constants/outline_size = 10
|
||||
text = "Fullscreen"
|
||||
|
||||
[node name="btn_reset_players" type="Button" parent="MenuDisplay"]
|
||||
offset_left = 800.0
|
||||
offset_top = 600.0
|
||||
offset_right = 912.0
|
||||
offset_bottom = 631.0
|
||||
text = "Reset Players"
|
||||
|
||||
[node name="btn_save_whitelist" type="Button" parent="MenuDisplay"]
|
||||
offset_left = 940.0
|
||||
offset_top = 600.0
|
||||
offset_right = 1089.0
|
||||
offset_bottom = 631.0
|
||||
offset_left = 936.0
|
||||
offset_top = 605.0
|
||||
offset_right = 1085.0
|
||||
offset_bottom = 636.0
|
||||
text = "Save Key Whitelist"
|
||||
|
||||
[node name="map_container" type="HFlowContainer" parent="MenuDisplay"]
|
||||
|
@ -433,8 +426,7 @@ text = "Hold Button to join"
|
|||
wait_time = 5.0
|
||||
|
||||
[connection signal="toggled" from="MenuDisplay/btn_fullscreen" to="." method="_on_btn_fullscreen_toggled"]
|
||||
[connection signal="pressed" from="MenuDisplay/btn_reset_players" to="." method="_on_btn_reset_players_pressed"]
|
||||
[connection signal="pressed" from="MenuDisplay/btn_save_whitelist" to="." method="_on_btn_save_whitelist_pressed"]
|
||||
[connection signal="pressed" from="MenuDisplay/btn_save_whitelist" to="." method="_on_button_pressed"]
|
||||
[connection signal="map_changed" from="MenuDisplay/map_container" to="." method="_on_map_container_map_changed"]
|
||||
[connection signal="item_selected" from="MenuDisplay/rounds_selection" to="." method="_on_rounds_selection_item_selected"]
|
||||
[connection signal="item_selected" from="MenuDisplay/rounds_selection" to="MenuDisplay/rounds_selection" method="_on_item_selected"]
|
||||
|
|
|
@ -16,7 +16,6 @@ extends Node2D
|
|||
@onready var highscore_label: Label = $hud/highscore_label
|
||||
@onready var splittime_label: Label = $hud/splittime_label
|
||||
|
||||
@onready var fps_label: Label = $hud/fps_label
|
||||
|
||||
|
||||
const caroffset= 32+4 #space cars on start line
|
||||
|
@ -119,7 +118,6 @@ func custom_array_sort_rank(a, b):
|
|||
|
||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||
func _process(delta: float) -> void:
|
||||
fps_label.text=str(round(1.0/delta))
|
||||
if running:
|
||||
Gamestate.addTimeElapsed(delta)
|
||||
#if !countdown.is_stopped():
|
||||
|
|
|
@ -35,7 +35,7 @@ func getFastModeChance():
|
|||
|
||||
func getRounds() -> int:
|
||||
if rounds<=0: #if no rounds setting configured, use from config file
|
||||
var loadedRounds:int=ConfigFileHandler.get_general_setting("rounds")
|
||||
var loadedRounds:int=ConfigFileHandler.get_general_setting("rounds")-1
|
||||
if loadedRounds>0:
|
||||
rounds=loadedRounds
|
||||
return rounds
|
||||
|
|
|
@ -134,15 +134,8 @@ func _on_map_container_map_changed() -> void:
|
|||
$Timer.start()
|
||||
|
||||
|
||||
func _on_btn_save_whitelist_pressed() -> void:
|
||||
func _on_button_pressed() -> void:
|
||||
if len(Gamestate.getPlayerkeys())>=1:
|
||||
var _playerkeys=Gamestate.getPlayerkeys()
|
||||
print("Keys ="+str(_playerkeys))
|
||||
ConfigFileHandler.save_keywhitelist_setting(_playerkeys)
|
||||
|
||||
func _on_btn_reset_players_pressed() -> void:
|
||||
removeAssignedKeys()
|
||||
Gamestate.removeAllPlayers()
|
||||
$Timer.stop()
|
||||
$MenuDisplay.update_playerlist(Gamestate.players)
|
||||
print("Removed players")
|
||||
|
|
Loading…
Add table
Reference in a new issue