maxim/uarep-ctl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/sasha80' into prd-control

Browse Source 
# Conflicts:
#	scenes/контроль/кнопка-прибора.gd
#	scenes/контроль/контроль.tscn
#	scripts/network.gd
This commit is contained in:
TotMaxim
2025-12-01 22:35:26 +03:00
parent 28704039d2 64b120b086
commit 4db6060ed7
108 changed files with 329 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scenes/tabs-switch/tab-switch.tscn
View File

@@ -8,7 +8,7 @@
[ext_resource type="PackedScene" uid="uid://musb21x2u0xs" path="res://scenes/эмс2/эмс2.tscn" id="6_41d34"]
[ext_resource type="PackedScene" uid="uid://bnptm4rlp60dq" path="res://scenes/настройки/настройки.tscn" id="6_i8iv3"]
[ext_resource type="Script" uid="uid://b5ykwyk5vpi6" path="res://scenes/tabs-switch/lbl_ready.gd" id="8_tidwt"]
[ext_resource type="Script" uid="uid://roajn6c6wvc1" path="res://scenes/tabs-switch/тренаж_режим.gd" id="9_41d34"]
[ext_resource type="Script" path="res://scenes/tabs-switch/тренаж_режим.gd" id="9_41d34"]
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_tidwt"]