Merge remote-tracking branch 'sasha/master'

# Conflicts:
#	Control.tscn

Control.tscn

@@ -1,19 +1,10 @@
 [gd_scene load_steps=9 format=2]
 
-[ext_resource path="res://data/DejaVuSansCondensed.ttf" type="DynamicFontData" id=1]
 [ext_resource path="res://data/мп550-работа-эскиз.png" type="Texture" id=2]
 [ext_resource path="res://main.gd" type="Script" id=3]
 [ext_resource path="res://data/УФ.png" type="Texture" id=4]
 [ext_resource path="res://Контроль.gd" type="Script" id=5]
 
-[sub_resource type="DynamicFont" id=1]
-size = 20
-outline_size = 1
-outline_color = Color( 0, 0, 0, 1 )
-use_mipmaps = true
-use_filter = true
-font_data = ExtResource( 1 )
-
 [sub_resource type="DynamicFont" id=2]
 
 [sub_resource type="Theme" id=3]
@@ -24,7 +15,6 @@ default_font = SubResource( 2 )
 anchor_right = 1.0
 anchor_bottom = 1.0
 rect_pivot_offset = Vector2( 800, 600 )
-custom_fonts/font = SubResource( 1 )
 tab_align = 0
 script = ExtResource( 3 )
 __meta__ = {
@@ -32,6 +22,7 @@ __meta__ = {
 }
 
 [node name="Работа" type="Panel" parent="."]
+visible = false
 anchor_right = 1.0
 anchor_bottom = 1.0
 margin_left = 4.0
@@ -64,3 +55,10 @@ size_flags_vertical = 15
 texture_normal = ExtResource( 4 )
 expand = true
 stretch_mode = 4
+
+[node name="Button" type="Button" parent="Контроль"]
+margin_left = 480.0
+margin_top = 440.0
+margin_right = 975.0
+margin_bottom = 620.0
+text = "ЖЫШЦЙБЮ"

data/free-drone-icon-58.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/free-drone-icon-58.png-5b694998d3a27f8f0eac6f506f299266.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://data/free-drone-icon-58.png"
+dest_files=[ "res://.import/free-drone-icon-58.png-5b694998d3a27f8f0eac6f506f299266.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

data/main-font.tres

@@ -0,0 +1,11 @@
+[gd_resource type="DynamicFont" load_steps=2 format=2]
+
+[ext_resource path="res://data/DejaVuSansCondensed.ttf" type="DynamicFontData" id=1]
+
+[resource]
+size = 20
+outline_size = 1
+outline_color = Color( 0, 0, 0, 1 )
+use_mipmaps = true
+use_filter = true
+font_data = ExtResource( 1 )

project.godot

@@ -27,6 +27,7 @@ window/stretch/aspect="keep"
 [gui]
 
 common/drop_mouse_on_gui_input_disabled=true
+theme/custom_font="res://data/main-font.tres"
 
 [physics]