diff options
39 files changed, 72 insertions, 72 deletions
diff --git a/client/menu/blur_setup.gd b/client/menu/auto_setup/blur_setup.gd index 9d55a9d4..9d55a9d4 100644 --- a/client/menu/blur_setup.gd +++ b/client/menu/auto_setup/blur_setup.gd diff --git a/client/menu/character.tscn b/client/menu/character.tscn index 648051e5..bc4e1663 100644 --- a/client/menu/character.tscn +++ b/client/menu/character.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=11 format=3 uid="uid://1f7xpirm5d28"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_ak2pw"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_ak2pw"] [ext_resource type="Script" path="res://menu/character.gd" id="1_brhd1"] [ext_resource type="PackedScene" uid="uid://b4gone8fu53r7" path="res://map/map.tscn" id="3_6mc88"] [ext_resource type="PackedScene" uid="uid://b3hhir2fvnunu" path="res://player/character/character.tscn" id="3_odq7n"] diff --git a/client/menu/communicate/chat/chat_message.tscn b/client/menu/communicate/chat/chat_message.tscn index 06a9311e..d4db3f5d 100644 --- a/client/menu/communicate/chat/chat_message.tscn +++ b/client/menu/communicate/chat/chat_message.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://bpc2qgsvcafhe"] [ext_resource type="Script" path="res://menu/communicate/chat/chat_message.gd" id="1_ey0qp"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_rx6vg"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_rx6vg"] [sub_resource type="FontVariation" id="FontVariation_jfhbh"] variation_embolden = 1.3 diff --git a/client/menu/communicate/chat/chat_open.tscn b/client/menu/communicate/chat/chat_open.tscn index 0247a1ca..8830c4f7 100644 --- a/client/menu/communicate/chat/chat_open.tscn +++ b/client/menu/communicate/chat/chat_open.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=7 format=3 uid="uid://dbd6k56l4p0ls"] [ext_resource type="Script" path="res://menu/communicate/chat/chat_open.gd" id="1_dsl4a"] -[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/dark_blur_material.tres" id="1_isqmk"] -[ext_resource type="Script" path="res://menu/blur_setup.gd" id="2_urbd2"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="3_v7xmg"] +[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="1_isqmk"] +[ext_resource type="Script" path="res://menu/auto_setup/blur_setup.gd" id="2_urbd2"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="3_v7xmg"] [ext_resource type="StyleBox" uid="uid://bw4jamyna1top" path="res://menu/theme/style/panel_style_sidebar.tres" id="4_ew1yx"] [ext_resource type="Script" path="res://menu/scroll_container_custom.gd" id="5_3mths"] diff --git a/client/menu/communicate/chat/chat_preview.tscn b/client/menu/communicate/chat/chat_preview.tscn index 4cc39e00..e1cac207 100644 --- a/client/menu/communicate/chat/chat_preview.tscn +++ b/client/menu/communicate/chat/chat_preview.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=5 format=3 uid="uid://xcxbmynn8mhi"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_x8ock"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_x8ock"] [ext_resource type="Script" path="res://menu/communicate/chat/chat_preview.gd" id="2_72x70"] -[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/dark_blur_material.tres" id="4_jo1xn"] -[ext_resource type="Script" path="res://menu/blur_setup.gd" id="5_1l77s"] +[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="4_jo1xn"] +[ext_resource type="Script" path="res://menu/auto_setup/blur_setup.gd" id="5_1l77s"] [node name="ChatPreview" type="Control"] layout_mode = 3 diff --git a/client/menu/communicate/popup_message/pinned_item_messages.gd b/client/menu/communicate/popup_message/pinned_item_messages.gd index c98b9184..15ae96b5 100644 --- a/client/menu/communicate/popup_message/pinned_item_messages.gd +++ b/client/menu/communicate/popup_message/pinned_item_messages.gd @@ -17,7 +17,7 @@ extends Control class_name PinnedItemMessages const ITEM_MESSAGE_SCENE := preload("res://menu/communicate/item/item_message.tscn") -const PAPER_PANEL_STYLE := preload("res://menu/theme/paper_panel_style.tres") +const PAPER_PANEL_STYLE := preload("res://menu/theme/style/paper_panel_style.tres") var pinned_items := {} diff --git a/client/menu/communicate/popup_message/popup_message.tscn b/client/menu/communicate/popup_message/popup_message.tscn index 5131cbf7..05b31e11 100644 --- a/client/menu/communicate/popup_message/popup_message.tscn +++ b/client/menu/communicate/popup_message/popup_message.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=12 format=3 uid="uid://b21nrnkygiyjt"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_a1566"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_a1566"] [ext_resource type="Script" path="res://menu/communicate/popup_message/popup_message.gd" id="2_sbew6"] -[ext_resource type="Shader" path="res://menu/blur_mix.gdshader" id="3_2vnom"] +[ext_resource type="Shader" path="res://menu/theme/shaders/blur_mix.gdshader" id="3_2vnom"] [ext_resource type="PackedScene" uid="uid://dq61p3a8og2b6" path="res://menu/communicate/popup_message/server_message.tscn" id="3_m3rok"] -[ext_resource type="Script" path="res://menu/blur_setup.gd" id="4_pvwmw"] -[ext_resource type="FontFile" uid="uid://bk704sc5gkrb3" path="res://menu/theme/font-azaret-mono.woff2" id="4_wsrnf"] +[ext_resource type="Script" path="res://menu/auto_setup/blur_setup.gd" id="4_pvwmw"] +[ext_resource type="FontFile" uid="uid://bk704sc5gkrb3" path="res://menu/theme/fonts/font-azaret-mono.woff2" id="4_wsrnf"] [ext_resource type="Texture2D" uid="uid://b2uv5rf0enikf" path="res://menu/icons/hint.svg" id="5_2dxsd"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_k0m35"] diff --git a/client/menu/communicate/popup_message/server_message.gd b/client/menu/communicate/popup_message/server_message.gd index fc12ee76..c3fc0a78 100644 --- a/client/menu/communicate/popup_message/server_message.gd +++ b/client/menu/communicate/popup_message/server_message.gd @@ -1,8 +1,8 @@ extends BlurSetup class_name ServerMessage -const DEFAULT_FONT = preload("res://menu/theme/font-josefin-sans.woff2") -const MONOSPACE_FONT = preload("res://menu/theme/font-azaret-mono.woff2") +const DEFAULT_FONT = preload("res://menu/theme/fonts/font-josefin-sans.woff2") +const MONOSPACE_FONT = preload("res://menu/theme/fonts/font-azaret-mono.woff2") @onready var label: Label = $CenterContainer/Label diff --git a/client/menu/communicate/popup_message/server_message.tscn b/client/menu/communicate/popup_message/server_message.tscn index 2a848419..b23d2527 100644 --- a/client/menu/communicate/popup_message/server_message.tscn +++ b/client/menu/communicate/popup_message/server_message.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=8 format=3 uid="uid://dq61p3a8og2b6"] -[ext_resource type="Shader" path="res://menu/blur_mix.gdshader" id="1_qv8ew"] +[ext_resource type="Shader" path="res://menu/theme/shaders/blur_mix.gdshader" id="1_qv8ew"] [ext_resource type="Script" path="res://menu/communicate/popup_message/server_message.gd" id="2_csqo8"] -[ext_resource type="FontFile" uid="uid://bk704sc5gkrb3" path="res://menu/theme/font-azaret-mono.woff2" id="3_dw20j"] +[ext_resource type="FontFile" uid="uid://bk704sc5gkrb3" path="res://menu/theme/fonts/font-azaret-mono.woff2" id="3_dw20j"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_q3bbd"] shader = ExtResource("1_qv8ew") diff --git a/client/menu/credits.tscn b/client/menu/credits.tscn index 12bd3c23..ddbc8ebe 100644 --- a/client/menu/credits.tscn +++ b/client/menu/credits.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=6 format=3 uid="uid://7mqbxa054bjv"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_16kk6"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_16kk6"] [ext_resource type="Script" path="res://menu/credits.gd" id="2_alvab"] -[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/dark_blur_material.tres" id="3_nwoiv"] -[ext_resource type="Script" path="res://menu/blur_setup.gd" id="4_8sii3"] +[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="3_nwoiv"] +[ext_resource type="Script" path="res://menu/auto_setup/blur_setup.gd" id="4_8sii3"] [ext_resource type="Script" path="res://menu/scroll_container_custom.gd" id="4_bfcw8"] [node name="CreditsMenu" type="Control"] diff --git a/client/menu/error.tscn b/client/menu/error.tscn index dfe6e015..55c3c9d9 100644 --- a/client/menu/error.tscn +++ b/client/menu/error.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=6 format=3 uid="uid://cimgn07lbcs4v"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_cabdu"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_cabdu"] [ext_resource type="PackedScene" uid="uid://l4vm07dtda4j" path="res://menu/menu_background.tscn" id="2_5fxol"] [ext_resource type="Script" path="res://menu/error.gd" id="2_dbe41"] [ext_resource type="PackedScene" uid="uid://bg2d78ycorcqk" path="res://menu/scene_transition.tscn" id="4_1nbt3"] -[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/dark_blur_material.tres" id="4_hxkkd"] +[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="4_hxkkd"] [node name="ErrorMenu" type="Control"] layout_mode = 3 diff --git a/client/menu/hairstyle_preview.tscn b/client/menu/hairstyle_preview.tscn index 46bb9c74..5952de63 100644 --- a/client/menu/hairstyle_preview.tscn +++ b/client/menu/hairstyle_preview.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=7 format=3 uid="uid://dfon56nwd2tgn"] [ext_resource type="Script" path="res://menu/hairstyle_preview.gd" id="1_0qdmv"] -[ext_resource type="Shader" path="res://menu/grayscale.gdshader" id="1_sf0gc"] +[ext_resource type="Shader" path="res://menu/theme/shaders/grayscale.gdshader" id="1_sf0gc"] [ext_resource type="PackedScene" uid="uid://b3hhir2fvnunu" path="res://player/character/character.tscn" id="2_jtitc"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_entrs"] diff --git a/client/menu/ingame.tscn b/client/menu/ingame.tscn index 4bb2a458..74b0a486 100644 --- a/client/menu/ingame.tscn +++ b/client/menu/ingame.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=11 format=3 uid="uid://lxlgtjm8hw7v"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_2vmyh"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_2vmyh"] [ext_resource type="Script" path="res://menu/ingame.gd" id="2_0h3no"] -[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/dark_blur_material.tres" id="3_vvvlt"] -[ext_resource type="Script" path="res://menu/blur_setup.gd" id="4_b6bm7"] -[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="4_scupw"] +[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="3_vvvlt"] +[ext_resource type="Script" path="res://menu/auto_setup/blur_setup.gd" id="4_b6bm7"] +[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="4_scupw"] [ext_resource type="StyleBox" uid="uid://bw4jamyna1top" path="res://menu/theme/style/panel_style_sidebar.tres" id="4_vr8y1"] [sub_resource type="Animation" id="Animation_8sedy"] diff --git a/client/menu/lobby.tscn b/client/menu/lobby.tscn index f2cb7b93..9f4e14c9 100644 --- a/client/menu/lobby.tscn +++ b/client/menu/lobby.tscn @@ -1,16 +1,16 @@ [gd_scene load_steps=16 format=3 uid="uid://bc50la65ntifb"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_u18ke"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_u18ke"] [ext_resource type="Script" path="res://menu/lobby.gd" id="2_7657i"] [ext_resource type="StyleBox" uid="uid://de80aw86emnql" path="res://menu/theme/style/lobby_panel_override.tres" id="3_6iqoe"] -[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/dark_blur_material.tres" id="3_esmbx"] +[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="3_esmbx"] [ext_resource type="Texture2D" uid="uid://35rd5gamtyqm" path="res://menu/icons/arrow.svg" id="3_jxleg"] [ext_resource type="Texture2D" uid="uid://j75dbytlbju" path="res://menu/icons/arrow_pressed.svg" id="4_eapmn"] -[ext_resource type="Script" path="res://menu/blur_setup.gd" id="5_am8pt"] +[ext_resource type="Script" path="res://menu/auto_setup/blur_setup.gd" id="5_am8pt"] [ext_resource type="Texture2D" uid="uid://b33qmctbpf48g" path="res://menu/icons/arrow_hover.svg" id="5_odwav"] [ext_resource type="Texture2D" uid="uid://by3qsrpxnfq4w" path="res://menu/icons/arrow_focus.svg" id="6_tulu3"] [ext_resource type="PackedScene" uid="uid://b1f7bgn65j7b5" path="res://menu/controller_buttons/controller_button.tscn" id="7_t6mox"] -[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/font-josefin-sans.woff2" id="8_cwbpa"] +[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/fonts/font-josefin-sans.woff2" id="8_cwbpa"] [ext_resource type="Texture2D" uid="uid://bsx6fo7mv2u6a" path="res://menu/controller_buttons/x.svg" id="9_q14bw"] [ext_resource type="Script" path="res://menu/scroll_container_custom.gd" id="10_bgene"] [ext_resource type="Texture2D" uid="uid://cr2a6ide6vnnv" path="res://menu/controller_buttons/y.svg" id="11_5uugf"] diff --git a/client/menu/lobby/player.tscn b/client/menu/lobby/player.tscn index 73c1f7f6..344aae91 100644 --- a/client/menu/lobby/player.tscn +++ b/client/menu/lobby/player.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=6 format=3 uid="uid://gmldnel4xbxy"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_flfqn"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_flfqn"] [ext_resource type="Texture2D" uid="uid://222w1wha75od" path="res://menu/icons/user.webp" id="2_mnaqt"] [ext_resource type="Script" path="res://menu/lobby/player.gd" id="2_w3lyk"] diff --git a/client/menu/main.tscn b/client/menu/main.tscn index ff4e7a94..7ec73085 100644 --- a/client/menu/main.tscn +++ b/client/menu/main.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=9 format=3 uid="uid://dbj8508whxgwv"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_3qfu3"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_3qfu3"] [ext_resource type="Script" path="res://menu/main.gd" id="2_xjnc3"] [ext_resource type="PackedScene" uid="uid://l4vm07dtda4j" path="res://menu/menu_background.tscn" id="3_4evao"] -[ext_resource type="Material" uid="uid://2j8a0c0a2ta5" path="res://menu/theme/blur_material.tres" id="4_nx4vf"] -[ext_resource type="Script" path="res://menu/blur_setup.gd" id="5_0mn56"] -[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="5_k7bqq"] +[ext_resource type="Material" uid="uid://2j8a0c0a2ta5" path="res://menu/theme/materials/blur_material.tres" id="4_nx4vf"] +[ext_resource type="Script" path="res://menu/auto_setup/blur_setup.gd" id="5_0mn56"] +[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="5_k7bqq"] [ext_resource type="StyleBox" uid="uid://bw4jamyna1top" path="res://menu/theme/style/panel_style_sidebar.tres" id="5_qlyeo"] [sub_resource type="FontVariation" id="FontVariation_htgmg"] diff --git a/client/menu/overlay.tscn b/client/menu/overlay.tscn index b298f54b..25ecae4c 100644 --- a/client/menu/overlay.tscn +++ b/client/menu/overlay.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=6 format=3 uid="uid://bpikve6wlsjfl"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_4kujw"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_4kujw"] [ext_resource type="Script" path="res://menu/overlay.gd" id="2_kbjds"] -[ext_resource type="Texture2D" uid="uid://chxkwohi56cxx" path="res://menu/theme/paper_texture.tres" id="3_oum5g"] -[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="3_u54fv"] +[ext_resource type="Texture2D" uid="uid://chxkwohi56cxx" path="res://menu/textures/paper_texture.tres" id="3_oum5g"] +[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="3_u54fv"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_04ujj"] bg_color = Color(0, 0, 0, 0) diff --git a/client/menu/play.tscn b/client/menu/play.tscn index 7808c7b4..958eab8e 100644 --- a/client/menu/play.tscn +++ b/client/menu/play.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://c8url5fpttbem"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_cckds"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_cckds"] [ext_resource type="Script" path="res://menu/play.gd" id="2_phxx0"] -[ext_resource type="Material" uid="uid://2j8a0c0a2ta5" path="res://menu/theme/blur_material.tres" id="3_fsbt7"] +[ext_resource type="Material" uid="uid://2j8a0c0a2ta5" path="res://menu/theme/materials/blur_material.tres" id="3_fsbt7"] [ext_resource type="Script" path="res://menu/scroll_container_custom.gd" id="5_cm120"] -[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="5_ojpbf"] +[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="5_ojpbf"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ukani"] diff --git a/client/menu/popup.tscn b/client/menu/popup.tscn index 68818643..84c44515 100644 --- a/client/menu/popup.tscn +++ b/client/menu/popup.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=5 format=3 uid="uid://lwtym0pbc17g"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_m0d0r"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_m0d0r"] [ext_resource type="Script" path="res://menu/popup.gd" id="2_1h10j"] -[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/dark_blur_material.tres" id="3_iouvy"] -[ext_resource type="Script" path="res://menu/blur_setup.gd" id="4_e4iqk"] +[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="3_iouvy"] +[ext_resource type="Script" path="res://menu/auto_setup/blur_setup.gd" id="4_e4iqk"] [node name="Popup" type="Control"] layout_mode = 3 diff --git a/client/menu/rating/rating.tscn b/client/menu/rating/rating.tscn index 4b4b7a5f..dc4ed714 100644 --- a/client/menu/rating/rating.tscn +++ b/client/menu/rating/rating.tscn @@ -2,9 +2,9 @@ [ext_resource type="Texture2D" uid="uid://b10goh4dsa3b0" path="res://player/star.webp" id="1_7qv7r"] [ext_resource type="Shader" path="res://menu/rating/desaturate.gdshader" id="1_pddsm"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_uwajf"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_uwajf"] [ext_resource type="Script" path="res://menu/rating/rating.gd" id="2_cq0se"] -[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/dark_blur_material.tres" id="4_hdurb"] +[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="4_hdurb"] [ext_resource type="AudioStream" uid="uid://camy77x26mmpv" path="res://menu/sounds/success.ogg" id="5_tutpj"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_oi7xd"] diff --git a/client/menu/settings.tscn b/client/menu/settings.tscn index d29a3646..7206990f 100644 --- a/client/menu/settings.tscn +++ b/client/menu/settings.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=5 format=3 uid="uid://8ic77jmadadj"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_foq3a"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_foq3a"] [ext_resource type="Script" path="res://menu/settings.gd" id="2_3hgm8"] -[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/dark_blur_material.tres" id="3_8nykw"] -[ext_resource type="Script" path="res://menu/blur_setup.gd" id="4_v6q3y"] +[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="3_8nykw"] +[ext_resource type="Script" path="res://menu/auto_setup/blur_setup.gd" id="4_v6q3y"] [node name="SettingsMenu" type="Control"] layout_mode = 3 diff --git a/client/menu/settings/settings_row.tscn b/client/menu/settings/settings_row.tscn index ba43fed7..489239f3 100644 --- a/client/menu/settings/settings_row.tscn +++ b/client/menu/settings/settings_row.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=7 format=3 uid="uid://o5e5vpem8w0k"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_iij3k"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_iij3k"] [ext_resource type="Script" path="res://menu/settings/settings_row.gd" id="2_l8i7p"] -[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/font-josefin-sans.woff2" id="3_7k5da"] +[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/fonts/font-josefin-sans.woff2" id="3_7k5da"] [ext_resource type="Texture2D" uid="uid://cucnmy0j5n8l8" path="res://menu/icons/reset.svg" id="4_bj3dr"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_pk3rs"] diff --git a/client/menu/setup.tscn b/client/menu/setup.tscn index 67610aba..9e09a050 100644 --- a/client/menu/setup.tscn +++ b/client/menu/setup.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=15 format=3 uid="uid://ddl3efikvqp66"] [ext_resource type="Script" path="res://menu/setup.gd" id="1_mo46n"] -[ext_resource type="Theme" uid="uid://ci2qajdoa1an1" path="res://menu/theme/paper.tres" id="1_yq0aa"] +[ext_resource type="Theme" uid="uid://ci2qajdoa1an1" path="res://menu/theme/theme/paper.tres" id="1_yq0aa"] [ext_resource type="Script" path="res://menu/scroll_container_custom.gd" id="2_4caf2"] -[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="3_2vg4d"] +[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="3_2vg4d"] [ext_resource type="AudioStream" uid="uid://do7ii5hx71p0m" path="res://menu/sounds/page.ogg" id="5_xac6d"] [ext_resource type="AudioStream" uid="uid://5b3noxjmasmu" path="res://menu/sounds/sign.ogg" id="6_wf0gh"] diff --git a/client/menu/theme/paper_texture.tres b/client/menu/textures/paper_texture.tres index 2c681244..2c681244 100644 --- a/client/menu/theme/paper_texture.tres +++ b/client/menu/textures/paper_texture.tres diff --git a/client/menu/theme/font-azaret-mono.woff2 b/client/menu/theme/fonts/font-azaret-mono.woff2 Binary files differindex c413b182..c413b182 100644 --- a/client/menu/theme/font-azaret-mono.woff2 +++ b/client/menu/theme/fonts/font-azaret-mono.woff2 diff --git a/client/menu/theme/font-azaret-mono.woff2.import b/client/menu/theme/fonts/font-azaret-mono.woff2.import index cafe1fbd..20a14c40 100644 --- a/client/menu/theme/font-azaret-mono.woff2.import +++ b/client/menu/theme/fonts/font-azaret-mono.woff2.import @@ -3,12 +3,12 @@ importer="font_data_dynamic" type="FontFile" uid="uid://bk704sc5gkrb3" -path="res://.godot/imported/font-azaret-mono.woff2-38a6d727215392526b2e0e5bff930be6.fontdata" +path="res://.godot/imported/font-azaret-mono.woff2-e51d1e7d25611225022685bd0a3a496f.fontdata" [deps] -source_file="res://menu/theme/font-azaret-mono.woff2" -dest_files=["res://.godot/imported/font-azaret-mono.woff2-38a6d727215392526b2e0e5bff930be6.fontdata"] +source_file="res://menu/theme/fonts/font-azaret-mono.woff2" +dest_files=["res://.godot/imported/font-azaret-mono.woff2-e51d1e7d25611225022685bd0a3a496f.fontdata"] [params] diff --git a/client/menu/theme/font-josefin-sans.woff2 b/client/menu/theme/fonts/font-josefin-sans.woff2 Binary files differindex dce2708f..dce2708f 100644 --- a/client/menu/theme/font-josefin-sans.woff2 +++ b/client/menu/theme/fonts/font-josefin-sans.woff2 diff --git a/client/menu/theme/font-josefin-sans.woff2.import b/client/menu/theme/fonts/font-josefin-sans.woff2.import index 03e086da..8334a70e 100644 --- a/client/menu/theme/font-josefin-sans.woff2.import +++ b/client/menu/theme/fonts/font-josefin-sans.woff2.import @@ -3,12 +3,12 @@ importer="font_data_dynamic" type="FontFile" uid="uid://5ixo6b3bd3km" -path="res://.godot/imported/font-josefin-sans.woff2-e2c3f263d98e1132cfe6af3f4f0a3454.fontdata" +path="res://.godot/imported/font-josefin-sans.woff2-3826b0a93d8b3bea37b981fd829e8139.fontdata" [deps] -source_file="res://menu/theme/font-josefin-sans.woff2" -dest_files=["res://.godot/imported/font-josefin-sans.woff2-e2c3f263d98e1132cfe6af3f4f0a3454.fontdata"] +source_file="res://menu/theme/fonts/font-josefin-sans.woff2" +dest_files=["res://.godot/imported/font-josefin-sans.woff2-3826b0a93d8b3bea37b981fd829e8139.fontdata"] [params] diff --git a/client/menu/theme/font-sansita-swashed.woff2 b/client/menu/theme/fonts/font-sansita-swashed.woff2 Binary files differindex 5c665fb0..5c665fb0 100644 --- a/client/menu/theme/font-sansita-swashed.woff2 +++ b/client/menu/theme/fonts/font-sansita-swashed.woff2 diff --git a/client/menu/theme/font-sansita-swashed.woff2.import b/client/menu/theme/fonts/font-sansita-swashed.woff2.import index 2d38716d..d35f5ae1 100644 --- a/client/menu/theme/font-sansita-swashed.woff2.import +++ b/client/menu/theme/fonts/font-sansita-swashed.woff2.import @@ -3,12 +3,12 @@ importer="font_data_dynamic" type="FontFile" uid="uid://bo4vh5xkpvrh1" -path="res://.godot/imported/font-sansita-swashed.woff2-323b4a2ee0671aba6e17a6f073f706f3.fontdata" +path="res://.godot/imported/font-sansita-swashed.woff2-02fc401b56679ae18723df7cf0e77bd6.fontdata" [deps] -source_file="res://menu/theme/font-sansita-swashed.woff2" -dest_files=["res://.godot/imported/font-sansita-swashed.woff2-323b4a2ee0671aba6e17a6f073f706f3.fontdata"] +source_file="res://menu/theme/fonts/font-sansita-swashed.woff2" +dest_files=["res://.godot/imported/font-sansita-swashed.woff2-02fc401b56679ae18723df7cf0e77bd6.fontdata"] [params] diff --git a/client/menu/theme/blur_material.tres b/client/menu/theme/materials/blur_material.tres index c035d230..035351c5 100644 --- a/client/menu/theme/blur_material.tres +++ b/client/menu/theme/materials/blur_material.tres @@ -1,6 +1,6 @@ [gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://2j8a0c0a2ta5"] -[ext_resource type="Shader" path="res://menu/blur_mix.gdshader" id="1_d16rd"] +[ext_resource type="Shader" path="res://menu/theme/shaders/blur_mix.gdshader" id="1_d16rd"] [resource] shader = ExtResource("1_d16rd") diff --git a/client/menu/theme/dark_blur_material.tres b/client/menu/theme/materials/dark_blur_material.tres index daf74099..cee1aeca 100644 --- a/client/menu/theme/dark_blur_material.tres +++ b/client/menu/theme/materials/dark_blur_material.tres @@ -1,6 +1,6 @@ [gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://beea1pc5nt67r"] -[ext_resource type="Shader" path="res://menu/blur_mix.gdshader" id="1_cynu0"] +[ext_resource type="Shader" path="res://menu/theme/shaders/blur_mix.gdshader" id="1_cynu0"] [resource] shader = ExtResource("1_cynu0") diff --git a/client/menu/grayscale_material.tres b/client/menu/theme/materials/grayscale_material.tres index 06d5e698..065356e5 100644 --- a/client/menu/grayscale_material.tres +++ b/client/menu/theme/materials/grayscale_material.tres @@ -1,6 +1,6 @@ [gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://bplhkekj6rebp"] -[ext_resource type="Shader" path="res://menu/grayscale.gdshader" id="1_u0c2c"] +[ext_resource type="Shader" path="res://menu/theme/shaders/grayscale.gdshader" id="1_u0c2c"] [resource] shader = ExtResource("1_u0c2c") diff --git a/client/menu/blur_mix.gdshader b/client/menu/theme/shaders/blur_mix.gdshader index 7e95224d..7e95224d 100644 --- a/client/menu/blur_mix.gdshader +++ b/client/menu/theme/shaders/blur_mix.gdshader diff --git a/client/menu/grayscale.gdshader b/client/menu/theme/shaders/grayscale.gdshader index cc132c54..cc132c54 100644 --- a/client/menu/grayscale.gdshader +++ b/client/menu/theme/shaders/grayscale.gdshader diff --git a/client/menu/theme/paper_panel_style.tres b/client/menu/theme/style/paper_panel_style.tres index 5a8a4a78..bd49eea4 100644 --- a/client/menu/theme/paper_panel_style.tres +++ b/client/menu/theme/style/paper_panel_style.tres @@ -1,6 +1,6 @@ [gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://bqhs5wtdp2oax"] -[ext_resource type="Texture2D" uid="uid://chxkwohi56cxx" path="res://menu/theme/paper_texture.tres" id="1_u1kqj"] +[ext_resource type="Texture2D" uid="uid://chxkwohi56cxx" path="res://menu/textures/paper_texture.tres" id="1_u1kqj"] [resource] texture = ExtResource("1_u1kqj") diff --git a/client/menu/theme/paper.tres b/client/menu/theme/theme/paper.tres index acf6699a..6ff3bd10 100644 --- a/client/menu/theme/paper.tres +++ b/client/menu/theme/theme/paper.tres @@ -1,7 +1,7 @@ [gd_resource type="Theme" load_steps=17 format=3 uid="uid://ci2qajdoa1an1"] -[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="1_koj1m"] -[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/font-josefin-sans.woff2" id="1_tc8bk"] +[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="1_koj1m"] +[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/fonts/font-josefin-sans.woff2" id="1_tc8bk"] [sub_resource type="FontVariation" id="FontVariation_pirkj"] base_font = ExtResource("1_tc8bk") diff --git a/client/menu/theme/theme.tres b/client/menu/theme/theme/theme.tres index fff223c0..9e2c4ac6 100644 --- a/client/menu/theme/theme.tres +++ b/client/menu/theme/theme/theme.tres @@ -1,10 +1,10 @@ [gd_resource type="Theme" load_steps=11 format=3 uid="uid://b0qmvo504e457"] -[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/font-josefin-sans.woff2" id="1_f8qb0"] +[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/fonts/font-josefin-sans.woff2" id="1_f8qb0"] [ext_resource type="StyleBox" uid="uid://b86kbd3pfkd5w" path="res://menu/theme/style/focus_style.tres" id="1_x88rs"] [ext_resource type="StyleBox" uid="uid://pi5uhe0lrgka" path="res://menu/theme/style/normal_style.tres" id="2_8fwoi"] [ext_resource type="StyleBox" uid="uid://dua4jqje3704w" path="res://menu/theme/style/hover_style.tres" id="2_ye28t"] -[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="3_8u6ww"] +[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="3_8u6ww"] [ext_resource type="StyleBox" uid="uid://bcd4xcvtv7tws" path="res://menu/theme/style/panel_style.tres" id="4_42dlp"] [sub_resource type="StyleBoxLine" id="StyleBoxLine_emtvk"] diff --git a/client/player/chat_message.tscn b/client/player/chat_message.tscn index 594e9ec1..287891d5 100644 --- a/client/player/chat_message.tscn +++ b/client/player/chat_message.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=3 uid="uid://5rcfoyuiwuya"] -[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/font-josefin-sans.woff2" id="1_3ximm"] +[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/fonts/font-josefin-sans.woff2" id="1_3ximm"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_dpele"] bg_color = Color(1, 1, 1, 1) |