diff options
Diffstat (limited to 'client/menu')
| -rw-r--r-- | client/menu/lobby.gd | 13 | ||||
| -rw-r--r-- | client/menu/main.tscn | 2 | ||||
| -rw-r--r-- | client/menu/popup_message.gd | 5 | ||||
| -rw-r--r-- | client/menu/popup_message.tscn | 8 | ||||
| -rw-r--r-- | client/menu/scene_transition.gd | 2 | ||||
| -rw-r--r-- | client/menu/theme/font-azaret-mono.woff2.import | 1 | ||||
| -rw-r--r-- | client/menu/theme/font-josefin-sans.woff2.import | 1 | ||||
| -rw-r--r-- | client/menu/theme/font-sansita-swashed.woff2.import | 1 |
8 files changed, 25 insertions, 8 deletions
diff --git a/client/menu/lobby.gd b/client/menu/lobby.gd index a419c636..44afe9cf 100644 --- a/client/menu/lobby.gd +++ b/client/menu/lobby.gd @@ -39,7 +39,8 @@ var difficulty_names = [tr("Easy"), tr("Moderate"), tr("Hard"), tr("Very hard"), @onready var map_name_label = $HBoxContainer/Bottom/MarginContainer/VBoxContainer/HBoxContainer/Map/Name @onready var map_player_label = $HBoxContainer/Bottom/MarginContainer/VBoxContainer/HBoxContainer/Map/Players @onready var map_difficulty_label = $HBoxContainer/Bottom/MarginContainer/VBoxContainer/HBoxContainer/Map/Difficulty -@onready var map_list = $HBoxContainer/Bottom/MarginContainer/VBoxContainer/MapList/VBoxContainer +@onready var map_list_container = $HBoxContainer/Bottom/MarginContainer/VBoxContainer/MapList/VBoxContainer +@onready var map_list = $HBoxContainer/Bottom/MarginContainer/VBoxContainer/MapList @onready var map_selector = $HBoxContainer/Bottom/MarginContainer/VBoxContainer/HBoxContainer @onready var prev_map = $HBoxContainer/Bottom/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer/Left @@ -63,7 +64,7 @@ func _ready(): func initialize(): map_count = game.maps.size() - for c in map_list.get_children(): + for c in map_list_container.get_children(): c.queue_free() for c in bot_settings.get_children(): c.queue_free() @@ -75,7 +76,7 @@ func initialize(): b.text = "%s (%d)" % [m[1]["name"], m[1]["players"]] b.pressed.connect(select_map.bind(i)) b.focus_entered.connect(select_map.bind(i)) - map_list.add_child(b) + map_list_container.add_child(b) i += 1 select_map(0) @@ -112,7 +113,7 @@ func select_map(i: int): map_player_label.text = tr("%d players recommended") % map_data["players"] map_difficulty_label.text = difficulty_names[map_data["difficulty"] - 1] selected_map_name = game.maps[i][0] - map_list.get_child(i).grab_focus() + map_list_container.get_child(i).grab_focus() func increase_bot_count(algo_id: String): bot_counts[algo_id] = bot_counts[algo_id] + 1 @@ -153,10 +154,14 @@ func _input(_event): func _on_game_joined(): map_selector.show() + map_list.show() + bots_container.show() start_button.disabled = false func _on_game_left(): map_selector.hide() + map_list.hide() + bots_container.hide() start_button.disabled = true func _on_left_pressed(): diff --git a/client/menu/main.tscn b/client/menu/main.tscn index cee3003d..94726109 100644 --- a/client/menu/main.tscn +++ b/client/menu/main.tscn @@ -46,8 +46,8 @@ theme_override_constants/margin_bottom = 20 layout_mode = 2 [node name="title" type="Label" parent="side/margin/options"] +auto_translate_mode = 2 layout_mode = 2 -auto_translate = false theme_override_colors/font_outline_color = Color(0.566408, 0.208917, 0.266045, 1) theme_override_constants/outline_size = 10 theme_override_fonts/font = SubResource("FontVariation_htgmg") diff --git a/client/menu/popup_message.gd b/client/menu/popup_message.gd index 9293847b..86b0ee2b 100644 --- a/client/menu/popup_message.gd +++ b/client/menu/popup_message.gd @@ -155,3 +155,8 @@ func _on_join_while_running_timeout(): if not game.is_joined and not Global.get_hint("has_seen_join_while_running"): Global.set_hint("has_seen_join_while_running", true) display_hint_msg(tr("Press %s and click \"Join\" to join the game while it is running") % display_keybind(tr("ESCAPE"), tr("Menu button"))) + +func _on_performance_timeout() -> void: + if not Global.get_hint("has_seen_performance") and Engine.get_frames_per_second() < DisplayServer.screen_get_refresh_rate() * 0.75: + Global.set_hint("has_seen_performance", true) + display_hint_msg(tr("Your framerate seems to be low. You can lower your graphics settings in the settings menu.")) diff --git a/client/menu/popup_message.tscn b/client/menu/popup_message.tscn index 765ee345..0df38364 100644 --- a/client/menu/popup_message.tscn +++ b/client/menu/popup_message.tscn @@ -36,7 +36,7 @@ content_margin_bottom = 8.0 shader = ExtResource("3_2vnom") shader_parameter/blur_amount = 3.5 shader_parameter/mix_amount = 0.85 -shader_parameter/mix_amount_no_blur = null +shader_parameter/mix_amount_no_blur = 1.0 shader_parameter/color_over = Color(0, 0, 0, 1) shader_parameter/enable_blur = null @@ -81,6 +81,7 @@ layout_mode = 2 size_flags_vertical = 0 mouse_filter = 2 theme_override_styles/panel = SubResource("StyleBoxFlat_vq4dg") +script = ExtResource("4_pvwmw") [node name="CenterContainer" type="HBoxContainer" parent="VBox/HintMessage"] layout_mode = 2 @@ -122,6 +123,10 @@ one_shot = true wait_time = 2.0 one_shot = true +[node name="Performance" type="Timer" parent="AutoHintTimers"] +wait_time = 20.0 +one_shot = true + [node name="Boost" type="Timer" parent="AutoHintTimers"] wait_time = 90.0 one_shot = true @@ -153,6 +158,7 @@ one_shot = true [connection signal="timeout" from="ServerTimer" to="." method="_on_server_timer_timeout"] [connection signal="timeout" from="HintTimer" to="." method="_on_hint_timer_timeout"] [connection signal="timeout" from="AutoHintTimers/Move" to="." method="_on_move_timeout"] +[connection signal="timeout" from="AutoHintTimers/Performance" to="." method="_on_performance_timeout"] [connection signal="timeout" from="AutoHintTimers/Boost" to="." method="_on_boost_timeout"] [connection signal="timeout" from="AutoHintTimers/Interact" to="." method="_on_interact_timeout"] [connection signal="timeout" from="AutoHintTimers/RotateCamera" to="." method="_on_rotate_camera_timeout"] diff --git a/client/menu/scene_transition.gd b/client/menu/scene_transition.gd index 77bce326..9b6b1cac 100644 --- a/client/menu/scene_transition.gd +++ b/client/menu/scene_transition.gd @@ -22,8 +22,6 @@ extends Control var black = true var fading = false -signal close() - func _ready(): $ColorRect.visible = true diff --git a/client/menu/theme/font-azaret-mono.woff2.import b/client/menu/theme/font-azaret-mono.woff2.import index 4209452d..cafe1fbd 100644 --- a/client/menu/theme/font-azaret-mono.woff2.import +++ b/client/menu/theme/font-azaret-mono.woff2.import @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/font-azaret-mono.woff2-38a6d727215392526b2e0e Rendering=null antialiasing=1 generate_mipmaps=false +disable_embedded_bitmaps=true multichannel_signed_distance_field=false msdf_pixel_range=8 msdf_size=48 diff --git a/client/menu/theme/font-josefin-sans.woff2.import b/client/menu/theme/font-josefin-sans.woff2.import index 5ecd872c..03e086da 100644 --- a/client/menu/theme/font-josefin-sans.woff2.import +++ b/client/menu/theme/font-josefin-sans.woff2.import @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/font-josefin-sans.woff2-e2c3f263d98e1132cfe6a Rendering=null antialiasing=1 generate_mipmaps=false +disable_embedded_bitmaps=true multichannel_signed_distance_field=false msdf_pixel_range=8 msdf_size=48 diff --git a/client/menu/theme/font-sansita-swashed.woff2.import b/client/menu/theme/font-sansita-swashed.woff2.import index faf840fa..2d38716d 100644 --- a/client/menu/theme/font-sansita-swashed.woff2.import +++ b/client/menu/theme/font-sansita-swashed.woff2.import @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/font-sansita-swashed.woff2-323b4a2ee0671aba6e Rendering=null antialiasing=1 generate_mipmaps=false +disable_embedded_bitmaps=true multichannel_signed_distance_field=false msdf_pixel_range=8 msdf_size=48 |