diff options
Diffstat (limited to 'client/menu')
| -rw-r--r-- | client/menu/ingame_menu.tscn | 22 | ||||
| -rw-r--r-- | client/menu/main_menu.gd | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/client/menu/ingame_menu.tscn b/client/menu/ingame_menu.tscn index 641ec0d9..7f2bfa5d 100644 --- a/client/menu/ingame_menu.tscn +++ b/client/menu/ingame_menu.tscn @@ -5,8 +5,8 @@ [ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme.tres" id="1_tm331"] [ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/font-sansita-swashed.woff2" id="2_4u0ox"] -[sub_resource type="Animation" id="Animation_660jl"] -resource_name = "activate" +[sub_resource type="Animation" id="Animation_8sedy"] +length = 0.001 tracks/0/type = "bezier" tracks/0/imported = false tracks/0/enabled = true @@ -14,13 +14,13 @@ tracks/0/path = NodePath("side:position:x") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { -"handle_modes": PackedInt32Array(0, 0), -"points": PackedFloat32Array(-400, -0.25, 0, 0.25, 0, 0, -0.25, 0, 0.25, 0), -"times": PackedFloat32Array(0, 1) +"handle_modes": PackedInt32Array(0), +"points": PackedFloat32Array(-400, -0.25, 0, 0.25, 0), +"times": PackedFloat32Array(0) } -[sub_resource type="Animation" id="Animation_8sedy"] -length = 0.001 +[sub_resource type="Animation" id="Animation_660jl"] +resource_name = "activate" tracks/0/type = "bezier" tracks/0/imported = false tracks/0/enabled = true @@ -28,9 +28,9 @@ tracks/0/path = NodePath("side:position:x") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { -"handle_modes": PackedInt32Array(0), -"points": PackedFloat32Array(-400, -0.25, 0, 0.25, 0), -"times": PackedFloat32Array(0) +"handle_modes": PackedInt32Array(0, 0), +"points": PackedFloat32Array(-400, -0.25, 0, 0.25, 0, 0, -0.25, 0, 0.25, 0), +"times": PackedFloat32Array(0, 1) } [sub_resource type="AnimationLibrary" id="AnimationLibrary_u0kyp"] @@ -72,7 +72,7 @@ anchors_preset = 9 anchor_bottom = 1.0 offset_left = -400.0 offset_right = -90.0 -offset_bottom = 1296.0 +offset_bottom = 1944.0 grow_vertical = 2 [node name="margin" type="MarginContainer" parent="side"] diff --git a/client/menu/main_menu.gd b/client/menu/main_menu.gd index e7ffa70a..b19d72a6 100644 --- a/client/menu/main_menu.gd +++ b/client/menu/main_menu.gd @@ -45,7 +45,7 @@ func _on_quick_connect_pressed(): func connect_to(url): print("Connecting to %s" % url) - Multiplayer.url = url + Global.server_url = url $SceneTransition.transition_to("res://game.tscn") func _on_change_character_pressed(): |