diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-07-08 00:27:57 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-07-08 00:27:57 +0200 |
| commit | dcab9e81cd54ffd1d8619f080047add1dbfc7d18 (patch) | |
| tree | 1c3848b0e6c2751d68768627ed5d0aa3e608b3e9 | |
| parent | 6550c78d82efd9bd775e67e9699672cd1ffbbfc1 (diff) | |
| parent | a46a035b2684f0308ab81f173025007b6f902ff2 (diff) | |
| download | hurrycurry-dcab9e81cd54ffd1d8619f080047add1dbfc7d18.tar hurrycurry-dcab9e81cd54ffd1d8619f080047add1dbfc7d18.tar.bz2 hurrycurry-dcab9e81cd54ffd1d8619f080047add1dbfc7d18.tar.zst | |
Merge branch 'master' of https://codeberg.org/metamuffin/undercooked
| -rw-r--r-- | client/game.tscn | 2 | ||||
| -rw-r--r-- | client/global.gd | 8 | ||||
| -rw-r--r-- | data/maps/station.yaml | 14 |
3 files changed, 16 insertions, 8 deletions
diff --git a/client/game.tscn b/client/game.tscn index 618ab195..5c695811 100644 --- a/client/game.tscn +++ b/client/game.tscn @@ -8,7 +8,7 @@ [ext_resource type="Script" path="res://multiplayer.gd" id="6_fbxu8"] [ext_resource type="PackedScene" uid="uid://b4gone8fu53r7" path="res://map/map.tscn" id="6_prg6t"] [ext_resource type="PackedScene" uid="uid://bpikve6wlsjfl" path="res://menu/overlay.tscn" id="7_7xrr6"] -[ext_resource type="PackedScene" uid="uid://b21nrnkygiyjt" path="res://menu/server_message.tscn" id="9_l5d71"] +[ext_resource type="PackedScene" path="res://menu/server_message.tscn" id="9_l5d71"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_py7px"] ground_bottom_color = Color(0.0826605, 0.065772, 0.0461518, 1) diff --git a/client/global.gd b/client/global.gd index 2ee08c6b..3e46b1dc 100644 --- a/client/global.gd +++ b/client/global.gd @@ -37,6 +37,7 @@ var default_settings := { "usernames": ToggleSetting.new(tr("Show username tags"), false), "server_binary": TextSetting.new(tr("Server binary (leave empty to search PATH)"), "", tr("Enter path")), "server_data": TextSetting.new(tr("Server data directory (leave empty to auto-detect)"), "", tr("Enter path")), + "ui_scale": DropdownSetting.new(tr("UI scale"), 0, [tr("Resize"), tr("Disabled")]), "aa": DropdownSetting.new(tr("Anti-aliasing"), 2, [tr("Disabled"), "FXAA", "MSAA 2x", "MSAA 4x"]), "ssao": ToggleSetting.new(tr("Ambient occlusion"), true), "taa": ToggleSetting.new(tr("Temporal Anti-Aliasing"), false), @@ -109,6 +110,13 @@ func apply_settings(): get_viewport().use_taa = get_setting("taa") emit_signal("settings_changed") + + # UI scale + match get_setting("ui_scale"): + 0: + get_tree().root.content_scale_mode = Window.CONTENT_SCALE_MODE_CANVAS_ITEMS + 1: + get_tree().root.content_scale_mode = Window.CONTENT_SCALE_MODE_DISABLED func update_language(): var lang_idx: int = get_setting("language") diff --git a/data/maps/station.yaml b/data/maps/station.yaml index 70d76157..706e99d7 100644 --- a/data/maps/station.yaml +++ b/data/maps/station.yaml @@ -1,16 +1,16 @@ map: - "''''''''''''''''''''''''" - - "''''███████████████'''''" + - "''''██▒▒███▒▒██▒▒██'''''" - "_~__d.ct.w.ss█#ff#█'''''" - - "_!__d.ct.w...d...o█X_'''" - - "''X'█.ct.█████.p.o█X_'''" - - "''''█.ct.....w.p.o█X_'''" + - "_!__d.ct.w...d...o▒X_'''" + - "''X'█.ct.█████.p.o▒X_'''" + - "''''▒.ct.....w.p.o█X_'''" - "''''█.ct.....w.p..d__'''" - - "''''█.ct.....w.p.S██d██'" + - "''''▒.ct.....w.p.S██d██'" - "''''█.ct.....█.p.S█L.T█'" - - "''''█.ct.....d...S█R.F█'" + - "''''▒.ct.....d...S█R.F█'" - "''''█........█#CC#█ppp█'" - - "''''███████████████████'" + - "''''██▒▒▒▒▒▒███▒▒██████'" - "''''''''''''''''''''''''" - "________________________" - "________________________" |