Merge remote-tracking branch 'lepshiy/master'

# Conflicts: # scenes/работа/работа.gd # scripts/signaller.gd
2024-12-13 15:22:22 +03:00
parent 0d135a30d4 5263412e7e
commit d0ad029262
8 changed files with 66 additions and 32 deletions
--- a/scripts/signaller.gd
+++ b/scripts/signaller.gd
@@ -142,7 +142,6 @@ signal map_coords_changed(lan: float, lat: float)
 ## [param mode] - Вновь установленный режим.
 signal map_mode_changed(mode: int)

-
 ## Вызывается при обновлении позиции(угла) цели.[br]
 signal th_aoa_update(threats: Dictionary)

@@ -150,3 +149,5 @@ signal th_aoa_update(threats: Dictionary)
 ## <...>[br]
 ## [param ecms] - <...>
 signal fs_update_color(ecms: Dictionary)
+
+signal socket_error(error: String)