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

Merge remote-tracking branch 'origin/master' into master-afsp

Browse Source 
# Conflicts:
#	scenes/tabs-switch/lbl-ready.gd
#	scripts/pribor-prd.gd
This commit is contained in:
Maxim
2026-01-15 15:55:23 +03:00
parent d198989ad2 d2f4c8017c
commit 83549ec2a3
9 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
scenes/tabs-switch/lbl_ready.gd → scenes/tabs-switch/lbl-ready.gd
View File

0
scenes/tabs-switch/lbl_ready.gd.uid → scenes/tabs-switch/lbl-ready.gd.uid
View File

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

@@ -7,7 +7,7 @@
[ext_resource type="PackedScene" uid="uid://dab6loryocc73" path="res://scenes/эмс/эмс.tscn" id="5_u71bh"]
[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://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"]
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_tidwt"]