Merge branch 'issue1' into 'develop'
Correct issue #1, remove map0-1.tres See merge request khaganat/mmorpg_khanat/khanat-client!1
This commit is contained in:
commit
2521d143ab
1 changed files with 0 additions and 6 deletions
|
@ -3,7 +3,6 @@
|
|||
[ext_resource path="res://scenes/interfaces/main_menu/main_menu.tscn" type="PackedScene" id=1]
|
||||
[ext_resource path="res://scenes/interfaces/loading_screen/loading_screen.tscn" type="PackedScene" id=2]
|
||||
[ext_resource path="res://scenes/main/main.gd" type="Script" id=3]
|
||||
[ext_resource path="res://map0-1.tres" type="ArrayMesh" id=4]
|
||||
|
||||
[node name="main" type="Spatial"]
|
||||
script = ExtResource( 3 )
|
||||
|
@ -17,10 +16,5 @@ margin_bottom = 1.49829
|
|||
[node name="loading_screen" parent="." instance=ExtResource( 2 )]
|
||||
visible = false
|
||||
|
||||
[node name="mesh_instance_2" type="MeshInstance" parent="."]
|
||||
visible = false
|
||||
mesh = ExtResource( 4 )
|
||||
material/0 = null
|
||||
|
||||
[connection signal="play_pressed" from="main_menu" to="." method="_on_main_menu_play_pressed"]
|
||||
[connection signal="quit_pressed" from="main_menu" to="." method="_on_main_menu_quit_pressed"]
|
||||
|
|
Loading…
Reference in a new issue