Merge branch 'develop' into 'master'

Формирование релиза проекта версии 0.8.0-alfo See merge request tehnokom/universo!186

Merge branch 'develop' into 'master'
Формирование релиза проекта версии 0.8.0-alfo See merge request tehnokom/universo!186
01e9d39b · Vladimir levadnij · fa3ef46e · 5d3b30da · 01e9d39b · 01e9d39b
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,7 @@ export_presets.cfg
 *.os
 *.dblite
+#настройки сервера и сам сервер
+settings.cfg
+Godot_v3.2.1-stable_linux_server.64
+godot-server.64
--- a/blokoj/asteroidoj/ast_1.tscn
+++ b/blokoj/asteroidoj/ast_1.tscn
--- a/blokoj/asteroidoj/ast_ice_shards_0.tscn
+++ b/blokoj/asteroidoj/ast_ice_shards_0.tscn
--- a/blokoj/asteroidoj/ast_ice_shards_1.tscn
+++ b/blokoj/asteroidoj/ast_ice_shards_1.tscn
--- a/blokoj/asteroidoj/ast_ice_shards_2.tscn
+++ b/blokoj/asteroidoj/ast_ice_shards_2.tscn
--- a/blokoj/asteroidoj/asteroido.tscn
+++ b/blokoj/asteroidoj/asteroido.tscn
+[gd_scene load_steps=2 format=2]
+[ext_resource path="res://blokoj/asteroidoj/skriptoj/asteroid.gd" type="Script" id=1]
+[node name="asteroido" type="Spatial"]
+script = ExtResource( 1 )
--- a/blokoj/asteroidoj/skriptoj/asteroid.gd
+++ b/blokoj/asteroidoj/skriptoj/asteroid.gd
@@ -2,7 +2,7 @@ extends Spatial
 var uuid
-var integreco
+var integreco # целостность объекта
 var potenco
-var objekto
+var objekto # вся структура, пришедшая с сервера по данному объекту
 var distance = 0 # дистанция до корабля игрока
--- a/blokoj/eliro/eliro.gd
+++ b/blokoj/eliro/eliro.gd
-extends "res://kerno/fenestroj/tipo_c7.gd"
+extends "res://kerno/fenestroj/tipo_c1.gd"
-# наследует перетаскивание и закрытие меню при нажатии на "Х"
+func _ready():
+	pass # Replace with function body.
-func _on_no_button_pressed():
+func _drag(event: InputEvent) -> void:
+	if event is InputEventMouseMotion and Input.is_mouse_button_pressed(BUTTON_LEFT):
-	$Canvas/Popup.set_visible(false)
+		self.rect_position += event.relative
-	# скрыть меню
+	#перенос  меню
+func _on_no_button_button_up():
+	self.set_visible(false)
-func _on_yes_button_pressed():
+func _on_yes_button_button_up():
 	get_tree().quit()
-	#Выйти из игры
--- a/blokoj/eliro/eliro.tscn
+++ b/blokoj/eliro/eliro.tscn
 [gd_scene load_steps=3 format=2]
-[ext_resource path="res://kerno/fenestroj/tipo_c7.tscn" type="PackedScene" id=1]
+[ext_resource path="res://kerno/fenestroj/tipo_c1.tscn" type="PackedScene" id=1]
 [ext_resource path="res://blokoj/eliro/eliro.gd" type="Script" id=2]
 [node name="eliro" instance=ExtResource( 1 )]
+visible = false
 script = ExtResource( 2 )
-[node name="Popup" parent="Canvas" index="0"]
+[node name="HBox_buttons" parent="tipo_c" index="1"]
-visible = false
+anchor_left = 0.1
+anchor_top = -9.53674e-09
+anchor_bottom = -9.53674e-09
-[node name="Label" parent="Canvas/Popup/ColorRect" index="1"]
+[node name="menuo_name" parent="tipo_c/HBox_buttons" index="0"]
-anchor_right = 1.0
+margin_right = 157.0
-anchor_bottom = 0.0163273
-margin_left = 84.0
-margin_top = 3.0
-margin_right = -85.0
 text = "Выход"
