diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn b/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn index 8f0045f2..1cb75138 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn +++ b/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn @@ -12,7 +12,7 @@ gradient = SubResource( 1 ) [node name="text_dialog_choice" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = 520.0 +margin_top = 560.0 margin_right = 7.0 theme = ExtResource( 2 ) script = ExtResource( 1 ) @@ -39,9 +39,9 @@ __meta__ = { [node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/ScrollContainer"] margin_right = 1240.0 margin_bottom = 180.0 -size_flags_horizontal = 3 -size_flags_vertical = 3 -custom_constants/separation = 20 +size_flags_horizontal = 11 +size_flags_vertical = 11 +custom_constants/separation = 10 __meta__ = { "_edit_use_anchors_": false } diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn b/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn index 60b2e827..0fd730e3 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn +++ b/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn @@ -1,11 +1,10 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=12 format=2] [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn" type="PackedScene" id=1] [ext_resource path="res://addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd" type="Script" id=2] [ext_resource path="res://addons/escoria-core/game/scenes/camera_player/camera.tscn" type="PackedScene" id=3] [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.tscn" type="PackedScene" id=4] [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/game.gd" type="Script" id=5] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/tooltip/target_tooltip.tscn" type="PackedScene" id=6] [ext_resource path="res://addons/escoria-core/ui_library/menus/main_menu/main_menu.tscn" type="PackedScene" id=7] [ext_resource path="res://addons/escoria-core/ui_library/menus/pause_menu/pause_menu.tscn" type="PackedScene" id=8] [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/theme.tres" type="Theme" id=9] @@ -91,7 +90,6 @@ visible = false [node name="tooltip_layer" type="CanvasLayer" parent="."] layer = 2 - [node name="tooltip2" parent="tooltip_layer" instance=ExtResource( 10 )] mouse_filter = 2 bbcode_text = "[center][color=#000000][/color][/center]" diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn index 25a6c473..ccb930e7 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn +++ b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn @@ -159,7 +159,7 @@ position = Vector2( 396.395, 87.9022 ) polygon = PoolVector2Array( -2.27148, -21.4121, -2.27148, 32.6816, -77.2345, 30.4277, -78.3702, -21.4121 ) [node name="turno_cocina_madera_location" type="Position2D" parent="turno_cocina_madera"] -position = Vector2( 366.864, 132.98 ) +position = Vector2( 368, 137.488 ) script = ExtResource( 5 ) [node name="turno_cocina_ajo" parent="." instance=ExtResource( 11 )]