diff --git a/project/resources/bookmarks.tres b/project/resources/bookmarks.tres index ca56c1d..8532331 100644 --- a/project/resources/bookmarks.tres +++ b/project/resources/bookmarks.tres @@ -8,7 +8,7 @@ script = ExtResource("1_yi510") url = "http://95.163.241.188:8000" title = "Portals" description = "Explore other worlds!" -image = "res://textures/portals.png" +image = "" [resource] script = ExtResource("1_1h3wl") diff --git a/project/scenes/components/hint.tscn b/project/scenes/components/hint.tscn index 1027ba1..c1d30df 100644 --- a/project/scenes/components/hint.tscn +++ b/project/scenes/components/hint.tscn @@ -1,7 +1,7 @@ -[gd_scene load_steps=8 format=3] +[gd_scene load_steps=8 format=3 uid="uid://m622v03jydnq"] [ext_resource type="Script" path="res://scripts/ui/hint.gd" id="1_mhnl1"] -[ext_resource type="Texture2D" uid="uid://w63bxq7p14av" path="res://textures/arrow.png" id="2_o5lwa"] +[ext_resource type="Texture2D" uid="uid://byvigfpu44dnu" path="res://textures/arrow.svg" id="2_amrir"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_7wdcy"] bg_color = Color(0.22, 0.22, 0.22, 0.631373) @@ -14,13 +14,9 @@ corner_radius_top_left = 20 corner_radius_top_right = 20 corner_radius_bottom_right = 20 corner_radius_bottom_left = 20 -anti_aliasing_size = 1.0 [sub_resource type="LabelSettings" id="LabelSettings_8td41"] -[sub_resource type="Animation" id="Animation_a1w2o"] -length = 0.001 - [sub_resource type="Animation" id="Animation_tul52"] resource_name = "Hint" step = 0.05 @@ -37,6 +33,9 @@ tracks/0/keys = { "values": [Vector2(0, 0), Vector2(0, -20), Vector2(0, 0), Vector2(0, -20), Vector2(0, 0)] } +[sub_resource type="Animation" id="Animation_a1w2o"] +length = 0.001 + [sub_resource type="AnimationLibrary" id="AnimationLibrary_l0m26"] _data = { "Bounce": SubResource("Animation_tul52"), @@ -57,7 +56,7 @@ grow_horizontal = 2 script = ExtResource("1_mhnl1") [node name="AnimRoot" type="Control" parent="."] -layout_mode = 3 +layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 @@ -65,7 +64,7 @@ grow_horizontal = 2 grow_vertical = 2 [node name="Background" type="Panel" parent="AnimRoot"] -anchors_preset = 15 +layout_mode = 0 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 @@ -73,7 +72,7 @@ grow_vertical = 2 theme_override_styles/panel = SubResource("StyleBoxFlat_7wdcy") [node name="Label" type="Label" parent="AnimRoot"] -anchors_preset = 15 +layout_mode = 0 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 @@ -85,21 +84,22 @@ vertical_alignment = 1 [node name="TextureRect" type="TextureRect" parent="AnimRoot"] modulate = Color(1, 1, 0, 1) +layout_mode = 1 anchors_preset = 7 anchor_left = 0.5 anchor_top = 1.0 anchor_right = 0.5 anchor_bottom = 1.0 offset_left = -16.0 -offset_top = -10.0 +offset_top = -7.0 offset_right = 16.0 -offset_bottom = 22.0 +offset_bottom = 25.0 grow_horizontal = 2 grow_vertical = 0 rotation = 1.5708 pivot_offset = Vector2(16, 16) -texture = ExtResource("2_o5lwa") -ignore_texture_size = true +texture = ExtResource("2_amrir") +expand_mode = 1 [node name="AnimationPlayer" type="AnimationPlayer" parent="."] libraries = { diff --git a/project/scenes/components/search.tscn b/project/scenes/components/search.tscn index c291e39..043cebc 100644 --- a/project/scenes/components/search.tscn +++ b/project/scenes/components/search.tscn @@ -4,11 +4,11 @@ [ext_resource type="Resource" uid="uid://b1xvdym0qh6td" path="res://resources/gate_events.res" id="2_13io8"] [ext_resource type="Texture2D" uid="uid://c28surtqjf4st" path="res://textures/search.svg" id="3_1rllf"] [ext_resource type="Script" path="res://scripts/ui/search_go.gd" id="3_eayvw"] -[ext_resource type="Texture2D" uid="uid://w63bxq7p14av" path="res://textures/arrow.png" id="4_8prhy"] -[ext_resource type="Texture2D" uid="uid://bvvgx8ij2mdna" path="res://textures/star.png" id="6_2b3tq"] +[ext_resource type="Texture2D" uid="uid://byvigfpu44dnu" path="res://textures/arrow.svg" id="5_dqxpp"] [ext_resource type="Script" path="res://scripts/ui/menu/star.gd" id="6_iyikx"] [ext_resource type="Resource" uid="uid://bewhdj6jugt6q" path="res://resources/bookmarks.tres" id="7_2mijb"] -[ext_resource type="Texture2D" uid="uid://c5hu6cmvuipg7" path="res://textures/star_filled.png" id="7_gpko1"] +[ext_resource type="Texture2D" uid="uid://btn6ytky782a2" path="res://textures/star.svg" id="8_b00p6"] +[ext_resource type="Texture2D" uid="uid://lxx36xkotvh1" path="res://textures/star_filled.svg" id="9_2en0l"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_hyysn"] content_margin_left = 40.0 @@ -140,7 +140,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -texture = ExtResource("4_8prhy") +texture = ExtResource("5_dqxpp") expand_mode = 1 [node name="Bookmark" type="Control" parent="." node_paths=PackedStringArray("star", "unstar")] @@ -238,7 +238,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -texture = ExtResource("6_2b3tq") +texture = ExtResource("8_b00p6") expand_mode = 1 [node name="Unstar" type="BaseButton" parent="Bookmark"] @@ -317,7 +317,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -texture = ExtResource("7_gpko1") +texture = ExtResource("9_2en0l") expand_mode = 1 [connection signal="text_changed" from="." to="." method="_on_text_changed"] diff --git a/project/scenes/menu.tscn b/project/scenes/menu.tscn index f10fbe8..62ffb23 100644 --- a/project/scenes/menu.tscn +++ b/project/scenes/menu.tscn @@ -1,5 +1,7 @@ -[gd_scene load_steps=15 format=3 uid="uid://5btb7nvgmfhl"] +[gd_scene load_steps=17 format=3 uid="uid://5btb7nvgmfhl"] +[ext_resource type="Texture2D" uid="uid://8wvea7j0v0rx" path="res://textures/Reload.svg" id="1_d6dhb"] +[ext_resource type="Texture2D" uid="uid://byvigfpu44dnu" path="res://textures/arrow.svg" id="1_wkgtd"] [ext_resource type="Script" path="res://scripts/ui/world/home.gd" id="2_l5iu6"] [ext_resource type="Texture2D" uid="uid://dystd8vvbqwo2" path="res://textures/exit.svg" id="3_1a6fk"] [ext_resource type="Resource" uid="uid://b1xvdym0qh6td" path="res://resources/gate_events.res" id="3_m632k"] @@ -194,6 +196,209 @@ grow_vertical = 2 theme_override_constants/separation = 20 alignment = 1 +[node name="GoBack" type="BaseButton" parent="VBoxContainer/Top/HBoxContainer"] +_import_path = NodePath("") +unique_name_in_owner = false +process_mode = 0 +process_priority = 0 +editor_description = "" +visible = true +modulate = Color(1, 1, 1, 1) +self_modulate = Color(1, 1, 1, 1) +show_behind_parent = false +top_level = false +clip_children = 0 +light_mask = 1 +visibility_layer = 1 +z_index = 0 +z_as_relative = true +y_sort_enabled = false +texture_filter = 0 +texture_repeat = 0 +material = null +use_parent_material = false +clip_contents = false +custom_minimum_size = Vector2(20, 20) +layout_direction = 0 +layout_mode = 2 +size_flags_horizontal = 8 +size_flags_vertical = 4 +size_flags_stretch_ratio = 1.0 +auto_translate = true +localize_numeral_system = true +tooltip_text = "" +focus_neighbor_left = NodePath("") +focus_neighbor_top = NodePath("") +focus_neighbor_right = NodePath("") +focus_neighbor_bottom = NodePath("") +focus_next = NodePath("") +focus_previous = NodePath("") +focus_mode = 2 +mouse_filter = 0 +mouse_force_pass_scroll_events = true +mouse_default_cursor_shape = 2 +theme = null +theme_type_variation = &"" +disabled = false +toggle_mode = false +button_pressed = false +action_mode = 1 +button_mask = 1 +keep_pressed_outside = false +button_group = null +shortcut = null +shortcut_feedback = true +shortcut_in_tooltip = true +script = null + +[node name="TextureRect" type="TextureRect" parent="VBoxContainer/Top/HBoxContainer/GoBack"] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +rotation = 3.14159 +pivot_offset = Vector2(10, 10) +size_flags_horizontal = 4 +size_flags_vertical = 4 +texture = ExtResource("1_wkgtd") +expand_mode = 1 + +[node name="GoForward" type="BaseButton" parent="VBoxContainer/Top/HBoxContainer"] +_import_path = NodePath("") +unique_name_in_owner = false +process_mode = 0 +process_priority = 0 +editor_description = "" +visible = true +modulate = Color(1, 1, 1, 1) +self_modulate = Color(1, 1, 1, 1) +show_behind_parent = false +top_level = false +clip_children = 0 +light_mask = 1 +visibility_layer = 1 +z_index = 0 +z_as_relative = true +y_sort_enabled = false +texture_filter = 0 +texture_repeat = 0 +material = null +use_parent_material = false +clip_contents = false +custom_minimum_size = Vector2(20, 20) +layout_direction = 0 +layout_mode = 2 +size_flags_horizontal = 8 +size_flags_vertical = 4 +size_flags_stretch_ratio = 1.0 +auto_translate = true +localize_numeral_system = true +tooltip_text = "" +focus_neighbor_left = NodePath("") +focus_neighbor_top = NodePath("") +focus_neighbor_right = NodePath("") +focus_neighbor_bottom = NodePath("") +focus_next = NodePath("") +focus_previous = NodePath("") +focus_mode = 2 +mouse_filter = 0 +mouse_force_pass_scroll_events = true +mouse_default_cursor_shape = 2 +theme = null +theme_type_variation = &"" +disabled = false +toggle_mode = false +button_pressed = false +action_mode = 1 +button_mask = 1 +keep_pressed_outside = false +button_group = null +shortcut = null +shortcut_feedback = true +shortcut_in_tooltip = true +script = null + +[node name="TextureRect" type="TextureRect" parent="VBoxContainer/Top/HBoxContainer/GoForward"] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +size_flags_horizontal = 4 +size_flags_vertical = 4 +texture = ExtResource("1_wkgtd") +expand_mode = 1 + +[node name="Reload" type="BaseButton" parent="VBoxContainer/Top/HBoxContainer"] +_import_path = NodePath("") +unique_name_in_owner = false +process_mode = 0 +process_priority = 0 +editor_description = "" +visible = true +modulate = Color(1, 1, 1, 1) +self_modulate = Color(1, 1, 1, 1) +show_behind_parent = false +top_level = false +clip_children = 0 +light_mask = 1 +visibility_layer = 1 +z_index = 0 +z_as_relative = true +y_sort_enabled = false +texture_filter = 0 +texture_repeat = 0 +material = null +use_parent_material = false +clip_contents = false +custom_minimum_size = Vector2(20, 20) +layout_direction = 0 +layout_mode = 2 +size_flags_horizontal = 8 +size_flags_vertical = 4 +size_flags_stretch_ratio = 1.0 +auto_translate = true +localize_numeral_system = true +tooltip_text = "" +focus_neighbor_left = NodePath("") +focus_neighbor_top = NodePath("") +focus_neighbor_right = NodePath("") +focus_neighbor_bottom = NodePath("") +focus_next = NodePath("") +focus_previous = NodePath("") +focus_mode = 2 +mouse_filter = 0 +mouse_force_pass_scroll_events = true +mouse_default_cursor_shape = 2 +theme = null +theme_type_variation = &"" +disabled = false +toggle_mode = false +button_pressed = false +action_mode = 1 +button_mask = 1 +keep_pressed_outside = false +button_group = null +shortcut = null +shortcut_feedback = true +shortcut_in_tooltip = true +script = null + +[node name="TextureRect" type="TextureRect" parent="VBoxContainer/Top/HBoxContainer/Reload"] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +size_flags_horizontal = 4 +size_flags_vertical = 4 +texture = ExtResource("1_d6dhb") +expand_mode = 1 + [node name="Search" parent="VBoxContainer/Top/HBoxContainer" instance=ExtResource("5_li2do")] layout_mode = 2 size_flags_horizontal = 4 @@ -224,7 +429,7 @@ clip_contents = false custom_minimum_size = Vector2(25, 25) layout_direction = 0 layout_mode = 2 -size_flags_horizontal = 4 +size_flags_horizontal = 8 size_flags_vertical = 4 size_flags_stretch_ratio = 1.0 auto_translate = true diff --git a/project/textures/Reload.svg b/project/textures/Reload.svg new file mode 100644 index 0000000..5a33b6b --- /dev/null +++ b/project/textures/Reload.svg @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + diff --git a/project/textures/star.png.import b/project/textures/Reload.svg.import similarity index 61% rename from project/textures/star.png.import rename to project/textures/Reload.svg.import index 3cc0933..a041d0d 100644 --- a/project/textures/star.png.import +++ b/project/textures/Reload.svg.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bvvgx8ij2mdna" -path="res://.godot/imported/star.png-2427054b39cb9271cf50ad4e459a83d6.ctex" +uid="uid://8wvea7j0v0rx" +path="res://.godot/imported/Reload.svg-b256d0a76db8debe7bb02e7fb6912e48.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://textures/star.png" -dest_files=["res://.godot/imported/star.png-2427054b39cb9271cf50ad4e459a83d6.ctex"] +source_file="res://textures/Reload.svg" +dest_files=["res://.godot/imported/Reload.svg-b256d0a76db8debe7bb02e7fb6912e48.ctex"] [params] @@ -32,3 +32,6 @@ process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 detect_3d/compress_to=1 +svg/scale=5.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/project/textures/arrow.png b/project/textures/arrow.png deleted file mode 100644 index 7a90f31..0000000 Binary files a/project/textures/arrow.png and /dev/null differ diff --git a/project/textures/arrow.svg b/project/textures/arrow.svg new file mode 100644 index 0000000..9000ee3 --- /dev/null +++ b/project/textures/arrow.svg @@ -0,0 +1,17 @@ + + + + + diff --git a/project/textures/arrow.png.import b/project/textures/arrow.svg.import similarity index 62% rename from project/textures/arrow.png.import rename to project/textures/arrow.svg.import index a749bcf..84ce968 100644 --- a/project/textures/arrow.png.import +++ b/project/textures/arrow.svg.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://w63bxq7p14av" -path="res://.godot/imported/arrow.png-9a93dc3b81791fee5532cccc8c8282ef.ctex" +uid="uid://byvigfpu44dnu" +path="res://.godot/imported/arrow.svg-7dfa60c559ed5e4a87888587499fd836.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://textures/arrow.png" -dest_files=["res://.godot/imported/arrow.png-9a93dc3b81791fee5532cccc8c8282ef.ctex"] +source_file="res://textures/arrow.svg" +dest_files=["res://.godot/imported/arrow.svg-7dfa60c559ed5e4a87888587499fd836.ctex"] [params] @@ -32,3 +32,6 @@ process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 detect_3d/compress_to=1 +svg/scale=5.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/project/textures/challenge.png b/project/textures/challenge.png deleted file mode 100644 index 0d8d5f0..0000000 Binary files a/project/textures/challenge.png and /dev/null differ diff --git a/project/textures/exit.svg.import b/project/textures/exit.svg.import index 21e9ad0..fc3ff9f 100644 --- a/project/textures/exit.svg.import +++ b/project/textures/exit.svg.import @@ -32,6 +32,6 @@ process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 detect_3d/compress_to=1 -svg/scale=9.0 +svg/scale=7.0 editor/scale_with_editor_scale=false editor/convert_colors_with_editor_theme=false diff --git a/project/textures/home.svg b/project/textures/home.svg index aa580ec..ba7477a 100644 --- a/project/textures/home.svg +++ b/project/textures/home.svg @@ -8,16 +8,38 @@ version="1.1" id="svg5" xml:space="preserve" + sodipodi:docname="home.svg" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" - xmlns:svg="http://www.w3.org/2000/svg"> diff --git a/project/textures/portals.png b/project/textures/portals.png deleted file mode 100644 index c2a7cdb..0000000 Binary files a/project/textures/portals.png and /dev/null differ diff --git a/project/textures/portals.png.import b/project/textures/portals.png.import deleted file mode 100644 index 65ce663..0000000 --- a/project/textures/portals.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://d3qt47a8qdeae" -path="res://.godot/imported/portals.png-a63fd8fa620779998718a7abdabdc591.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://textures/portals.png" -dest_files=["res://.godot/imported/portals.png-a63fd8fa620779998718a7abdabdc591.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/project/textures/star.png b/project/textures/star.png deleted file mode 100644 index 1ea40da..0000000 Binary files a/project/textures/star.png and /dev/null differ diff --git a/project/textures/star.svg b/project/textures/star.svg new file mode 100644 index 0000000..912fa79 --- /dev/null +++ b/project/textures/star.svg @@ -0,0 +1,41 @@ + + + + + + + + diff --git a/project/textures/star_filled.png.import b/project/textures/star.svg.import similarity index 62% rename from project/textures/star_filled.png.import rename to project/textures/star.svg.import index 4bfb74a..fa5c6ee 100644 --- a/project/textures/star_filled.png.import +++ b/project/textures/star.svg.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c5hu6cmvuipg7" -path="res://.godot/imported/star_filled.png-e847eff1c2926591ca4d52a34eeb5eb4.ctex" +uid="uid://btn6ytky782a2" +path="res://.godot/imported/star.svg-20c89f24375010d572c8a8009c916cb1.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://textures/star_filled.png" -dest_files=["res://.godot/imported/star_filled.png-e847eff1c2926591ca4d52a34eeb5eb4.ctex"] +source_file="res://textures/star.svg" +dest_files=["res://.godot/imported/star.svg-20c89f24375010d572c8a8009c916cb1.ctex"] [params] @@ -32,3 +32,6 @@ process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 detect_3d/compress_to=1 +svg/scale=5.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/project/textures/star_filled.png b/project/textures/star_filled.png deleted file mode 100644 index e2134a9..0000000 Binary files a/project/textures/star_filled.png and /dev/null differ diff --git a/project/textures/star_filled.svg b/project/textures/star_filled.svg new file mode 100644 index 0000000..5ebf76e --- /dev/null +++ b/project/textures/star_filled.svg @@ -0,0 +1,41 @@ + + + + + + + + diff --git a/project/textures/challenge.png.import b/project/textures/star_filled.svg.import similarity index 58% rename from project/textures/challenge.png.import rename to project/textures/star_filled.svg.import index b6d46d4..438f950 100644 --- a/project/textures/challenge.png.import +++ b/project/textures/star_filled.svg.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dgrvisxol1ayv" -path="res://.godot/imported/challenge.png-e9f3c4ca5ff9c4bb3cb70653af312fa6.ctex" +uid="uid://lxx36xkotvh1" +path="res://.godot/imported/star_filled.svg-23feaa5bc02880b444c30a399b45f0e2.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://textures/challenge.png" -dest_files=["res://.godot/imported/challenge.png-e9f3c4ca5ff9c4bb3cb70653af312fa6.ctex"] +source_file="res://textures/star_filled.svg" +dest_files=["res://.godot/imported/star_filled.svg-23feaa5bc02880b444c30a399b45f0e2.ctex"] [params] @@ -21,7 +21,7 @@ compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -32,3 +32,6 @@ process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 detect_3d/compress_to=1 +svg/scale=5.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false