Commit Graph

21 Commits

Author SHA1 Message Date
GRAFF 143f8baf03 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter
# Conflicts:
#	.gitignore
#	Content/Blueprints/UI/Materials/FasadHide.uasset
#	Content/Blueprints/Utils/Generators/LedLine.uasset
#	Content/Maps/MainScene.umap
2021-05-20 13:57:39 +05:00
Lenta_Mebiusa f8ce5b09da Обновил бехатон 2021-05-19 13:31:42 +05:00
Lenta_Mebiusa 917d30cc57 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 2021-05-18 19:25:11 +05:00
Lenta_Mebiusa e9f5191ea4 Поправил бехатон в Yard-е 2021-05-18 19:25:02 +05:00
igor_workPC afcc3058f9 Правки K3 S1 2021-05-18 16:16:27 +05:00
igor_workPC 8680e0d8c4 Доравботка швоф, деталей и развертки 2021-05-18 15:33:42 +05:00
PC-G08 98ce8def06 K2 2021-05-18 09:18:36 +05:00
igor_workPC ef2d3323a9 K3 2021-05-18 09:14:51 +05:00
Lenta_Mebiusa 6130e97e65 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 2021-05-17 21:10:19 +05:00
Lenta_Mebiusa 4e1cf7f663 Двор 2021-05-17 21:09:18 +05:00
PC-G09 83000259bd Materials building 2021-05-17 17:56:06 +05:00
PC-G09 2d96becff8 Fix fakewindows add lightning 2021-05-17 16:58:41 +05:00
Lenta_Mebiusa e292c190fe Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 2021-05-17 16:32:19 +05:00
Lenta_Mebiusa 92333417ad Еще материалы 2021-05-17 16:32:10 +05:00
PC-G09 b6f4422f98 Add K1 2021-05-17 15:43:59 +05:00
Lenta_Mebiusa 95c9ff6fbc тест 2021-05-17 15:27:42 +05:00
Lenta_Mebiusa a3c94559c2 merge materials 2 2021-05-17 15:21:35 +05:00
Lenta_Mebiusa d6ff98c696 merge materials 1 2021-05-17 15:20:36 +05:00
Lenta_Mebiusa 29bd376650 test 2021-05-17 15:14:57 +05:00
PC-G09 ec5db5fb6c Add K2 + K3 2021-05-17 12:27:19 +05:00
GRAFF bf74d50530 погнали делать питерский академ 2021-05-10 20:06:48 +05:00