|
|
96bef82f47
|
add git-hook-gdscript.sh
|
2025-02-28 10:05:13 +03:00 |
|
danil_tim
|
01c2072bdb
|
Усилитель на контроле
|
2025-02-26 10:20:27 +03:00 |
|
|
|
c2845f59bd
|
Merge pull request 'dev_maxim' (#8) from dev_maxim into master
Reviewed-on: http://gitea.srez.local:3000/Maxim/PRD-TU-MP550/pulls/8
|
2025-02-26 08:48:38 +03:00 |
|
|
|
a648c8c745
|
На Данила пуш
|
2025-02-25 01:52:06 +03:00 |
|
|
|
74f266ce77
|
почти готов контроль
|
2025-02-25 00:52:39 +03:00 |
|
|
|
1d001f9a0a
|
отладка контроля
|
2025-02-24 21:15:40 +03:00 |
|
|
|
1b99f2d974
|
Доработка контроля с ЭМС-Г
|
2025-02-24 16:42:32 +03:00 |
|
|
|
70bca2ce57
|
доработка контроля
|
2025-02-21 15:41:47 +03:00 |
|
|
|
33f691e705
|
ПРД-В отладка (#7) from dev_maxim into master
Reviewed-on: http://gitea.srez.local:3000/Maxim/PRD-TU-MP550/pulls/7
|
2025-02-21 15:38:41 +03:00 |
|
|
|
7a084d04e4
|
настройка мимикрии
|
2025-02-21 10:22:09 +03:00 |
|
|
|
8ccee569b3
|
настройка мимикрии
|
2025-02-20 16:36:44 +03:00 |
|
|
|
7993d5aaf9
|
процесс созидания контроля в процессе
|
2025-02-18 14:58:38 +03:00 |
|
|
|
45fe4816f6
|
созидания контроля
|
2025-02-18 11:03:11 +03:00 |
|
|
|
dd6c9345f7
|
настройка мимикрии
|
2025-02-15 00:03:37 +03:00 |
|
|
|
ed850de972
|
настройка мимикрии
|
2025-02-14 23:58:31 +03:00 |
|
|
|
78aeedb92f
|
Merge remote-tracking branch 'origin/dev_danil' into dev_maxim
# Conflicts:
# scripts/control_panel.gd
|
2025-02-14 15:07:15 +03:00 |
|
|
|
1c43213266
|
настройка контроля
|
2025-02-14 15:06:12 +03:00 |
|
|
|
af9867c7c0
|
на исправление контроля
|
2025-02-14 14:10:09 +03:00 |
|
danil_tim
|
97ac58b7f8
|
Merge remote-tracking branch 'origin/dev_danil' into dev_danil
# Conflicts:
# scripts/control_panel.gd
|
2025-02-14 12:01:18 +03:00 |
|
danil_tim
|
a77eb98e1a
|
ДКМ от ДОУ доработан
|
2025-02-14 11:58:37 +03:00 |
|
danil_tim
|
50b60234d6
|
ДКМ от ДОУ
|
2025-02-14 11:12:14 +03:00 |
|
|
|
da1fbf440c
|
Merge pull request 'dev_maxim' (#6) from dev_maxim into master
Reviewed-on: http://gitea.srez.local:3000/Maxim/PRD-TU-MP550/pulls/6
|
2025-02-13 16:17:58 +03:00 |
|
|
|
55bea416d9
|
при написании ТУ
|
2025-02-12 12:12:33 +03:00 |
|
|
|
179271195c
|
Merge pull request 'Фиксирование контроль панели' (#5) from dev_maxim into master
Reviewed-on: http://gitea.srez.local:3000/Maxim/PRD-TU-MP550/pulls/5
|
2025-02-12 11:34:52 +03:00 |
|
danil_tim
|
102e528f38
|
ДКМ от ДОУ
|
2025-02-12 11:03:27 +03:00 |
|
|
|
d583c544fb
|
отладка мощности
|
2025-02-12 09:19:28 +03:00 |
|
danil_tim
|
bb50790ce8
|
после мерджа с данилом
|
2025-02-12 08:37:32 +03:00 |
|
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 |
|
|
|
54ff1757b2
|
добавка модуляции
|
2025-02-12 02:47:18 +03:00 |
|
|
|
f682733cfd
|
отладка ДКМ
|
2025-02-12 00:31:25 +03:00 |
|
|
|
ba047d4c71
|
исправление после мерджа
|
2025-02-11 22:30:32 +03:00 |
|
|
|
4ec99ce481
|
отладка панели
|
2025-02-11 20:01:26 +03:00 |
|
|
|
b686c0f137
|
отладка (наводим красоту)
|
2025-02-11 19:15:36 +03:00 |
|
|
|
cd83c97d6a
|
отладка контроля
|
2025-02-11 19:11:15 +03:00 |
|
danil_tim
|
6e5f973405
|
закончен контроль
|
2025-02-11 13:53:09 +03:00 |
|
danil_tim
|
16833dcba3
|
Merge remote-tracking branch 'origin/master' into dev_danil
# Conflicts:
# scripts/PRD.gd
|
2025-02-10 13:41:54 +03:00 |
|
|
|
c0eaab7bfc
|
Merge pull request 'from dev_maxim to master' (#4) from dev_maxim into master
Reviewed-on: http://gitea.srez.local:3000/Maxim/PRD-TU-MP550/pulls/4
|
2025-02-10 13:32:07 +03:00 |
|
danil_tim
|
7f14f2f5a7
|
Merge remote-tracking branch 'origin/dev_maxim' into dev_danil
# Conflicts:
# scripts/PRD.gd
# scripts/network.gd
|
2025-02-10 13:05:34 +03:00 |
|
danil_tim
|
2e8082a26a
|
морда контроля
|
2025-02-10 13:02:26 +03:00 |
|
|
|
429dbdf9ed
|
в процессе
|
2025-02-07 15:40:58 +03:00 |
|
|
|
077bdb40f4
|
add command
|
2025-02-07 15:31:16 +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 |
|
|
|
2ff430c381
|
исправление
|
2025-02-07 08:32:14 +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 |
|
|
|
a84ed1d3a2
|
исправление морды
|
2025-02-07 06:55:00 +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 |
|
|
|
a3e03c7da1
|
module fs half-stable
|
2025-02-07 06:39:02 +03:00 |
|
