From 7c73b9274f42e95c094717ca3c2550426b08a9f8 Mon Sep 17 00:00:00 2001 From: BigBrotherNii Date: Thu, 18 Jul 2024 00:41:28 +0200 Subject: minor improvement to the warning popup --- client/menu/setup.gd | 2 +- client/menu/warning_popup.tscn | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'client/menu') diff --git a/client/menu/setup.gd b/client/menu/setup.gd index 6e901b9c..470b0839 100644 --- a/client/menu/setup.gd +++ b/client/menu/setup.gd @@ -54,7 +54,7 @@ func _process(delta): func check(): if username.text == "": return "Username cannot be empty" var n = username.text.to_lower() - if n.begins_with("f") and n.ends_with("miller"): return "You are not Frank Miller" + if n.begins_with("f") and n.ends_with("miller"): return "You cannot choose that name.\n(It's too close to your boss')" if character == -1: return "You must select a hairstyle" return null diff --git a/client/menu/warning_popup.tscn b/client/menu/warning_popup.tscn index 784011b3..4fd2fbba 100644 --- a/client/menu/warning_popup.tscn +++ b/client/menu/warning_popup.tscn @@ -37,6 +37,7 @@ theme_override_constants/separation = 16 [node name="Message" type="Label" parent="CenterContainer/Panel/MarginContainer/VBoxContainer"] layout_mode = 2 text = "You must fill out all requested fields." +horizontal_alignment = 1 [node name="HBoxContainer" type="HBoxContainer" parent="CenterContainer/Panel/MarginContainer/VBoxContainer"] layout_mode = 2 -- cgit v1.2.3-70-g09d2 From c6e90b3326cb35c7cd1dab520180a1d331b6e312 Mon Sep 17 00:00:00 2001 From: nokoe Date: Thu, 18 Jul 2024 11:13:45 +0200 Subject: add glow setting --- client/global.gd | 1 + client/map/auto_setup/environment_setup.gd | 3 ++- client/menu/menu.gd | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'client/menu') diff --git a/client/global.gd b/client/global.gd index e3fe9000..8fd9e399 100644 --- a/client/global.gd +++ b/client/global.gd @@ -55,6 +55,7 @@ var default_settings := { "voxel_gi": ToggleSetting.new(tr("Use VoxelGI (Blocks the game on map update but is more accurate)"), false), "sdfgi": ToggleSetting.new(tr("Use SDFGI (Doesn't block the game but produces more artifacts)"), false), "shadows": ToggleSetting.new(tr("Enable shadows"), true), + "glow": ToggleSetting.new(tr("Enable glow"), true), "debug_info": ToggleSetting.new(tr("Display debug info (Framerate, etc.)"), false), "grass_amount": RangeSetting.new(tr("3D grass amount per grass tile"), 16, 0, 32), "setup_complete": ToggleSetting.new(tr("Initial setup complete. (Uncheck and restart to reenter)"), false), diff --git a/client/map/auto_setup/environment_setup.gd b/client/map/auto_setup/environment_setup.gd index 323a7f04..96feb86b 100644 --- a/client/map/auto_setup/environment_setup.gd +++ b/client/map/auto_setup/environment_setup.gd @@ -24,4 +24,5 @@ func _ready(): func apply_settings(): environment.ssao_enabled = Global.get_setting("ssao") - environment.sdfgi_enabled = Global.get_setting("sdfgi") if allow_sdfgi else false + environment.sdfgi_enabled = Global.get_setting("sdfgi") and allow_sdfgi + environment.glow_enabled = Global.get_setting("glow") diff --git a/client/menu/menu.gd b/client/menu/menu.gd index d2da3529..6dd48fca 100644 --- a/client/menu/menu.gd +++ b/client/menu/menu.gd @@ -51,13 +51,13 @@ func menu_anim_cover(_state: bool): pass var popup: Menu = null -func submenu(path: String, data = null): +func submenu(path: String, data_ = null): var prev_focus = Global.focused_node if popup != null: return _disable_recursive(self, true) await menu_anim_cover(true) popup = load(path).instantiate() - popup.data = data + popup.data = data_ add_child(popup) print("Submenu opened ", path) await submenu_close -- cgit v1.2.3-70-g09d2