diff --git a/mirror-godot-app/creator/asset_inventory/browser/asset_browser.tscn b/mirror-godot-app/creator/asset_inventory/browser/asset_browser.tscn index c92a6fa3..ec362bae 100644 --- a/mirror-godot-app/creator/asset_inventory/browser/asset_browser.tscn +++ b/mirror-godot-app/creator/asset_inventory/browser/asset_browser.tscn @@ -28,13 +28,13 @@ line_spacing = 0.0 font = SubResource("FontVariation_f1kvq") font_size = 13 -[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_p1m02"] +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_50mv2"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_lukbj"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_r8tti"] -[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_50mv2"] +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_p1m02"] [sub_resource type="LabelSettings" id="LabelSettings_x7ond"] font = ExtResource("9_v2w2y") @@ -98,10 +98,10 @@ vertical_alignment = 1 custom_minimum_size = Vector2(30, 10) layout_mode = 2 focus_mode = 0 -theme_override_styles/normal = SubResource("StyleBoxEmpty_p1m02") +theme_override_styles/focus = SubResource("StyleBoxEmpty_50mv2") theme_override_styles/hover = SubResource("StyleBoxEmpty_lukbj") theme_override_styles/pressed = SubResource("StyleBoxEmpty_r8tti") -theme_override_styles/focus = SubResource("StyleBoxEmpty_50mv2") +theme_override_styles/normal = SubResource("StyleBoxEmpty_p1m02") [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/Title/HBoxContainer/CloseButton"] layout_mode = 0 diff --git a/mirror-godot-app/creator/asset_inventory/browser/base_browser_section.tscn b/mirror-godot-app/creator/asset_inventory/browser/base_browser_section.tscn index 4eea7fed..a161cb69 100644 --- a/mirror-godot-app/creator/asset_inventory/browser/base_browser_section.tscn +++ b/mirror-godot-app/creator/asset_inventory/browser/base_browser_section.tscn @@ -11,7 +11,7 @@ [sub_resource type="LabelSettings" id="LabelSettings_tkddn"] line_spacing = 0.0 font = ExtResource("8_bx0pw") -font_size = 12 +font_size = 14 [node name="BaseBrowserSection" type="VBoxContainer"] offset_right = 420.0 diff --git a/mirror-godot-app/creator/asset_inventory/browser/browser_section.tscn b/mirror-godot-app/creator/asset_inventory/browser/browser_section.tscn index c4cc15d6..955b2d81 100644 --- a/mirror-godot-app/creator/asset_inventory/browser/browser_section.tscn +++ b/mirror-godot-app/creator/asset_inventory/browser/browser_section.tscn @@ -37,6 +37,15 @@ _data = { script = ExtResource("2_od8yq") _asset_source = 0 +[node name="Plus" parent="SectionHeader/ToggleCollapse/MarginContainer/Header" index="0"] +custom_minimum_size = Vector2(14, 14) + +[node name="Minus" parent="SectionHeader/ToggleCollapse/MarginContainer/Header" index="1"] +custom_minimum_size = Vector2(14, 14) + +[node name="Icon" parent="SectionHeader/ToggleCollapse/MarginContainer/Header" index="2"] +custom_minimum_size = Vector2(14, 14) + [node name="SectionNameLabel" parent="SectionHeader/ToggleCollapse/MarginContainer/Header" index="3"] text = "Assets" @@ -50,7 +59,7 @@ layout_mode = 2 theme_override_constants/h_separation = 7 [node name="BackButton" type="Button" parent="SectionHolder/MarginContainer/SectionContainer/NavigationContainer/HBoxContainer" index="0"] -custom_minimum_size = Vector2(20, 0) +custom_minimum_size = Vector2(30, 30) layout_mode = 2 theme_override_fonts/font = ExtResource("10_hrnjv") theme_override_font_sizes/font_size = 13 @@ -73,6 +82,7 @@ text = "" self_modulate = Color(0.145098, 0.419608, 0.984314, 1) layout_mode = 2 theme_override_constants/line_spacing = 1 +theme_override_font_sizes/font_size = 14 text = "SUBCATEGORY" [node name="SearchField" parent="SectionHolder/MarginContainer/SectionContainer" index="1" instance=ExtResource("9_spchq")] @@ -133,12 +143,14 @@ layout_mode = 2 unique_name_in_owner = true layout_mode = 2 theme_type_variation = &"LabelRegular" +theme_override_font_sizes/font_size = 14 horizontal_alignment = 2 [node name="LabelResultKeyword" type="Label" parent="SectionHolder/MarginContainer/SectionContainer/ResultsContainer/HBoxContainer/FilterWithPills/VBoxContainer/HBoxContainer" index="1"] unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 3 +theme_override_font_sizes/font_size = 14 [node name="SortPillBadge" parent="SectionHolder/MarginContainer/SectionContainer/ResultsContainer/HBoxContainer/FilterWithPills/VBoxContainer/PillsContainer" index="0"] title = "Sort By" @@ -152,6 +164,9 @@ title = "Graphics" [node name="AssetTypePillBadge" parent="SectionHolder/MarginContainer/SectionContainer/ResultsContainer/HBoxContainer/FilterWithPills/VBoxContainer/PillsContainer" index="3"] title = "Type" +[node name="FilterButton" parent="SectionHolder/MarginContainer/SectionContainer/ResultsContainer/HBoxContainer/FilterWithPills" index="1"] +custom_minimum_size = Vector2(30, 30) + [node name="LoadingSpinner" type="Control" parent="SectionHolder/MarginContainer/SectionContainer/ResultsContainer" index="1"] visible = false custom_minimum_size = Vector2(96, 50) @@ -195,10 +210,10 @@ expand_mode = 1 stretch_mode = 5 [node name="AnimationPlayer" type="AnimationPlayer" parent="SectionHolder/MarginContainer/SectionContainer/ResultsContainer/LoadingSpinner/Container/LoadingSpinner" index="0"] -autoplay = "Roll" libraries = { "": SubResource("AnimationLibrary_2nhbe") } +autoplay = "Roll" [node name="NoResultsLabel" type="Label" parent="SectionHolder/MarginContainer/SectionContainer/ResultsContainer" index="2"] visible = false @@ -206,8 +221,8 @@ layout_mode = 2 size_flags_horizontal = 5 size_flags_vertical = 3 theme_override_fonts/font = ExtResource("4_76ata") -theme_override_font_sizes/font_size = 12 -text = "Looks like there's nothing here." +theme_override_font_sizes/font_size = 14 +text = "Looks like there's nothing here" horizontal_alignment = 1 vertical_alignment = 1 diff --git a/mirror-godot-app/creator/asset_inventory/browser/category_preview.tscn b/mirror-godot-app/creator/asset_inventory/browser/category_preview.tscn index 99c3ca6f..3ff8b50d 100644 --- a/mirror-godot-app/creator/asset_inventory/browser/category_preview.tscn +++ b/mirror-godot-app/creator/asset_inventory/browser/category_preview.tscn @@ -6,18 +6,18 @@ [ext_resource type="FontVariation" uid="uid://bwp6hb31ol8la" path="res://ui/new_player_ui/inventory/title_font_bold.tres" id="4_76ata"] [ext_resource type="FontFile" uid="uid://dhpbqmk3ulim4" path="res://ui/common/fonts/montserrat/montserrat_bold.ttf" id="7_lnyls"] -[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_ohyv2"] +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_oprno"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_moatk"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_0yfip"] -[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_oprno"] +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_ohyv2"] [sub_resource type="LabelSettings" id="LabelSettings_tkddn"] line_spacing = 0.0 font = ExtResource("7_lnyls") -font_size = 11 +font_size = 12 [node name="Category" type="PanelContainer"] self_modulate = Color(1, 1, 1, 0.215686) @@ -40,10 +40,10 @@ theme_override_constants/separation = 2 [node name="ViewAllButton" type="Button" parent="MarginContainer/VBoxContainer"] custom_minimum_size = Vector2(0, 24) layout_mode = 2 -theme_override_styles/normal = SubResource("StyleBoxEmpty_ohyv2") +theme_override_styles/focus = SubResource("StyleBoxEmpty_oprno") theme_override_styles/hover = SubResource("StyleBoxEmpty_moatk") theme_override_styles/pressed = SubResource("StyleBoxEmpty_0yfip") -theme_override_styles/focus = SubResource("StyleBoxEmpty_oprno") +theme_override_styles/normal = SubResource("StyleBoxEmpty_ohyv2") script = ExtResource("3_cffdm") _item_paths = Array[NodePath]([NodePath("CategoryNameLabel"), NodePath("ViewAll")]) _hover_color = Color(0.0705882, 1, 0.843137, 1) @@ -57,7 +57,7 @@ grow_horizontal = 2 grow_vertical = 2 size_flags_horizontal = 2 theme_override_fonts/font = ExtResource("4_76ata") -theme_override_font_sizes/font_size = 14 +theme_override_font_sizes/font_size = 23 text = "Category Name" label_settings = SubResource("LabelSettings_tkddn") uppercase = true @@ -71,8 +71,8 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 size_flags_vertical = 1 -theme_override_font_sizes/font_size = 10 -text = "view all" +theme_override_font_sizes/font_size = 12 +text = "View All" horizontal_alignment = 2 [node name="Slots" type="GridContainer" parent="MarginContainer/VBoxContainer"] diff --git a/mirror-godot-app/creator/asset_inventory/browser/search_field.tscn b/mirror-godot-app/creator/asset_inventory/browser/search_field.tscn index 8cfec8f3..3dd09646 100644 --- a/mirror-godot-app/creator/asset_inventory/browser/search_field.tscn +++ b/mirror-godot-app/creator/asset_inventory/browser/search_field.tscn @@ -70,8 +70,8 @@ theme_override_constants/margin_right = 4 layout_mode = 2 focus_mode = 1 theme_type_variation = &"LineEditSearch" -theme_override_font_sizes/font_size = 13 -placeholder_text = "search over 5000+ assets" +theme_override_font_sizes/font_size = 14 +placeholder_text = "Search" clear_button_enabled = true flat = true caret_blink = true diff --git a/mirror-godot-app/creator/common/creator_title_tab.tscn b/mirror-godot-app/creator/common/creator_title_tab.tscn index 7a94252a..d3d33c33 100644 --- a/mirror-godot-app/creator/common/creator_title_tab.tscn +++ b/mirror-godot-app/creator/common/creator_title_tab.tscn @@ -12,13 +12,13 @@ line_spacing = 0.0 font = ExtResource("3_bfbtp") font_size = 13 -[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_p1m02"] +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_50mv2"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_lukbj"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_r8tti"] -[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_50mv2"] +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_p1m02"] [node name="CreatorTitleTab" type="VBoxContainer"] offset_right = 350.0 @@ -77,10 +77,10 @@ uppercase = true visible = false custom_minimum_size = Vector2(32, 10) layout_mode = 2 -theme_override_styles/normal = SubResource("StyleBoxEmpty_p1m02") +theme_override_styles/focus = SubResource("StyleBoxEmpty_50mv2") theme_override_styles/hover = SubResource("StyleBoxEmpty_lukbj") theme_override_styles/pressed = SubResource("StyleBoxEmpty_r8tti") -theme_override_styles/focus = SubResource("StyleBoxEmpty_50mv2") +theme_override_styles/normal = SubResource("StyleBoxEmpty_p1m02") [node name="HBoxContainer" type="HBoxContainer" parent="Title/HBoxContainer/CloseButton"] layout_mode = 0 diff --git a/mirror-godot-app/creator/selection/inspector/inspector.tscn b/mirror-godot-app/creator/selection/inspector/inspector.tscn index d1d543ad..4088a5ca 100644 --- a/mirror-godot-app/creator/selection/inspector/inspector.tscn +++ b/mirror-godot-app/creator/selection/inspector/inspector.tscn @@ -54,6 +54,7 @@ layout_mode = 2 size_flags_vertical = 3 theme_override_constants/side_margin = 0 tab_alignment = 1 +current_tab = 0 [node name="Properties" type="ScrollContainer" parent="VBoxContainer/TabContainer"] layout_mode = 2 diff --git a/mirror-godot-app/creator/selection/scene_hierarchy/scene_hierarchy.tscn b/mirror-godot-app/creator/selection/scene_hierarchy/scene_hierarchy.tscn index 7f335b5d..d6eaa257 100644 --- a/mirror-godot-app/creator/selection/scene_hierarchy/scene_hierarchy.tscn +++ b/mirror-godot-app/creator/selection/scene_hierarchy/scene_hierarchy.tscn @@ -76,7 +76,7 @@ _effect_icon = ExtResource("10_4j087") _lock_icon = ExtResource("11_un7qt") _script_icon = ExtResource("13_yg6cs") _privileges_icon = ExtResource("14_xtqf8") -_top_level_font_color = Color(0.505882, 0.517647, 0.568627, 1) +_top_level_font_color = Color(1, 1, 1, 1) _top_level_bg_color = Color(0, 0, 0, 0.333333) metadata/_edit_layout_mode = 1 diff --git a/mirror-godot-app/creator/tools/build_bar/build_bar.tscn b/mirror-godot-app/creator/tools/build_bar/build_bar.tscn index f7af4a1d..5b124bc1 100644 --- a/mirror-godot-app/creator/tools/build_bar/build_bar.tscn +++ b/mirror-godot-app/creator/tools/build_bar/build_bar.tscn @@ -32,9 +32,9 @@ [ext_resource type="StyleBox" uid="uid://dh8ascnco0746" path="res://ui/new_player_ui/inventory/panel_white_rounded.tres" id="24_71tn0"] [ext_resource type="Texture2D" uid="uid://bpo6jsaofusqn" path="res://creator/tools/build_bar/publish_icon.svg" id="24_bfhm6"] [ext_resource type="Script" path="res://creator/tools/build_bar/build_bar_fancy_button.gd" id="24_f3ued"] -[ext_resource type="Texture2D" path="res://creator/tools/build_bar/version.svg" id="25_gtv01"] +[ext_resource type="Texture2D" uid="uid://djlkst722aru0" path="res://creator/tools/build_bar/version.svg" id="25_gtv01"] [ext_resource type="Shader" path="res://ui/common/shaders/ui_blurr.gdshader" id="26_h62p1"] -[ext_resource type="Texture2D" path="res://creator/tools/build_bar/version-light.svg" id="27_30sds"] +[ext_resource type="Texture2D" uid="uid://x80nor7c51yd" path="res://creator/tools/build_bar/version-light.svg" id="27_30sds"] [ext_resource type="AudioStream" uid="uid://b1wqy8isen5sg" path="res://audio/mouseclick.wav" id="28_41r8t"] [ext_resource type="Theme" uid="uid://b2jbwic4wjvr0" path="res://creator/tools/build_bar/build_bar_social_button.theme.tres" id="30_okk3n"] @@ -202,10 +202,12 @@ size_flags_vertical = 4 theme_override_constants/separation = 12 [node name="Terrain" parent="Left" instance=ExtResource("4_8p2xd")] +visible = false custom_minimum_size = Vector2(80, 32) layout_mode = 2 theme = ExtResource("11_xgitw") theme_override_constants/icon_max_width = 24 +theme_override_font_sizes/font_size = 14 disabled = true toggle_mode = true button_group = ExtResource("9_fqcsf") @@ -219,6 +221,7 @@ custom_minimum_size = Vector2(72, 32) layout_mode = 2 theme = ExtResource("11_xgitw") theme_override_constants/icon_max_width = 24 +theme_override_font_sizes/font_size = 14 toggle_mode = true button_group = ExtResource("9_fqcsf") text = "Map" @@ -231,6 +234,7 @@ custom_minimum_size = Vector2(134, 32) layout_mode = 2 theme = ExtResource("11_xgitw") theme_override_constants/icon_max_width = 24 +theme_override_font_sizes/font_size = 14 toggle_mode = true button_group = ExtResource("9_fqcsf") text = "Primitive Builder" @@ -302,11 +306,12 @@ vertical_alignment = 1 custom_minimum_size = Vector2(0, 22) layout_mode = 2 theme_override_fonts/font = ExtResource("3_7nf0e") +theme_override_font_sizes/font_size = 14 text = "CLOSE BUILD UI" vertical_alignment = 1 [node name="VariableEditor" parent="Right" instance=ExtResource("17_u7xva")] -custom_minimum_size = Vector2(110, 30) +custom_minimum_size = Vector2(128, 30) layout_mode = 2 hover_tooltip_text = "Toggle Variable Editor" @@ -325,10 +330,11 @@ texture = ExtResource("16_orkvn") expand_mode = 1 [node name="TextLabel" parent="Right/VariableEditor/HBoxContainer" index="1"] +theme_override_font_sizes/font_size = 14 text = "VARIABLES" [node name="Teams" parent="Right" instance=ExtResource("17_u7xva")] -custom_minimum_size = Vector2(90, 30) +custom_minimum_size = Vector2(95, 30) layout_mode = 2 hover_tooltip_text = "Toggle Teams Editor" @@ -349,6 +355,7 @@ expand_mode = 1 [node name="TextLabel" parent="Right/Teams/HBoxContainer" index="1"] custom_minimum_size = Vector2(39, 22) +theme_override_font_sizes/font_size = 14 text = "TEAMS" [node name="FilterMenu" parent="Right/Teams" instance=ExtResource("15_gv6i4")] @@ -368,6 +375,7 @@ grow_horizontal = 0 placeholder_text = "Search users..." [node name="UsersPresent" parent="Right" instance=ExtResource("17_u7xva")] +custom_minimum_size = Vector2(110, 30) layout_mode = 2 hover_tooltip_text = "View Users" @@ -390,6 +398,7 @@ stretch_mode = 4 [node name="TextLabel" parent="Right/UsersPresent/HBoxContainer" index="1"] custom_minimum_size = Vector2(39, 22) +theme_override_font_sizes/font_size = 14 [node name="IconDown" type="Label" parent="Right/UsersPresent/HBoxContainer" index="2"] layout_mode = 2 @@ -417,7 +426,7 @@ grow_horizontal = 0 placeholder_text = "Search users..." [node name="Teleport" parent="Right" instance=ExtResource("17_u7xva")] -custom_minimum_size = Vector2(102, 30) +custom_minimum_size = Vector2(115, 30) layout_mode = 2 hover_tooltip_text = "Teleport Here" @@ -425,10 +434,11 @@ hover_tooltip_text = "Teleport Here" theme_override_constants/separation = 5 [node name="TextLabel" parent="Right/Teleport/HBoxContainer" index="1"] +theme_override_font_sizes/font_size = 14 text = "TELEPORT" [node name="PlayButton" parent="Right" instance=ExtResource("17_u7xva")] -custom_minimum_size = Vector2(98, 30) +custom_minimum_size = Vector2(113, 30) layout_mode = 2 hover_tooltip_text = "Preview/Play Space" @@ -438,11 +448,12 @@ text = "F" label_settings = SubResource("LabelSettings_pijhr") [node name="TextLabel" parent="Right/PlayButton/HBoxContainer" index="1"] +theme_override_font_sizes/font_size = 14 text = "PREVIEW" [node name="VersionButton" type="Button" parent="Right"] unique_name_in_owner = true -custom_minimum_size = Vector2(110, 30) +custom_minimum_size = Vector2(123, 30) layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 4 @@ -489,6 +500,7 @@ stretch_mode = 4 custom_minimum_size = Vector2(39, 22) layout_mode = 2 size_flags_vertical = 8 +theme_override_font_sizes/font_size = 14 text = "VERSION" horizontal_alignment = 1 vertical_alignment = 1 @@ -496,10 +508,10 @@ metadata/_edit_layout_mode = 1 [node name="IconDown" type="Label" parent="Right/VersionButton/HBoxContainer/TextLabel"] layout_mode = 2 -offset_left = 58.0 -offset_top = 3.0 -offset_right = 69.0 -offset_bottom = 17.0 +offset_left = 71.0 +offset_top = 4.0 +offset_right = 82.0 +offset_bottom = 18.0 size_flags_horizontal = 4 theme_override_fonts/font = ExtResource("17_eaxku") text = "chevron-down" @@ -569,7 +581,7 @@ icon = ExtResource("6_yhqwl") alignment = 0 [node name="PublishButton" parent="Right" instance=ExtResource("17_u7xva")] -custom_minimum_size = Vector2(94, 30) +custom_minimum_size = Vector2(105, 30) layout_mode = 2 hover_tooltip_text = "Publish Space" @@ -590,6 +602,7 @@ expand_mode = 1 stretch_mode = 5 [node name="TextLabel" parent="Right/PublishButton/HBoxContainer" index="1"] +theme_override_font_sizes/font_size = 14 text = "PUBLISH" [node name="SocialContainer" type="HBoxContainer" parent="Right"] @@ -660,8 +673,8 @@ volume_db = -10.0 [connection signal="toggled" from="Left/Undo" to="." method="_on_undo_toggled"] [connection signal="toggled" from="Left/Redo" to="." method="_on_redo_toggled"] [connection signal="pressed" from="Left/Terrain" to="." method="_on_terrain_pressed"] -[connection signal="pressed" from="Left/Map" to="." method="_on_button_pressed"] [connection signal="pressed" from="Left/Map" to="." method="_on_map_pressed"] +[connection signal="pressed" from="Left/Map" to="." method="_on_button_pressed"] [connection signal="pressed" from="Left/PrimitiveModelBuilder" to="." method="_on_primitive_model_builder_pressed"] [connection signal="pressed" from="Left/PrimitiveModelBuilder" to="." method="_on_button_pressed"] [connection signal="gizmo_button_pressed" from="Left/BuildBarGizmoOptions" to="." method="_on_build_bar_gizmo_options_gizmo_button_pressed"] @@ -671,8 +684,8 @@ volume_db = -10.0 [connection signal="toggled" from="Left/VisibleCollisions" to="." method="_on_visible_collisions_toggled"] [connection signal="pressed" from="Right/VariableEditor" to="." method="_on_variable_editor_pressed"] [connection signal="pressed" from="Right/VariableEditor" to="." method="_on_button_pressed"] -[connection signal="pressed" from="Right/Teams" to="." method="_on_button_pressed"] [connection signal="pressed" from="Right/Teams" to="." method="_on_teams_pressed"] +[connection signal="pressed" from="Right/Teams" to="." method="_on_button_pressed"] [connection signal="item_selected" from="Right/Teams/FilterMenu" to="." method="_on_user_present_filter_menu_item_selected"] [connection signal="pressed" from="Right/UsersPresent" to="." method="_on_users_present_pressed"] [connection signal="pressed" from="Right/UsersPresent" to="." method="_on_button_pressed"] @@ -684,11 +697,11 @@ volume_db = -10.0 [connection signal="pressed" from="Right/VersionButton" to="." method="_on_version_button_pressed"] [connection signal="pressed" from="Right/VersionButton/VersionMenu/VersionPopup/VBoxContainer/SaveButton" to="." method="_on_save_version_button_pressed"] [connection signal="pressed" from="Right/VersionButton/VersionMenu/VersionPopup/VBoxContainer/RestoreButton" to="." method="_on_restore_space_pressed"] -[connection signal="pressed" from="Right/PublishButton" to="." method="_on_publish_button_pressed"] [connection signal="pressed" from="Right/PublishButton" to="." method="_on_button_pressed"] +[connection signal="pressed" from="Right/PublishButton" to="." method="_on_publish_button_pressed"] [connection signal="open_space_settings_pressed" from="Right/SocialContainer" to="." method="_on_open_space_settings_pressed"] -[connection signal="pressed" from="Right/SocialContainer/SaveSpace" to="." method="_on_button_pressed"] [connection signal="pressed" from="Right/SocialContainer/SaveSpace" to="." method="_on_save_space_pressed"] +[connection signal="pressed" from="Right/SocialContainer/SaveSpace" to="." method="_on_button_pressed"] [connection signal="pressed" from="Right/SocialContainer/Help" to="." method="_on_help_pressed"] [connection signal="pressed" from="Right/SocialContainer/Help" to="." method="_on_button_pressed"] [connection signal="pressed" from="Right/SocialContainer/ShareButton" to="." method="_on_button_pressed"] diff --git a/mirror-godot-app/creator/tools/build_bar/build_bar_gizmo_options.tscn b/mirror-godot-app/creator/tools/build_bar/build_bar_gizmo_options.tscn index 08d3240f..505ecf3a 100644 --- a/mirror-godot-app/creator/tools/build_bar/build_bar_gizmo_options.tscn +++ b/mirror-godot-app/creator/tools/build_bar/build_bar_gizmo_options.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=8 format=3 uid="uid://cb6qvpd6kuoi5"] +[gd_scene load_steps=9 format=3 uid="uid://cb6qvpd6kuoi5"] [ext_resource type="Theme" uid="uid://dqjg12tafkeu2" path="res://creator/tools/build_bar/build_bar.theme.tres" id="1_3iya4"] [ext_resource type="Script" path="res://creator/tools/toolbar_gizmo_options.gd" id="1_rjlml"] @@ -13,6 +13,9 @@ font = ExtResource("4_mv4hy") font_size = 20 shadow_size = 0 +[sub_resource type="Theme" id="Theme_xqkng"] +default_font_size = 14 + [node name="BuildBarGizmoOptions" type="HBoxContainer" node_paths=PackedStringArray("_grab_button", "_move_button", "_rotate_button", "_scale_button", "_relative_checkbox", "_snap_checkbox", "_snap_amount")] custom_minimum_size = Vector2(350, 30) offset_right = 459.0 @@ -127,10 +130,11 @@ hover_tooltip_text = "If enabled, snap to the specified snap amount." [node name="SnapAmount" type="SpinBox" parent="."] clip_contents = true -custom_minimum_size = Vector2(0, 30) +custom_minimum_size = Vector2(0, 28) layout_mode = 2 size_flags_horizontal = 0 size_flags_vertical = 4 +theme = SubResource("Theme_xqkng") max_value = 1000.0 step = 0.01 alignment = 1 diff --git a/mirror-godot-app/ui/common/images/blue_bg.jpg b/mirror-godot-app/ui/common/images/blue_bg.jpg new file mode 100644 index 00000000..7f788d09 Binary files /dev/null and b/mirror-godot-app/ui/common/images/blue_bg.jpg differ diff --git a/mirror-godot-app/ui/common/images/gui_background.jpg.import b/mirror-godot-app/ui/common/images/blue_bg.jpg.import similarity index 66% rename from mirror-godot-app/ui/common/images/gui_background.jpg.import rename to mirror-godot-app/ui/common/images/blue_bg.jpg.import index 8121af06..9489561d 100644 --- a/mirror-godot-app/ui/common/images/gui_background.jpg.import +++ b/mirror-godot-app/ui/common/images/blue_bg.jpg.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dai4ge7mods7c" -path="res://.godot/imported/gui_background.jpg-821e6c7618102d00e86625800764a270.ctex" +uid="uid://dmhs7xypyms7g" +path="res://.godot/imported/blue_bg.jpg-9388e80f4f099bfea8a9c2c05cb56a97.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://ui/common/images/gui_background.jpg" -dest_files=["res://.godot/imported/gui_background.jpg-821e6c7618102d00e86625800764a270.ctex"] +source_file="res://ui/common/images/blue_bg.jpg" +dest_files=["res://.godot/imported/blue_bg.jpg-9388e80f4f099bfea8a9c2c05cb56a97.ctex"] [params] diff --git a/mirror-godot-app/ui/common/images/gui_background.jpg b/mirror-godot-app/ui/common/images/gui_background.jpg deleted file mode 100644 index 43df40e5..00000000 Binary files a/mirror-godot-app/ui/common/images/gui_background.jpg and /dev/null differ diff --git a/mirror-godot-app/ui/common/images/mirror-light-horizontal-sm.png b/mirror-godot-app/ui/common/images/mirror-light-horizontal-sm.png new file mode 100644 index 00000000..acd5b81a Binary files /dev/null and b/mirror-godot-app/ui/common/images/mirror-light-horizontal-sm.png differ diff --git a/mirror-godot-app/ui/common/images/mirror-light-horizontal-sm.png.import b/mirror-godot-app/ui/common/images/mirror-light-horizontal-sm.png.import new file mode 100644 index 00000000..714859ae --- /dev/null +++ b/mirror-godot-app/ui/common/images/mirror-light-horizontal-sm.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bbmccijfyoejn" +path="res://.godot/imported/mirror-light-horizontal-sm.png-da934c27dff04c95b7510c98de1d0aae.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ui/common/images/mirror-light-horizontal-sm.png" +dest_files=["res://.godot/imported/mirror-light-horizontal-sm.png-da934c27dff04c95b7510c98de1d0aae.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/mirror-godot-app/ui/common/images/purple_bg.jpg b/mirror-godot-app/ui/common/images/purple_bg.jpg new file mode 100644 index 00000000..d79eab15 Binary files /dev/null and b/mirror-godot-app/ui/common/images/purple_bg.jpg differ diff --git a/mirror-godot-app/ui/common/images/purple_bg.jpg.import b/mirror-godot-app/ui/common/images/purple_bg.jpg.import new file mode 100644 index 00000000..f208de37 --- /dev/null +++ b/mirror-godot-app/ui/common/images/purple_bg.jpg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c8ylhrvmq43sr" +path="res://.godot/imported/purple_bg.jpg-1b50b8d0c4907eafef93285b74ab8b17.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ui/common/images/purple_bg.jpg" +dest_files=["res://.godot/imported/purple_bg.jpg-1b50b8d0c4907eafef93285b74ab8b17.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/mirror-godot-app/ui/common/images/red_bg.jpg b/mirror-godot-app/ui/common/images/red_bg.jpg new file mode 100644 index 00000000..cfd641b7 Binary files /dev/null and b/mirror-godot-app/ui/common/images/red_bg.jpg differ diff --git a/mirror-godot-app/ui/common/images/red_bg.jpg.import b/mirror-godot-app/ui/common/images/red_bg.jpg.import new file mode 100644 index 00000000..bb1926a6 --- /dev/null +++ b/mirror-godot-app/ui/common/images/red_bg.jpg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ynudu6op5xa4" +path="res://.godot/imported/red_bg.jpg-778d64917445f2d7e4e169cbffe70a4c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ui/common/images/red_bg.jpg" +dest_files=["res://.godot/imported/red_bg.jpg-778d64917445f2d7e4e169cbffe70a4c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/mirror-godot-app/ui/common/images/teal_bg.jpg b/mirror-godot-app/ui/common/images/teal_bg.jpg new file mode 100644 index 00000000..81ec8ca1 Binary files /dev/null and b/mirror-godot-app/ui/common/images/teal_bg.jpg differ diff --git a/mirror-godot-app/ui/common/images/teal_bg.jpg.import b/mirror-godot-app/ui/common/images/teal_bg.jpg.import new file mode 100644 index 00000000..86fb663f --- /dev/null +++ b/mirror-godot-app/ui/common/images/teal_bg.jpg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://clj7egq88dkx5" +path="res://.godot/imported/teal_bg.jpg-a67f6184a4ecb3e3f055bbcdd978c21f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ui/common/images/teal_bg.jpg" +dest_files=["res://.godot/imported/teal_bg.jpg-a67f6184a4ecb3e3f055bbcdd978c21f.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/mirror-godot-app/ui/common/images/yellow_bg.jpg b/mirror-godot-app/ui/common/images/yellow_bg.jpg new file mode 100644 index 00000000..b18f3b0d Binary files /dev/null and b/mirror-godot-app/ui/common/images/yellow_bg.jpg differ diff --git a/mirror-godot-app/ui/common/images/yellow_bg.jpg.import b/mirror-godot-app/ui/common/images/yellow_bg.jpg.import new file mode 100644 index 00000000..4bd5cbe6 --- /dev/null +++ b/mirror-godot-app/ui/common/images/yellow_bg.jpg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b2c8c1u26wpl8" +path="res://.godot/imported/yellow_bg.jpg-38c5c27c305c823c0fa0c835e14ad73e.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ui/common/images/yellow_bg.jpg" +dest_files=["res://.godot/imported/yellow_bg.jpg-38c5c27c305c823c0fa0c835e14ad73e.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/mirror-godot-app/ui/hover_text/hoverable_checkbox.tscn b/mirror-godot-app/ui/hover_text/hoverable_checkbox.tscn index 34e497ce..f2e20b10 100644 --- a/mirror-godot-app/ui/hover_text/hoverable_checkbox.tscn +++ b/mirror-godot-app/ui/hover_text/hoverable_checkbox.tscn @@ -12,7 +12,7 @@ size_flags_vertical = 4 focus_mode = 1 theme_override_constants/h_separation = 12 theme_override_fonts/font = ExtResource("1_d01tb") -theme_override_font_sizes/font_size = 12 +theme_override_font_sizes/font_size = 14 text = "Checkbox" flat = true alignment = 1 diff --git a/mirror-godot-app/ui/login/login-background.png b/mirror-godot-app/ui/login/login-background.png deleted file mode 100644 index 7b1ac021..00000000 Binary files a/mirror-godot-app/ui/login/login-background.png and /dev/null differ diff --git a/mirror-godot-app/ui/login/login_ui.tscn b/mirror-godot-app/ui/login/login_ui.tscn index a62d40f3..f5469a94 100644 --- a/mirror-godot-app/ui/login/login_ui.tscn +++ b/mirror-godot-app/ui/login/login_ui.tscn @@ -2,9 +2,9 @@ [ext_resource type="Script" path="res://ui/login/login_ui.gd" id="1_jnny8"] [ext_resource type="Theme" uid="uid://ggwm8asxintx" path="res://ui/common/themes/menu_ui.theme.tres" id="1_ltd4e"] -[ext_resource type="Texture2D" uid="uid://kq6e5t72lfel" path="res://ui/login/login-background.png" id="3_f1hcg"] +[ext_resource type="Texture2D" uid="uid://cteylgdhn7712" path="res://ui/login/new_bg.jpg" id="3_2ajkh"] +[ext_resource type="Texture2D" uid="uid://b8a6plrtwhc1x" path="res://ui/login/mirror_light_horizontal_new.png" id="4_offpx"] [ext_resource type="Script" path="res://ui/login/app_logo_branding_from_config.gd" id="5_8lxjt"] -[ext_resource type="Texture2D" uid="uid://dado8tm3ai4q" path="res://ui/common/images/logo-default.svg" id="7_tbjhu"] [ext_resource type="FontFile" uid="uid://s44wjlc18fo7" path="res://ui/ui_rect_and_font/montserrat/static/montserrat_bold.ttf" id="8_28d3i"] [ext_resource type="StyleBox" uid="uid://nen4cpg1225q" path="res://ui/common/panels/panel_basic_rounded.stylebox.tres" id="8_eu7c4"] [ext_resource type="Shader" path="res://ui/common/shaders/ui_blurr.gdshader" id="8_uraan"] @@ -25,7 +25,7 @@ [sub_resource type="ShaderMaterial" id="ShaderMaterial_tm8vm"] shader = ExtResource("8_uraan") shader_parameter/blur = 3.0 -shader_parameter/color = Color(1, 1, 1, 1) +shader_parameter/color = Color(1, 1, 1, 0) shader_parameter/strength = 0.15 [sub_resource type="Theme" id="Theme_ij11x"] @@ -67,12 +67,13 @@ script = ExtResource("1_jnny8") [node name="TextureRect" type="TextureRect" parent="."] self_modulate = Color(0.239216, 0.247059, 0.309804, 0.878431) -layout_mode = 0 +layout_mode = 1 +anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -texture = ExtResource("3_f1hcg") +texture = ExtResource("3_2ajkh") expand_mode = 1 stretch_mode = 6 @@ -93,7 +94,7 @@ metadata/_edit_layout_mode = 1 [node name="TextureRect" type="TextureRect" parent="VBoxContainer"] custom_minimum_size = Vector2(0, 56) layout_mode = 2 -texture = ExtResource("7_tbjhu") +texture = ExtResource("4_offpx") expand_mode = 1 stretch_mode = 5 script = ExtResource("5_8lxjt") @@ -140,7 +141,7 @@ theme_override_constants/separation = 30 layout_mode = 2 theme_override_fonts/font = SubResource("Font_mbwka") theme_override_font_sizes/font_size = 40 -text = "Sign in +text = "Sign In " horizontal_alignment = 1 vertical_alignment = 1 diff --git a/mirror-godot-app/ui/login/mirror_light_horizontal_new.png b/mirror-godot-app/ui/login/mirror_light_horizontal_new.png new file mode 100644 index 00000000..a6c4c84a Binary files /dev/null and b/mirror-godot-app/ui/login/mirror_light_horizontal_new.png differ diff --git a/mirror-godot-app/ui/login/login-background.png.import b/mirror-godot-app/ui/login/mirror_light_horizontal_new.png.import similarity index 50% rename from mirror-godot-app/ui/login/login-background.png.import rename to mirror-godot-app/ui/login/mirror_light_horizontal_new.png.import index 70f42957..f508b406 100644 --- a/mirror-godot-app/ui/login/login-background.png.import +++ b/mirror-godot-app/ui/login/mirror_light_horizontal_new.png.import @@ -2,22 +2,20 @@ importer="texture" type="CompressedTexture2D" -uid="uid://kq6e5t72lfel" -path.s3tc="res://.godot/imported/login-background.png-bb117bcb444e3a11d9b92ea19d6b9efa.s3tc.ctex" -path.etc2="res://.godot/imported/login-background.png-bb117bcb444e3a11d9b92ea19d6b9efa.etc2.ctex" +uid="uid://b8a6plrtwhc1x" +path="res://.godot/imported/mirror_light_horizontal_new.png-1effe017b50a101817f785bdc3586c20.ctex" metadata={ -"imported_formats": ["s3tc_bptc", "etc2_astc"], -"vram_texture": true +"vram_texture": false } [deps] -source_file="res://ui/login/login-background.png" -dest_files=["res://.godot/imported/login-background.png-bb117bcb444e3a11d9b92ea19d6b9efa.s3tc.ctex", "res://.godot/imported/login-background.png-bb117bcb444e3a11d9b92ea19d6b9efa.etc2.ctex"] +source_file="res://ui/login/mirror_light_horizontal_new.png" +dest_files=["res://.godot/imported/mirror_light_horizontal_new.png-1effe017b50a101817f785bdc3586c20.ctex"] [params] -compress/mode=2 +compress/mode=0 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 diff --git a/mirror-godot-app/ui/login/new_bg.jpg b/mirror-godot-app/ui/login/new_bg.jpg new file mode 100644 index 00000000..a2cb3969 Binary files /dev/null and b/mirror-godot-app/ui/login/new_bg.jpg differ diff --git a/mirror-godot-app/ui/login/new_bg.jpg.import b/mirror-godot-app/ui/login/new_bg.jpg.import new file mode 100644 index 00000000..35a0b06c --- /dev/null +++ b/mirror-godot-app/ui/login/new_bg.jpg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cteylgdhn7712" +path="res://.godot/imported/new_bg.jpg-a1f1e4e0ce6bbb3fd5b2c3858152724c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ui/login/new_bg.jpg" +dest_files=["res://.godot/imported/new_bg.jpg-a1f1e4e0ce6bbb3fd5b2c3858152724c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/mirror-godot-app/ui/main_menu/main_menu_ui.gd b/mirror-godot-app/ui/main_menu/main_menu_ui.gd index 1d911a3b..599a2eac 100644 --- a/mirror-godot-app/ui/main_menu/main_menu_ui.gd +++ b/mirror-godot-app/ui/main_menu/main_menu_ui.gd @@ -172,6 +172,7 @@ func change_page(page_name: StringName) -> void: _previous_page = _current_page _current_page = new_current_page _reset_subpages(_current_page) + _check_update_background_image() _current_page.show() print("Page changed to %s" % str(_current_page.name)) _keep_page_as_selected(_previous_page.name) @@ -183,6 +184,13 @@ func change_page(page_name: StringName) -> void: _audio_stream_player.play() +# Updates the BG if there's metadata for it +func _check_update_background_image() -> void: + var bg_texture = _current_page.get_meta(&"bg_texture", null) + if bg_texture != null: + _background.texture = bg_texture + + func get_page_from_name(page_name) -> Control: return $Pages.get_node(String(page_name)) diff --git a/mirror-godot-app/ui/main_menu/main_menu_ui.tscn b/mirror-godot-app/ui/main_menu/main_menu_ui.tscn index 0da2380f..97eb6ef1 100644 --- a/mirror-godot-app/ui/main_menu/main_menu_ui.tscn +++ b/mirror-godot-app/ui/main_menu/main_menu_ui.tscn @@ -1,17 +1,21 @@ -[gd_scene load_steps=39 format=3 uid="uid://ch0uw2fa08s6a"] +[gd_scene load_steps=44 format=3 uid="uid://ch0uw2fa08s6a"] [ext_resource type="Theme" uid="uid://ggwm8asxintx" path="res://ui/common/themes/menu_ui.theme.tres" id="1_bsgag"] [ext_resource type="Script" path="res://ui/main_menu/main_menu_ui.gd" id="2_0tnty"] -[ext_resource type="Texture2D" uid="uid://dai4ge7mods7c" path="res://ui/common/images/gui_background.jpg" id="3_vn3vv"] +[ext_resource type="Texture2D" uid="uid://dmhs7xypyms7g" path="res://ui/common/images/blue_bg.jpg" id="3_fbtol"] [ext_resource type="PackedScene" uid="uid://0mra323xtoht" path="res://ui/main_menu/pages/home_page.tscn" id="4_ra4e2"] [ext_resource type="PackedScene" uid="uid://dkowcs24a0rg" path="res://ui/main_menu/pages/my_spaces.tscn" id="6_dxmr5"] +[ext_resource type="Texture2D" uid="uid://b2c8c1u26wpl8" path="res://ui/common/images/yellow_bg.jpg" id="6_e07s2"] [ext_resource type="Theme" uid="uid://d1qd6ity2mdpl" path="res://creator/creator_ui.theme.tres" id="7_3j0pc"] [ext_resource type="PackedScene" uid="uid://cprw7dhdbphw3" path="res://ui/main_menu/pages/build_spaces.tscn" id="7_al6u3"] [ext_resource type="Shader" path="res://ui/common/shaders/ui_blurr.gdshader" id="8_w8ibq"] [ext_resource type="PackedScene" uid="uid://tgcx8ymhgpxe" path="res://ui/main_menu/pages/avatar/avatar.tscn" id="9_aqh2v"] +[ext_resource type="Texture2D" uid="uid://ynudu6op5xa4" path="res://ui/common/images/red_bg.jpg" id="9_wg5xp"] [ext_resource type="PackedScene" uid="uid://cx2mo1w80rpi6" path="res://ui/main_menu/pages/settings/settings.tscn" id="10_6f3nv"] [ext_resource type="PackedScene" uid="uid://qan235j7m5xi" path="res://ui/main_menu/header.tscn" id="10_jeyvr"] +[ext_resource type="Texture2D" uid="uid://clj7egq88dkx5" path="res://ui/common/images/teal_bg.jpg" id="11_5ctgy"] [ext_resource type="Texture2D" uid="uid://15cvus520agc" path="res://ui/common/images/logo-icon.svg" id="11_8pcq8"] +[ext_resource type="Texture2D" uid="uid://c8ylhrvmq43sr" path="res://ui/common/images/purple_bg.jpg" id="11_amoyd"] [ext_resource type="Texture2D" uid="uid://pyiiu7es8s11" path="res://ui/art/close.svg" id="12_a3gvo"] [ext_resource type="Texture2D" uid="uid://cbl1xcmq3sicl" path="res://ui/art/accordian_open.png" id="12_pjn6c"] [ext_resource type="Theme" uid="uid://6eru14yfat8d" path="res://ui/in_game_menu/in_game_menu_ui_theme.tres" id="14_4mpjs"] @@ -31,6 +35,9 @@ [ext_resource type="Script" path="res://ui/main_menu/end_preview_button.gd" id="26_nsk5e"] [ext_resource type="AudioStream" uid="uid://cvgwto68ecirv" path="res://ui/main_menu/audio/back_close.wav" id="31_rrg3a"] +[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_4jjhp"] +load_path = "res://.godot/imported/blue_bg.jpg-9388e80f4f099bfea8a9c2c05cb56a97.ctex" + [sub_resource type="ShaderMaterial" id="ShaderMaterial_0aacv"] shader = ExtResource("8_w8ibq") shader_parameter/blur = 1.5 @@ -116,7 +123,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -texture = ExtResource("3_vn3vv") +texture = SubResource("CompressedTexture2D_4jjhp") expand_mode = 1 [node name="Pages" type="Control" parent="."] @@ -130,23 +137,28 @@ metadata/_edit_use_anchors_ = true [node name="Home" parent="Pages" instance=ExtResource("4_ra4e2")] layout_mode = 1 +metadata/bg_texture = ExtResource("3_fbtol") [node name="My_Spaces" parent="Pages" instance=ExtResource("6_dxmr5")] visible = false layout_mode = 1 +metadata/bg_texture = ExtResource("6_e07s2") [node name="Discover" parent="Pages" instance=ExtResource("7_al6u3")] visible = false layout_mode = 1 theme = ExtResource("7_3j0pc") +metadata/bg_texture = ExtResource("9_wg5xp") [node name="Avatar" parent="Pages" instance=ExtResource("9_aqh2v")] visible = false layout_mode = 1 +metadata/bg_texture = ExtResource("11_5ctgy") [node name="Settings" parent="Pages" instance=ExtResource("10_6f3nv")] visible = false layout_mode = 1 +metadata/bg_texture = ExtResource("11_amoyd") [node name="HeaderMenu" parent="." instance=ExtResource("10_jeyvr")] layout_mode = 1 diff --git a/mirror-godot-app/ui/main_menu/pages/avatar/avatar.tscn b/mirror-godot-app/ui/main_menu/pages/avatar/avatar.tscn index 8e1d4f34..950d99ab 100644 --- a/mirror-godot-app/ui/main_menu/pages/avatar/avatar.tscn +++ b/mirror-godot-app/ui/main_menu/pages/avatar/avatar.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=32 format=3 uid="uid://tgcx8ymhgpxe"] +[gd_scene load_steps=31 format=3 uid="uid://tgcx8ymhgpxe"] [ext_resource type="FontFile" uid="uid://s44wjlc18fo7" path="res://ui/ui_rect_and_font/montserrat/static/montserrat_bold.ttf" id="1_chmdu"] [ext_resource type="Theme" uid="uid://bh8yrbn5ro73t" path="res://ui/main_menu/pages/avatar/avatar.theme.tres" id="1_dxy3m"] -[ext_resource type="Texture2D" uid="uid://cr6fkxjlvwjht" path="res://ui/main_menu/pages/avatar/avatar_bg.jpg" id="2_s65jp"] [ext_resource type="Script" path="res://ui/main_menu/pages/avatar/avatar.gd" id="2_xlv33"] -[ext_resource type="Texture2D" uid="uid://cibiglfilejrb" path="res://ui/main_menu/pages/avatar/astronaut_thumb.png" id="3_uujm5"] +[ext_resource type="Texture2D" uid="uid://clj7egq88dkx5" path="res://ui/common/images/teal_bg.jpg" id="3_e25bj"] [ext_resource type="Texture2D" uid="uid://cyrf2pikima4o" path="res://ui/main_menu/pages/avatar/female_thumb.png" id="4_clwhc"] [ext_resource type="FontFile" uid="uid://bjwepurchoc75" path="res://ui/ui_rect_and_font/montserrat/static/montserrat_semi_bold.ttf" id="6_ghwx0"] [ext_resource type="Texture2D" uid="uid://cfn6g856rvk6u" path="res://ui/main_menu/pages/avatar/rpm_avatars.png" id="7_yffjy"] @@ -112,7 +111,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -texture = ExtResource("2_s65jp") +texture = ExtResource("3_e25bj") expand_mode = 1 stretch_mode = 6 @@ -151,20 +150,20 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 -[node name="TextureRect" type="TextureRect" parent="HBoxContainer/VBoxContainer/HBoxContainer/Preset1"] +[node name="Label" type="Label" parent="HBoxContainer/VBoxContainer/HBoxContainer/Preset1"] +auto_translate_mode = 1 layout_mode = 1 -anchors_preset = 5 +anchors_preset = -1 anchor_left = 0.5 +anchor_top = 0.5 anchor_right = 0.5 -offset_left = -87.0 -offset_top = -61.0 -offset_right = 87.0 -offset_bottom = 149.0 +anchor_bottom = 0.5 grow_horizontal = 2 -texture = ExtResource("3_uujm5") -expand_mode = 1 -stretch_mode = 5 -metadata/_edit_layout_mode = 1 +grow_vertical = 2 +theme_override_fonts/font = SubResource("Font_b8rqi") +theme_override_font_sizes/font_size = 28 +text = "Default" +horizontal_alignment = 1 [node name="Preset2" type="Button" parent="HBoxContainer/VBoxContainer/HBoxContainer"] visible = false diff --git a/mirror-godot-app/ui/main_menu/pages/build_spaces.tscn b/mirror-godot-app/ui/main_menu/pages/build_spaces.tscn index 117c0ae9..fcf02ece 100644 --- a/mirror-godot-app/ui/main_menu/pages/build_spaces.tscn +++ b/mirror-godot-app/ui/main_menu/pages/build_spaces.tscn @@ -29,7 +29,7 @@ layout_mode = 1 _data_source = 1 [node name="Title" parent="Pages/DiscoverSpaceSelect/VBoxContainer/MarginContainer/VBoxContainer" index="1"] -text = "Discover Spaces" +text = "Discover" [node name="ViewSpace" parent="Pages" instance=ExtResource("5_1b50l")] visible = false diff --git a/mirror-godot-app/ui/main_menu/pages/home/home_spaces_section.tscn b/mirror-godot-app/ui/main_menu/pages/home/home_spaces_section.tscn index 6395d3a0..ff1bf540 100644 --- a/mirror-godot-app/ui/main_menu/pages/home/home_spaces_section.tscn +++ b/mirror-godot-app/ui/main_menu/pages/home/home_spaces_section.tscn @@ -21,7 +21,7 @@ size_flags_horizontal = 4 [node name="TitleLabel" type="Label" parent="TitleBar"] layout_mode = 2 -text = "Popular spaces" +text = "Discover" label_settings = SubResource("LabelSettings_gcepv") uppercase = true diff --git a/mirror-godot-app/ui/main_menu/pages/home_page.tscn b/mirror-godot-app/ui/main_menu/pages/home_page.tscn index c9829862..277cdfcf 100644 --- a/mirror-godot-app/ui/main_menu/pages/home_page.tscn +++ b/mirror-godot-app/ui/main_menu/pages/home_page.tscn @@ -2,8 +2,8 @@ [ext_resource type="Theme" uid="uid://d1qd6ity2mdpl" path="res://creator/creator_ui.theme.tres" id="1_ddtg3"] [ext_resource type="Script" path="res://ui/main_menu/pages/home_page.gd" id="1_g044v"] -[ext_resource type="Texture2D" uid="uid://dado8tm3ai4q" path="res://ui/common/images/logo-default.svg" id="2_byxtm"] [ext_resource type="PackedScene" uid="uid://48n8qruuys5w" path="res://ui/main_menu/pages/home/home_spaces_section.tscn" id="2_l3jcy"] +[ext_resource type="Texture2D" uid="uid://bbmccijfyoejn" path="res://ui/common/images/mirror-light-horizontal-sm.png" id="3_7cptg"] [ext_resource type="PackedScene" uid="uid://d0ritou4okory" path="res://ui/main_menu/pages/home/home_space_panel_empty.tscn" id="3_scd2x"] [ext_resource type="PackedScene" uid="uid://bxip7xuk82fsr" path="res://ui/main_menu/pages/view_space.tscn" id="4_57sjc"] [ext_resource type="PackedScene" uid="uid://brrda4tvbd43x" path="res://ui/main_menu/pages/edit_space/edit_space.tscn" id="6_duhnl"] @@ -63,7 +63,7 @@ layout_mode = 2 [node name="MainLogo" type="TextureRect" parent="Pages/HomeSpaceSelect/VBoxContainer/MarginContainer/VBoxContainer"] layout_mode = 2 -texture = ExtResource("2_byxtm") +texture = ExtResource("3_7cptg") stretch_mode = 3 [node name="Description" type="Label" parent="Pages/HomeSpaceSelect/VBoxContainer/MarginContainer/VBoxContainer"] @@ -106,7 +106,7 @@ size_flags_vertical = 3 [node name="Title" type="Label" parent="Pages/HomeSpaceSelect/VBoxContainer/Panel/MarginContainer/ScrollContainer/VBoxContainer"] layout_mode = 2 theme_override_font_sizes/font_size = 40 -text = "Welcome to The Mirror Alpha" +text = "Welcome to the Alpha" horizontal_alignment = 1 [node name="SpacesSectionPopular" parent="Pages/HomeSpaceSelect/VBoxContainer/Panel/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource("2_l3jcy")] @@ -119,7 +119,7 @@ layout_mode = 2 size_flags_horizontal = 3 [node name="Reload" type="Button" parent="Pages/HomeSpaceSelect/VBoxContainer/Panel/MarginContainer/ScrollContainer/VBoxContainer/SpacesSectionPopular/TitleBar/HBoxContainer"] -custom_minimum_size = Vector2(16, 16) +custom_minimum_size = Vector2(38, 16) layout_mode = 2 size_flags_horizontal = 10 theme = ExtResource("1_ddtg3") @@ -128,9 +128,10 @@ theme_override_font_sizes/font_size = 16 text = ":refresh:" [node name="Create" type="Button" parent="Pages/HomeSpaceSelect/VBoxContainer/Panel/MarginContainer/ScrollContainer/VBoxContainer/SpacesSectionPopular/TitleBar/HBoxContainer"] -custom_minimum_size = Vector2(0, 40) +custom_minimum_size = Vector2(150, 40) layout_mode = 2 size_flags_horizontal = 8 +theme_override_font_sizes/font_size = 18 text = "+ New Space" [node name="SpacesSectionRecents" parent="Pages/HomeSpaceSelect/VBoxContainer/Panel/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource("2_l3jcy")] diff --git a/mirror-godot-app/ui/main_menu/pages/my_spaces.tscn b/mirror-godot-app/ui/main_menu/pages/my_spaces.tscn index f3535354..8f3ede71 100644 --- a/mirror-godot-app/ui/main_menu/pages/my_spaces.tscn +++ b/mirror-godot-app/ui/main_menu/pages/my_spaces.tscn @@ -33,9 +33,16 @@ item_width = 376 [node name="MySpaceSelect" parent="Pages" instance=ExtResource("2_38vl8")] layout_mode = 1 +[node name="SourceOptionButton" parent="Pages/MySpaceSelect/VBoxContainer/MarginContainer/VBoxContainer/HBoxContainer" index="0"] +theme_override_font_sizes/font_size = 16 + +[node name="Refresh" parent="Pages/MySpaceSelect/VBoxContainer/MarginContainer/VBoxContainer/HBoxContainer" index="2"] +custom_minimum_size = Vector2(38, 32) + [node name="NewButton" type="Button" parent="Pages/MySpaceSelect/VBoxContainer/MarginContainer/VBoxContainer/HBoxContainer" index="3"] -custom_minimum_size = Vector2(100, 0) +custom_minimum_size = Vector2(150, 0) layout_mode = 2 +theme_override_font_sizes/font_size = 18 text = "+ New Space" [node name="ViewSpace" parent="Pages" instance=ExtResource("4_01gef")] diff --git a/mirror-godot-app/ui/main_menu/pages/space_select.tscn b/mirror-godot-app/ui/main_menu/pages/space_select.tscn index 004ab0a5..8b935866 100644 --- a/mirror-godot-app/ui/main_menu/pages/space_select.tscn +++ b/mirror-godot-app/ui/main_menu/pages/space_select.tscn @@ -45,7 +45,7 @@ corner_radius_bottom_left = 5 [sub_resource type="LabelSettings" id="LabelSettings_p2v8i"] line_spacing = 0.0 font = ExtResource("3_xdod4") -font_size = 8 +font_size = 10 font_color = Color(0.403922, 0.45098, 0.592157, 1) [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_8y7rc"] @@ -112,8 +112,8 @@ theme_override_styles/focus = SubResource("StyleBoxFlat_to6xd") theme_override_styles/hover = SubResource("StyleBoxFlat_44eih") theme_override_styles/pressed = SubResource("StyleBoxFlat_44eih") theme_override_styles/normal = SubResource("StyleBoxFlat_0gnba") -item_count = 2 selected = 0 +item_count = 2 popup/item_0/text = "Popular" popup/item_0/id = 0 popup/item_1/text = "Last Updated" @@ -122,12 +122,18 @@ popup/item_1/id = 1 [node name="Label" type="Label" parent="VBoxContainer/MarginContainer/VBoxContainer/HBoxContainer/SourceOptionButton"] layout_mode = 0 offset_left = 8.0 -offset_top = 4.0 -offset_right = 41.0 -offset_bottom = 18.0 +offset_top = 2.0 +offset_right = 46.0 +offset_bottom = 16.0 text = "Sort by" label_settings = SubResource("LabelSettings_p2v8i") +[node name="SearchField" parent="VBoxContainer/MarginContainer/VBoxContainer/HBoxContainer" instance=ExtResource("4_atsy6")] +unique_name_in_owner = true +layout_mode = 2 +size_flags_horizontal = 3 +placeholder_text = "Search..." + [node name="Refresh" type="Button" parent="VBoxContainer/MarginContainer/VBoxContainer/HBoxContainer"] custom_minimum_size = Vector2(32, 32) layout_mode = 2 @@ -136,12 +142,6 @@ theme_override_fonts/font = ExtResource("5_4vfgi") theme_override_font_sizes/font_size = 16 text = ":refresh:" -[node name="SearchField" parent="VBoxContainer/MarginContainer/VBoxContainer/HBoxContainer" instance=ExtResource("4_atsy6")] -unique_name_in_owner = true -layout_mode = 2 -size_flags_horizontal = 3 -placeholder_text = "Search..." - [node name="Panel" type="Panel" parent="VBoxContainer"] layout_mode = 2 size_flags_horizontal = 3 @@ -181,7 +181,7 @@ stream = ExtResource("6_jogvj") volume_db = -10.0 [connection signal="item_selected" from="VBoxContainer/MarginContainer/VBoxContainer/HBoxContainer/SourceOptionButton" to="." method="_on_source_option_button_item_selected"] -[connection signal="pressed" from="VBoxContainer/MarginContainer/VBoxContainer/HBoxContainer/Refresh" to="." method="_on_refresh_pressed"] [connection signal="text_changed" from="VBoxContainer/MarginContainer/VBoxContainer/HBoxContainer/SearchField" to="." method="on_search_title"] +[connection signal="pressed" from="VBoxContainer/MarginContainer/VBoxContainer/HBoxContainer/Refresh" to="." method="_on_refresh_pressed"] [editable path="VBoxContainer/Panel/MarginContainer/EndlessScrollFlowContainer"]