Merge branch 'main' into bump-to-godot-4.3

decentraland · Sep 27, 2024 · ee19c40 · ee19c40
2 parents d6c3db9 + 14da6fe
commit ee19c40
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/godot/export_presets.cfg b/godot/export_presets.cfg
@@ -234,7 +234,7 @@ architectures/armeabi-v7a=false
 architectures/arm64-v8a=true
 architectures/x86=false
 architectures/x86_64=true
-version/code=11
+version/code=12
 version/name="1.0"
 package/unique_name="org.decentraland.godotexplorer"
 package/name="Decentraland"

diff --git a/godot/src/ui/components/auth/lobby.tscn b/godot/src/ui/components/auth/lobby.tscn
@@ -431,6 +431,7 @@ layout_mode = 2
 
 [node name="MagicLogin" parent="Main/SignIn/VBoxContainer/VBoxContainer_SignInStep1" instance=ExtResource("14_a8lfo")]
 unique_name_in_owner = true
+visible = false
 layout_mode = 2
 
 [node name="Button_OpenBrowser" type="Button" parent="Main/SignIn/VBoxContainer/VBoxContainer_SignInStep1"]
@@ -441,7 +442,7 @@ focus_mode = 0
 theme_override_constants/icon_max_width = 24
 theme_override_fonts/font = ExtResource("4_ghcwt")
 theme_override_font_sizes/font_size = 18
-text = "BROWSER MULTILOGIN (LEGACY)"
+text = "SIGN IN"
 icon_alignment = 2
 
 [node name="HSeparator4" type="HSeparator" parent="Main/SignIn/VBoxContainer/VBoxContainer_SignInStep1"]