Commit Graph

417 Commits

Author SHA1 Message Date
GRAFF b0fdee419f Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-17 16:08:08 +05:00
GRAFF 18d2ac6a2b light empruve 2023-04-17 16:08:02 +05:00
GRAFF efd86d0535 Merge remote-tracking branch 'origin/master' 2023-04-17 15:28:38 +05:00
GRAFF 12f8dc045b Doorcard 2023-04-17 15:28:16 +05:00
PC-G13 d6c1a82858 фыв 2023-04-17 14:29:43 +05:00
GRAFF d096264ebd PENISSSS 2023-04-15 05:42:46 +05:00
GRAFF 772898ef13 Merge remote-tracking branch 'origin/master' 2023-04-15 04:57:45 +05:00
GRAFF 98c1c297e7 Несломанный фэйд 2023-04-15 04:57:06 +05:00
GRAFF b4c1cbba0e vbg 2023-04-15 04:45:52 +05:00
GRAFF 65a7ff26cd Managerы 2023-04-15 04:28:51 +05:00
GRAFF 804809c05c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Content/Blueprints/UI/Widgets/SubMenu/Submenu.uasset
2023-04-15 04:11:37 +05:00
GRAFF a1b6d018ab аааа 2023-04-15 04:10:26 +05:00
GRAFF 47b7b9cf2d Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-15 03:42:01 +05:00
GRAFF c3b6f86c03 kryshki 2023-04-15 03:41:55 +05:00
PC-G09 cbe7b65046 ГОРКА ЕБОБАНАЯ ДА 2023-04-15 03:12:51 +05:00
GRAFF 3109c53ab7 FFFFUUUU and fasad emiss 2023-04-15 03:07:22 +05:00
GRAFF 5b855b5620 sad 2023-04-15 02:38:58 +05:00
GRAFF 3aae119e82 Norm cylinder 2023-04-15 02:32:05 +05:00
GRAFF 51e1b41035 no drdrdrdr 2023-04-15 02:22:22 +05:00
GRAFF a4887d4313 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Blueprints/UI/Widgets/Menu/mainMenu.uasset
#	Content/Blueprints/UI/Widgets/Search/Search.uasset
#	Content/Blueprints/UI/Widgets/SubMenu/Submenu.uasset
#	Content/Maps/MainBuildings.umap
#	Content/Maps/NightLight.umap
#	Content/Maps/Points.umap
#	Content/Maps/mainScene.umap
2023-04-15 01:55:00 +05:00
GRAFF c6895d99a7 HUY 2023-04-15 01:52:21 +05:00
PC-G09 41ef8c98f0 Fasade lightning 2023-04-15 01:40:49 +05:00
GRAFF d10cbd0325 Фикс слайдерв 2023-04-15 01:25:22 +05:00
GRAFF 40c9442e72 Навигация 2023-04-15 01:16:09 +05:00
GRAFF eac1cdc57f Merge remote-tracking branch 'origin/master' 2023-04-14 22:14:00 +05:00
GRAFF 8af34d71da Прощальное окно 2023-04-14 22:13:40 +05:00
GRAFF 49c38ab317 eads 2023-04-14 22:12:09 +05:00
PC-G09 9dda2cd2cf Nightlight 2023-04-14 21:24:06 +05:00
PC-G13 a43158969d Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-14 21:05:29 +05:00
PC-G13 1287a8f4bf oboi v odnoi kv 2023-04-14 21:05:24 +05:00
PC-G09 fd2cb665c1 Nightlight 2023-04-14 20:49:55 +05:00
GRAFF 661f5d60b3 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Blueprints/UI/Widgets/Elements/flatMapWithNavi.uasset
2023-04-14 20:19:05 +05:00
GRAFF 56cc7aac7b blyat 2023-04-14 20:18:41 +05:00
GRAFF 7cc2c0aaeb flat recognize, some stuff, floor highlight, hide shit, reaneme 2023-04-14 20:18:23 +05:00
PC-G13 461fa947db Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-14 20:13:03 +05:00
PC-G13 0c7030c262 tv 2023-04-14 20:13:00 +05:00
GRAFF 3209d09300 Infra 2023-04-14 20:09:20 +05:00
PC-G09 5e1203da25 Nightlight yard 2023-04-14 18:53:26 +05:00
PC-G13 604c026bd3 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-14 17:33:13 +05:00
PC-G13 f75d64e791 bpdoor sign 2023-04-14 17:32:12 +05:00
GRAFF e05184f603 аааААААА 2023-04-14 17:30:08 +05:00
PC-G13 15e85320ba двери в мопах подвинуты 2023-04-14 17:03:27 +05:00
PC-G13 f0bdf06d13 streetlamp BP 2023-04-14 16:36:00 +05:00
PC-G13 566846a81f probe gp2s03a03 2023-04-14 16:17:44 +05:00
PC-G13 c917638ab9 fade dveri 2023-04-14 15:39:06 +05:00
PC-G13 d51c9bdb51 fadesu 2023-04-14 15:19:19 +05:00
PC-G13 a14beaea09 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-14 15:10:31 +05:00
PC-G13 7ad0ff0502 коллизии, немного пробок, пара шейдеров, 2023-04-14 15:10:13 +05:00
GRAFF 16d6b4f4b0 фыв 2023-04-14 14:10:42 +05:00
GRAFF ca935fdfcc Merge remote-tracking branch 'origin/master' 2023-04-14 11:52:28 +05:00