danil_tim
|
f79f82a350
|
Merge remote-tracking branch 'origin/dev_maxim' into dev_danil
# Conflicts:
# scripts/PRD.gd
|
2025-02-12 08:30:41 +03:00 |
|
danil_tim
|
6e5f973405
|
закончен контроль
|
2025-02-11 13:53:09 +03:00 |
|
|
|
077bdb40f4
|
add command
|
2025-02-07 15:31:16 +03:00 |
|
|
|
ea6933935a
|
Merge remote-tracking branch 'origin/dev_kira' into dev_maxim
# Conflicts:
# scripts/PRD.gd
|
2025-02-07 07:24:04 +03:00 |
|
lepshiy
|
022b938451
|
Исправлено получение названия текущего прибора
|
2025-02-07 11:03:19 +03:00 |
|
|
|
2a9b0ab6ab
|
Merge remote-tracking branch 'origin/dev_danil' into dev_maxim
# Conflicts:
# scripts/PRD.gd
# scripts/network.gd
|
2025-02-07 06:42:17 +03:00 |
|
danil_tim
|
2e8082a26a
|
морда контроля
|
2025-02-10 13:02:26 +03:00 |
|
danil_tim
|
3524937a90
|
морда контроля нарисована
|
2025-02-07 13:16:46 +03:00 |
|
danil_tim
|
179b1ebd05
|
Merge remote-tracking branch 'origin/dev_maxim' into temp_dev
# Conflicts:
# PRD_MP550.tscn
# scripts/PRD.gd
# scripts/constants.gd
# scripts/control_panel.gd
|
2025-02-07 11:09:29 +03:00 |
|
danil_tim
|
0f9c5abdc9
|
ems not work
|
2025-02-07 11:00:57 +03:00 |
|
|
|
a3e03c7da1
|
module fs half-stable
|
2025-02-07 06:39:02 +03:00 |
|
|
|
39c8a03821
|
module fs half-stable
|
2025-02-07 05:18:50 +03:00 |
|
|
|
c342115adf
|
module fs 4
|
2025-02-07 04:14:27 +03:00 |
|
|
|
6e5f0bed34
|
modul fs 2
|
2025-02-07 00:10:18 +03:00 |
|
|
|
a2467c3d8b
|
modul fs 1
|
2025-02-06 22:27:26 +03:00 |
|
|
|
da73feed4b
|
modul fs
|
2025-02-06 21:43:33 +03:00 |
|
|
|
7b23507d40
|
краска кнопок
|
2025-02-06 19:34:48 +03:00 |
|
|
|
529bc8a2d6
|
remove fs_2
|
2025-02-06 16:38:45 +03:00 |
|
|
|
80e6884979
|
Корректировка PRD панели
|
2025-02-06 15:45:43 +03:00 |
|
lepshiy
|
3801a0c28d
|
Доработка сохранения
|
2025-02-05 16:37:42 +03:00 |
|
|
|
f5b0a39a87
|
commit before merge
|
2025-02-04 06:31:23 +03:00 |
|
lepshiy
|
496572e03a
|
commit release
|
2025-02-05 11:31:30 +03:00 |
|
lepshiy
|
b361b692c6
|
Реализация сохранения/загрузки файлов
|
2025-02-04 15:38:16 +03:00 |
|
|
|
164b3c2e77
|
commit test
|
2025-02-04 01:56:22 +03:00 |
|
|
|
156d2c2bf7
|
dev maxim
|
2025-02-03 16:28:26 +03:00 |
|
|
|
35196b731f
|
ready for kira
|
2025-01-31 16:51:07 +03:00 |
|
|
|
4620fc6984
|
add attenuathion
|
2025-01-31 15:29:57 +03:00 |
|
|
|
44ee7a50c8
|
trabble
|
2025-01-31 11:27:18 +03:00 |
|
|
|
7feca8a40c
|
add buttn fgos and modul um
|
2025-01-31 10:14:34 +03:00 |
|
|
|
ccbf5fa368
|
Корректировка контроль панели
|
2025-01-29 07:29:27 +03:00 |
|
|
|
79fecc1573
|
add module fs
|
2025-01-28 10:59:52 +03:00 |
|
|
|
fc98ed6d9c
|
add change device
|
2024-12-20 15:21:58 +03:00 |
|
|
|
827c85fa9e
|
add device
|
2024-12-20 14:40:01 +03:00 |
|
|
|
c65e3e1abb
|
correct signs
|
2024-12-20 10:46:42 +03:00 |
|
|
|
f45f51205c
|
add isa write and read func to network.gd
|
2024-12-20 09:13:59 +03:00 |
|
|
|
3865ac1128
|
Add control panel
|
2024-12-18 20:47:40 +03:00 |
|
|
|
38e958adac
|
full sync ems g
|
2024-12-18 14:49:24 +03:00 |
|
|
|
250d7c3c91
|
full sync ems g
|
2024-12-18 14:01:19 +03:00 |
|
|
|
504b8869e5
|
add read status ems g
|
2024-12-18 11:09:40 +03:00 |
|
|
|
82459cdac7
|
add read array for state machine
|
2024-12-13 17:33:56 +03:00 |
|
|
|
1065d20553
|
add mode ems g
|
2024-12-13 16:14:51 +03:00 |
|
|
|
3fa0b072bf
|
add optbtn
|
2024-12-13 09:01:01 +03:00 |
|
|
|
7bc5aa8e3d
|
add shader
|
2024-12-13 06:45:07 +03:00 |
|
|
|
604e8dc875
|
refactor
|
2024-12-13 04:17:40 +03:00 |
|
|
|
f5fc70fbd3
|
temp debug
|
2024-12-13 03:26:25 +03:00 |
|
