diff options
| -rw-r--r-- | client/global.gd | 4 | ||||
| -rw-r--r-- | client/menu/blur_setup.gd | 4 | ||||
| -rw-r--r-- | client/settings.gd | 5 | ||||
| -rw-r--r-- | locale/en.ini | 51 |
4 files changed, 36 insertions, 28 deletions
diff --git a/client/global.gd b/client/global.gd index 6d41dc31..47d9da06 100644 --- a/client/global.gd +++ b/client/global.gd @@ -83,7 +83,7 @@ func _input(event): using_joypad_change.emit(using_joypad) # Update using_touch variable - if get_setting("ui.touch_controls") == 0: # Only if set to automatic + if get_setting("ui.touch_controls") == "automatic": # Only if set to automatic if event is InputEventScreenTouch or event is InputEventScreenDrag: if not using_touch: using_touch = true @@ -143,7 +143,7 @@ func get_setting(key: String): func set_setting_unchecked(key: String, value): value = value.duplicate(true) if value is Array else value - if key in settings and settings[key] == value: return + if key in settings and typeof(settings[key]) == typeof(value) and settings[key] == value: return settings[key] = value if Settings.change_hooks_display.get(key) != null: Settings.change_hooks_display.get(key).call(value) if Settings.change_hooks_apply.get(key) != null: Settings.change_hooks_apply.get(key).call(value) diff --git a/client/menu/blur_setup.gd b/client/menu/blur_setup.gd index b5b5dde9..b5f80540 100644 --- a/client/menu/blur_setup.gd +++ b/client/menu/blur_setup.gd @@ -16,8 +16,8 @@ extends Control func _ready(): - update(Global.get_setting("ui.blur")) - Settings.hook_changed("ui.blur", update) + update(Global.get_setting("graphics.ui_blur")) + Settings.hook_changed("graphics.ui_blur", update) func update(state): material.set_shader_parameter("enable_blur", state) diff --git a/client/settings.gd b/client/settings.gd index ade51262..bfa25a00 100644 --- a/client/settings.gd +++ b/client/settings.gd @@ -52,7 +52,7 @@ static func get_root(): RangeSetting.new("sfx_volume", 0, -30, 0), ]), SettingsCategory.new("ui", [ - DropdownSetting.new("touch_controls", 0, ["automatic", "enabled", "disabled"]), + DropdownSetting.new("touch_controls", "automatic", ["automatic", "enabled", "disabled"]), DropdownSetting.new("language", "system", Global.language_list()), DropdownSetting.new("scale_mode", "resize", ["resize", "disabled"]), RangeSetting.new("scale_factor", 1. if not Global.on_mobile() else 1.5, 0.5, 1.5, 3), @@ -110,7 +110,7 @@ static func h_taa(enabled): static func h_scale_mode(mode: String): match mode: - "scale": Global.get_tree().root.content_scale_mode = Window.CONTENT_SCALE_MODE_CANVAS_ITEMS + "resize": Global.get_tree().root.content_scale_mode = Window.CONTENT_SCALE_MODE_CANVAS_ITEMS "disabled": Global.get_tree().root.content_scale_mode = Window.CONTENT_SCALE_MODE_DISABLED static func h_scale_factor(value: float): @@ -127,7 +127,6 @@ static func h_touch(mode: String): Global.using_touch_change.emit() static func h_language(language: String): - print("STELANG ", language) if language == "system": language = OS.get_locale_language() TranslationServer.set_locale(language) diff --git a/locale/en.ini b/locale/en.ini index 3f094e84..441f2f8e 100644 --- a/locale/en.ini +++ b/locale/en.ini @@ -65,6 +65,10 @@ c.settings.gameplay.setup_completed=Initial setup complete. (Uncheck and restart c.settings.gameplay.tutorial_started=Tutorial started c.settings.gameplay.usernames=Show username tags c.settings.gameplay=Gameplay +c.settings.graphics.aa.disabled=Disabled +c.settings.graphics.aa.fx=FXAA +c.settings.graphics.aa.ms2x=MSAA 2x +c.settings.graphics.aa.ms4x=MSAA 4x c.settings.graphics.aa=Anti-aliasing c.settings.graphics.ao=Ambient occlusion c.settings.graphics.debug_info=Display debug info (Framerate, etc.) @@ -72,10 +76,10 @@ c.settings.graphics.fullscreen.always=Always c.settings.graphics.fullscreen.keep=Keep c.settings.graphics.fullscreen.never=Never c.settings.graphics.fullscreen=Fullscreen +c.settings.graphics.gi.disabled=Disabled c.settings.graphics.gi.sdfgi=SDFGI c.settings.graphics.gi.voxelgi=Voxel GI c.settings.graphics.gi=Global illumination -c.settings.graphics.ssao=Screen-space ambient occlusion (SSAO) c.settings.graphics.glow=Enable glow c.settings.graphics.grass_amount=3D grass amount per grass tile c.settings.graphics.lq_trees=Low-poly trees @@ -84,51 +88,56 @@ c.settings.graphics.preset.low=Low c.settings.graphics.preset.medium=Medium c.settings.graphics.preset=Load preset c.settings.graphics.shadows=Enable shadows +c.settings.graphics.ssao=Screen-space ambient occlusion (SSAO) c.settings.graphics.taa=Temporal Anti-Aliasing c.settings.graphics.ui_blur=Enable UI blur c.settings.graphics=Graphics c.settings.input.add=Add new +c.settings.input.backwards=Move Backwards +c.settings.input.boost=Boost movement +c.settings.input.chat=Toggle chat +c.settings.input.forwards=Move Forwards +c.settings.input.fullscreen=Toggle fullscreen +c.settings.input.interact=Interact +c.settings.input.join_spectate=Join/Spectate c.settings.input.joypad_axis=Joypad axis %s c.settings.input.joypad=%s (Joypad) c.settings.input.keyboard=%s (Keyboard) +c.settings.input.left=Move Left c.settings.input.mouse_button=Mouse button %s +c.settings.input.next=Select next item c.settings.input.other_event=Other event c.settings.input.press_any_key=Press any key... -c.settings.input.scroll_down=Scroll down -c.settings.input.scroll_up=Scroll up -c.settings.input.scroll_down_discrete=Scroll down (discrete) -c.settings.input.scroll_up_discrete=Scroll up (discrete) -c.settings.input.forwards=Move Forwards -c.settings.input.backwards=Move Backwards -c.settings.input.left=Move Left +c.settings.input.previous=Select previous item +c.settings.input.reset=Reset camera c.settings.input.right=Move Right +c.settings.input.rotate_down=Rotate camera down c.settings.input.rotate_left=Rotate camera left c.settings.input.rotate_right=Rotate camera right c.settings.input.rotate_up=Rotate camera up -c.settings.input.rotate_down=Rotate camera down -c.settings.input.interact=Interact -c.settings.input.boost=Boost movement -c.settings.input.zoom_in=Zoom in -c.settings.input.zoom_out=Zoom out +c.settings.input.scroll_down_discrete=Scroll down (discrete) +c.settings.input.scroll_down=Scroll down +c.settings.input.scroll_up_discrete=Scroll up (discrete) +c.settings.input.scroll_up=Scroll up +c.settings.input.start_game=Start game c.settings.input.zoom_in_discrete=Zoom in (discrete) +c.settings.input.zoom_in=Zoom in c.settings.input.zoom_out_discrete=Zoom out (discrete) -c.settings.input.chat=Toggle chat -c.settings.input.reset=Reset camera -c.settings.input.fullscreen=Toggle fullscreen -c.settings.input.previous=Select previous item -c.settings.input.next=Select next item -c.settings.input.start_game=Start game -c.settings.input.join_spectate=Join/Spectate +c.settings.input.zoom_out=Zoom out c.settings.input=Controls -c.settings.other.server_data=Server data directory (leave empty to auto-detect) c.settings.other.server_binary.placeholder=Enter path c.settings.other.server_binary=Server binary (leave empty to search PATH) +c.settings.other.server_data=Server data directory (leave empty to auto-detect) c.settings.other=Other c.settings.ui.language.system=System default c.settings.ui.language=Language c.settings.ui.scale_factor=UI scale factor c.settings.ui.scale_mode.resize=Resize +c.settings.ui.scale_mode.disabled=Disabled c.settings.ui.scale_mode=UI scale mode +c.settings.ui.touch_controls.automatic=Automatic +c.settings.ui.touch_controls.disabled=Disabled +c.settings.ui.touch_controls.enabled=Enabled c.settings.ui.touch_controls=Enable touch screen controls c.settings.ui=User interface c.settings.username=Username |