-[node name="Label2" parent="Canvas/Popup/ColorRect/ColorRect2" index="2"]
+[node name="Button_x" parent="tipo_c/HBox_buttons" index="1"]
+margin_left = 161.0
+margin_right = 180.0
+[node name="Label" type="Label" parent="tipo_c" index="2"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_left = 7.0
+margin_top = 29.0
+margin_right = -8.0
+margin_bottom = -61.0
 text = "Вы действительно
-Хотите выйти?"
+хотите выйти? "
-[connection signal="pressed" from="Canvas/Popup/ColorRect/ColorRect2/yes_button" to="." method="_on_yes_button_pressed"]
+align = 1
-[connection signal="pressed" from="Canvas/Popup/ColorRect/ColorRect2/no_button" to="." method="_on_no_button_pressed"]
+valign = 1
+[node name="yes_button" type="Button" parent="tipo_c" index="3"]
+anchor_left = 0.5
+anchor_top = 1.0
+anchor_right = 0.5
+anchor_bottom = 1.0
+margin_left = -57.0
+margin_top = -55.0
+margin_right = -21.0
+margin_bottom = -32.0
+text = "Да"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+[node name="no_button" type="Button" parent="tipo_c" index="4"]
+anchor_left = 0.5
+anchor_top = 1.0
+anchor_right = 0.5
+anchor_bottom = 1.0
+margin_left = 18.0223
+margin_top = -55.1198
+margin_right = 54.0223
+margin_bottom = -32.1198
+text = "Нет"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+[connection signal="gui_input" from="tipo_c" to="." method="_drag"]
+[connection signal="button_up" from="tipo_c/yes_button" to="." method="_on_yes_button_button_up"]
+[connection signal="button_up" from="tipo_c/no_button" to="." method="_on_no_button_button_up"]
--- a/blokoj/komerco/komerco.gd
+++ b/blokoj/komerco/komerco.gd
+extends "res://kerno/fenestroj/tipo_d1.gd"
+# Declare member variables here. Examples:
+# var a = 2
+# var b = "text"
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	pass # Replace with function body.
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+#func _process(delta):
+#	pass
--- a/blokoj/komerco/komerco.tscn
+++ b/blokoj/komerco/komerco.tscn
+[gd_scene load_steps=6 format=2]
+[ext_resource path="res://blokoj/komerco/komerco.gd" type="Script" id=1]
+[ext_resource path="res://kerno/fenestroj/tipo_d1.tscn" type="PackedScene" id=2]
+[ext_resource path="res://blokoj/komerco/komerco_tree.gd" type="Script" id=3]
+[ext_resource path="res://kerno/wablono/estonteco/window2.png" type="Texture" id=4]
+[ext_resource path="res://kerno/wablono/estonteco/window1.png" type="Texture" id=5]
+[node name="komerco" instance=ExtResource( 2 )]
+script = ExtResource( 1 )
+[node name="VBox" parent="." index="0"]
+margin_left = 212.221
+margin_top = 95.2276
+margin_right = 1012.22
+margin_bottom = 695.228
+rect_min_size = Vector2( 800, 600 )
+custom_constants/separation = 0
+[node name="HBox_top" parent="VBox" index="0"]
+margin_right = 800.0
+margin_bottom = 22.0
+custom_constants/separation = 0
+[node name="top_texture2" parent="VBox/HBox_top" index="1"]
+self_modulate = Color( 0, 0, 0, 0.294118 )
+margin_left = 22.0
+margin_right = 800.0
+margin_bottom = 22.0
+rect_min_size = Vector2( 0, 22 )
+size_flags_horizontal = 3
+texture = ExtResource( 4 )
+stretch_mode = 1
+flip_h = true
+[node name="menuo_name" parent="VBox/HBox_top/top_texture2/HBox_buttons" index="0"]
+margin_right = 759.0
+text = "Торговая система"
+[node name="Button_fix" parent="VBox/HBox_top/top_texture2/HBox_buttons" index="1"]
+visible = false
+margin_left = 492.0
+margin_right = 511.0
+[node name="Button_" parent="VBox/HBox_top/top_texture2/HBox_buttons" index="2"]
+visible = false
+margin_left = 515.0
+margin_right = 534.0
+[node name="Button_full" parent="VBox/HBox_top/top_texture2/HBox_buttons" index="3"]
+visible = false
+margin_left = 538.0
+margin_right = 558.0
+[node name="Button_x" parent="VBox/HBox_top/top_texture2/HBox_buttons" index="4"]
+margin_left = 763.0
+margin_right = 782.0
+[node name="body_texture" parent="VBox" index="1"]
+self_modulate = Color( 0, 0, 0, 0.745098 )
+margin_top = 22.0
+margin_right = 800.0
+margin_bottom = 578.0
+grow_vertical = 0
+size_flags_vertical = 3
+texture = ExtResource( 4 )
+stretch_mode = 1
+flip_v = true
+[node name="Tree" type="Tree" parent="VBox/body_texture/HSplit" index="0"]
+margin_right = 388.0
+margin_bottom = 544.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+script = ExtResource( 3 )
+[node name="TabContainer" type="TabContainer" parent="VBox/body_texture/HSplit" index="1"]
+margin_left = 400.0
+margin_right = 788.0
+margin_bottom = 544.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+[node name="HBox_bottom" parent="VBox" index="2"]
+margin_top = 578.0
+margin_right = 800.0
+margin_bottom = 600.0
+custom_constants/separation = 0
+[node name="bottom_texture1" parent="VBox/HBox_bottom" index="0"]
+self_modulate = Color( 0, 0, 0, 0.745098 )
+margin_right = 778.0
+margin_bottom = 22.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+texture = ExtResource( 4 )
+expand = true
+[node name="bottom_texture2" parent="VBox/HBox_bottom" index="1"]
+self_modulate = Color( 0, 0, 0, 0.745098 )
+margin_left = 778.0
+margin_right = 800.0
+margin_bottom = 22.0
+size_flags_horizontal = 9
+texture = ExtResource( 5 )
+flip_h = true
+flip_v = true
--- a/blokoj/komerco/komerco_tree.gd
+++ b/blokoj/komerco/komerco_tree.gd
+extends Tree
+func _ready():
+  var root = self.create_item()
+  root.set_text(0, 'Космические корабли')
+  var child1 = self.create_item(root)
+  child1.set_text(0, 'Грузовые космические корабли')
+  var subchild1 = self.create_item(child1)
+  subchild1.set_text(0, 'Типовые грузовые космические корабли')
+#  var subchild2 = self.create_item(child1)
+#  subchild1.set_text(0, "Специализированные грузовые космические корабли")
--- a/blokoj/kosmo/scenoj/base_spaceship.tscn
+++ b/blokoj/kosmo/scenoj/base_spaceship.tscn
-[gd_scene load_steps=2 format=2]
-[ext_resource path="res://blokoj/kosmosxipoj/scenoj/baseSpaceship/base_spaceship.glb" type="PackedScene" id=1]
-[node name="base_spaceship" instance=ExtResource( 1 )]
-transform = Transform( 0.0421547, 0, 0.999111, 0, 1, 0, -0.999111, 0, 0.0421547, -4.94304, -1.94312, 12.5016 )
-[node name="cabine" parent="." index="1"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 11.023, 3.98846, 5.05208 )
--- a/blokoj/kosmo/scenoj/menuo.tscn
+++ b/blokoj/kosmo/scenoj/menuo.tscn
@@ -5,8 +5,8 @@
 [node name="Control" type="Control"]
 anchor_right = 1.0
 anchor_bottom = 1.0
-margin_right = -813.0
+margin_right = -701.0
-margin_bottom = -534.0
+margin_bottom = -289.0
 script = ExtResource( 1 )
 __meta__ = {
 "_edit_use_anchors_": false
@@ -19,10 +19,9 @@ layer = 50
 margin_left = -1.0
 margin_right = 209.0
 margin_bottom = 66.0
-items = [ "Двигаться к объекту", null, 0, false, false, 0, 0, null, "", false, "Добавить в маршрут", null, 0, false, false, 1, 0, null, "", false, "Войти в док", null, 0, false, true, 2, 0, null, "", false, "Открыть огонь", null, 0, false, false, 3, 0, null, "", false ]
+items = [ "Двигаться к объекту", null, 0, false, false, 0, 0, null, "", false, "Добавить в маршрут", null, 0, false, false, 1, 0, null, "", false, "Войти в док", null, 0, false, true, 2, 0, null, "", false, "Открыть огонь", null, 0, false, true, 3, 0, null, "", false, "Взять в прицел", null, 0, false, false, 4, 0, null, "", false ]
 hide_on_state_item_selection = true
 __meta__ = {
 "_edit_use_anchors_": false
 }
-[connection signal="draw" from="canvas/PopupMenu" to="." method="_on_PopupMenu_draw"]
 [connection signal="index_pressed" from="canvas/PopupMenu" to="." method="_on_PopupMenu_index_pressed"]
--- a/blokoj/kosmo/scenoj/itinero.tscn
+++ b/blokoj/kosmo/scenoj/itinero.tscn
@@ -3,6 +3,7 @@
 [ext_resource path="res://blokoj/kosmo/skriptoj/itinero.gd" type="Script" id=1]
 [node name="itinero" type="Control"]
+mouse_filter = 2
 script = ExtResource( 1 )
 __meta__ = {
 "_edit_use_anchors_": false

--- a/blokoj/kosmo/scenoj/ship.tscn
+++ b/blokoj/kosmo/scenoj/ship.tscn
-[gd_scene load_steps=5 format=2]
-[ext_resource path="res://blokoj/kosmo/resursoj/untitled.obj" type="ArrayMesh" id=1]
-[ext_resource path="res://blokoj/kosmo/skriptoj/ship.gd" type="Script" id=2]
-[ext_resource path="res://blokoj/kosmo/scenoj/base_spaceship.tscn" type="PackedScene" id=3]
-[sub_resource type="CapsuleShape" id=1]
-radius = 3.29615
-height = 9.14674
-[node name="ship" type="KinematicBody"]
-script = ExtResource( 2 )
-[node name="CollisionShape" type="CollisionShape" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.06553, 5.3188 )
-shape = SubResource( 1 )
-[node name="mesh" type="MeshInstance" parent="CollisionShape"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.474594, -5.6999 )
-visible = false
-mesh = ExtResource( 1 )
-material/0 = null
-material/1 = null
-material/2 = null
-material/3 = null
-material/4 = null
-[node name="base_spaceship" parent="CollisionShape" instance=ExtResource( 3 )]
-transform = Transform( -0.0034731, 0, 0.999994, 0, 1, 0, -0.999994, 0, -0.0034731, -4.98877, -3.8979, 6.84284 )
--- a/blokoj/kosmo/scenoj/ships.tscn
+++ b/blokoj/kosmo/scenoj/ships.tscn
-[gd_scene load_steps=4 format=2]
-[ext_resource path="res://blokoj/kosmo/resursoj/untitled.obj" type="ArrayMesh" id=1]
-[ext_resource path="res://blokoj/kosmosxipoj/skriptoj/moduloj/modulo.gd" type="Script" id=2]
-[sub_resource type="CapsuleShape" id=1]
-height = 1.36019
-[node name="mesh" type="MeshInstance"]
-mesh = ExtResource( 1 )
-material/0 = null
-material/1 = null
-material/2 = null
-material/3 = null
-material/4 = null
-script = ExtResource( 2 )
-[node name="StaticBody" type="StaticBody" parent="."]
-[node name="CollisionShape" type="CollisionShape" parent="StaticBody"]
-transform = Transform( 3.84755, 0, 0, 0, 3.95025, 0, 0, 0, 5.03246, 0, 0, 4.95616 )
-shape = SubResource( 1 )
--- a/blokoj/kosmo/scenoj/space.tscn
+++ b/blokoj/kosmo/scenoj/space.tscn
-[gd_scene load_steps=15 format=2]
+[gd_scene load_steps=8 format=2]
-[ext_resource path="res://blokoj/kosmo/scenoj/waypoint.tscn" type="PackedScene" id=1]
-[ext_resource path="res://blokoj/kosmo/scenoj/ship.tscn" type="PackedScene" id=2]
-[ext_resource path="res://blokoj/kosmo/scenoj/space_object.tscn" type="PackedScene" id=3]
 [ext_resource path="res://blokoj/kosmo/scenoj/main_camera.tscn" type="PackedScene" id=4]
 [ext_resource path="res://blokoj/kosmo/scenoj/star.tscn" type="PackedScene" id=5]
 [ext_resource path="res://blokoj/kosmo/skriptoj/space_ui.gd" type="Script" id=6]
 [ext_resource path="res://blokoj/kosmo/skriptoj/http_mutate.gd" type="Script" id=7]
 [ext_resource path="res://blokoj/kosmo/skriptoj/space.gd" type="Script" id=8]
-[ext_resource path="res://blokoj/kosmo/scenoj/menuo.tscn" type="PackedScene" id=9]
+[ext_resource path="res://blokoj/kosmo/scenoj/control.tscn" type="PackedScene" id=9]
-[sub_resource type="SphereMesh" id=1]
+[sub_resource type="Animation" id=1]
-radial_segments = 4
-rings = 4
-[sub_resource type="OpenSimplexNoise" id=2]
-[sub_resource type="NoiseTexture" id=3]
-noise = SubResource( 2 )
-[sub_resource type="SpatialMaterial" id=4]
-albedo_color = Color( 0.447059, 0.294118, 0.294118, 1 )
-depth_enabled = true
-depth_scale = 6.59
-depth_deep_parallax = false
-depth_flip_tangent = false
-depth_flip_binormal = false
-depth_texture = SubResource( 3 )
-[sub_resource type="Animation" id=5]
 resource_name = "open_scene"
 length = 2.0
 tracks/0/type = "method"
@@ -94,65 +73,14 @@ script = ExtResource( 7 )
 [node name="http_finado" type="HTTPRequest" parent="."]
-[node name="ship1" parent="." instance=ExtResource( 2 )]
+[node name="camera" parent="." instance=ExtResource( 4 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 129.985 )
-visible = false
-[node name="asteroid" type="MeshInstance" parent="."]
-transform = Transform( 5, 0, 0, 0, 5, 0, 0, 0, 5, 82.0017, 0, 4.63756 )
-mesh = SubResource( 1 )
-material/0 = SubResource( 4 )
-[node name="asteroid2" type="MeshInstance" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -79.6439, 0, 4.63756 )
-mesh = SubResource( 1 )
-material/0 = SubResource( 4 )
-[node name="asteroid3" type="MeshInstance" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -95.5832 )
-mesh = SubResource( 1 )
-material/0 = SubResource( 4 )
-[node name="asteroid4" type="MeshInstance" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -8.28443, 0, 52.5846 )
-mesh = SubResource( 1 )
-material/0 = SubResource( 4 )
-[node name="asteroid5" type="MeshInstance" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 57.2536, 0, 4.63756 )
-mesh = SubResource( 1 )
-material/0 = SubResource( 4 )
-[node name="asteroid6" type="MeshInstance" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -63.982, 8.33743, -28.9217 )
-mesh = SubResource( 1 )
-material/0 = SubResource( 4 )
-[node name="asteroid7" type="MeshInstance" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -9.74345, 60.5021 )
-mesh = SubResource( 1 )
-material/0 = SubResource( 4 )
-[node name="asteroid8" type="MeshInstance" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -78.8565, 6.63192, 14.2732 )
-mesh = SubResource( 1 )
-material/0 = SubResource( 4 )
-[node name="way_point" parent="." instance=ExtResource( 1 )]
-z_away = 4000
-colision_radius = 1.0
-[node name="space_object1" parent="." instance=ExtResource( 3 )]
-transform = Transform( 10, 0, 0, 0, 10, 0, 0, 0, 10, -163.333, 10.0102, 3.27841 )
-visible = false
-[node name="main_camera" parent="." instance=ExtResource( 4 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 151.894 )
 distance_min = 0
 [node name="star" parent="." instance=ExtResource( 5 )]
 [node name="Control" parent="." instance=ExtResource( 9 )]
+mouse_filter = 2
 [node name="timer" type="Timer" parent="."]
 wait_time = 10.0
@@ -160,6 +88,7 @@ wait_time = 10.0
 [node name="ui" type="Control" parent="."]
 anchor_right = 1.0
 anchor_bottom = 1.0
+mouse_filter = 2
 script = ExtResource( 6 )
 __meta__ = {
 "_edit_lock_": true,
@@ -175,7 +104,7 @@ __meta__ = {
 }
 [node name="AnimationPlayer" type="AnimationPlayer" parent="ui"]
-anims/open_scene = SubResource( 5 )
+anims/open_scene = SubResource( 1 )
 [connection signal="load_objektoj" from="." to="." method="_on_space_load_objektoj"]
 [connection signal="tree_exiting" from="." to="." method="_on_space_tree_exiting"]
 [connection signal="request_completed" from="http_mutate" to="http_mutate" method="_on_http_mutate_request_completed"]

--- a/blokoj/kosmo/scenoj/waypoint.tscn
+++ b/blokoj/kosmo/scenoj/waypoint.tscn
-[gd_scene load_steps=4 format=2]
-[ext_resource path="res://blokoj/kosmo/resursoj/violet_frame.png" type="Texture" id=1]
-[ext_resource path="res://blokoj/kosmo/skriptoj/way_point.gd" type="Script" id=2]
-[sub_resource type="SphereShape" id=1]
-[node name="way_point" type="Spatial"]
-script = ExtResource( 2 )
-[node name="VisibilityNotifier" type="VisibilityNotifier" parent="."]
-[node name="TextureRect" type="TextureRect" parent="."]
-visible = false
-margin_left = -25.0
-margin_top = -25.0
-margin_right = 25.0
-margin_bottom = 25.0
-texture = ExtResource( 1 )
-expand = true
-__meta__ = {
-"_edit_use_anchors_": false
-}
-[node name="Area" type="Area" parent="."]
-[node name="CollisionShape" type="CollisionShape" parent="Area"]
-shape = SubResource( 1 )
-[connection signal="camera_entered" from="VisibilityNotifier" to="." method="_on_VisibilityNotifier_camera_entered"]
-[connection signal="camera_exited" from="VisibilityNotifier" to="." method="_on_VisibilityNotifier_camera_exited"]
-[connection signal="body_entered" from="Area" to="." method="_on_Area_body_entered"]
--- a/blokoj/kosmo/skriptoj/http_mutate.gd
+++ b/blokoj/kosmo/skriptoj/http_mutate.gd
@@ -17,7 +17,7 @@ func _on_http_mutate_projekto_completed(result, response_code, headers, body):
 	var parsed_resp = parse_json(resp)
 	var simpled_data = parsed_resp['data']['redaktuUniversoProjekto']['universoProjekto']
 	var uuid = simpled_data['uuid']
-	$"../ship".projekto_uuid=uuid
+	Global.fenestro_itinero.projekto_itineroj_uuid=uuid
 	# теперь создаём задачу с координатами