Commit Graph

314 Commits

Author SHA1 Message Date
PC-G08 716d0a43ec fix 2025-10-09 16:11:21 +05:00
SergeyVag 16dce4d312 растения 2025-10-09 15:44:58 +05:00
PC-G08 3e2a79b13b Merge branch 'master' of http://192.168.1.163:3000/Dron/assetLibrary 2025-09-22 15:54:34 +05:00
PC-G08 707cc6af8d addMats 2025-09-22 15:54:15 +05:00
Maria_B 7480f84842 maf set_veer 2025-09-15 18:00:03 +05:00
Maria_B dde8294bca Merge branch 'master' of http://192.168.1.163:3000/Dron/assetLibrary 2025-09-15 16:47:38 +05:00
sv-art84 8b749e1bab Anemone 2025-09-15 16:19:56 +05:00
PC-G08 d294d45646 addMats 2025-09-11 12:36:14 +05:00
Maria_B ce6c4c1fe5 Merge branch 'master' of http://192.168.1.163:3000/Dron/assetLibrary 2025-09-08 12:36:09 +05:00
PRAyMU 9436a5bd50 Floor_Radiator 2025-09-04 14:07:21 +03:00
Maria_B 631ecc5f6e from set veer 2025-09-02 20:23:13 +05:00
sv-art84 01934f027a Ivy+wisteria 2025-09-02 18:51:46 +05:00
Maria_B 288c778588 uploading models 2025-08-06 13:13:54 +05:00
Maria_B 61ed8aac8c закинула модели 2025-08-05 14:12:05 +05:00
Maria_B d608544f8f выгружала модели 2025-08-05 12:58:58 +05:00
Maria_B 82c226d359 моя хуйня 2025-08-04 19:38:27 +05:00
sv-art84 de5d24bc9d fix indoor plants 2025-08-01 12:50:36 +05:00
Maria_B d42d971573 оздание слоя с комнатными растениями 2025-07-31 19:37:15 +05:00
sv-art84 5f92d715b1 indoor plants 2025-07-31 14:34:56 +05:00
PC-G08 76b67a38a2 fix 2025-07-28 11:20:39 +05:00
SergeyVag 924266310e Merge branch 'master' of http://192.168.1.163:3000/Dron/assetLibrary 2025-07-24 13:02:21 +05:00
SergeyVag 08a6355ad3 фикс 2025-07-24 13:02:18 +05:00
PRAyMU 2b75ba37e2 Revert "fix"
This reverts commit f17642cc9d.

# Conflicts:
#	Content/Maps/Temp/assetsLibrary_Mafs.umap
#	Content/Maps/Temp/assetsLibrary_temp.umap
#	Content/Maps/lighting.umap
#	Content/Materials/Masters/Common/MM_Master.uasset
#	Content/Meshes/Exterior/Mafs/_Library/SportsGrounds/Sport_complex_K-031_KenguruPRO/MI_Sport_complex_K-031_KenguruPRO_Wood_grey.uasset
#	Content/Textures/Surfaces/Brick/Brick_18/T_Brick_18_Imperfection.uasset
2025-07-23 17:05:14 +03:00
Maria_B 9140a1220e оптимизированные модели 2025-07-23 15:51:28 +05:00
Maria_B 38fb727576 Merge branch 'master' of http://192.168.1.163:3000/Dron/assetLibrary 2025-07-23 15:35:26 +05:00
SergeyVag d2dcbd79d8 Merge branch 'master' of http://192.168.1.163:3000/Dron/assetLibrary 2025-07-23 14:10:19 +05:00
SergeyVag 54548abfac пак новостроек 2025-07-23 14:10:16 +05:00
sv-art84 1af734b831 Aesculus Hippocastanum
foliage
2025-07-22 15:49:14 +05:00
sv-art84 4e7462b4bf asset Hawknest 2025-07-21 19:22:00 +05:00
sv-art84 fc44a503c9 test 2025-07-21 18:18:09 +05:00
Maria_B 0ae0fad8a8 NewFoliage 2025-07-21 13:29:43 +05:00
sv-art84 590807a081 Merge branch 'master' of http://192.168.1.163:3000/Dron/assetLibrary 2025-07-21 13:20:11 +05:00
sv-art84 55afd099bb foliage 2025-07-21 13:20:07 +05:00
PC-G13 a610d68037 Merge branch 'master' of http://192.168.1.163:3000/Dron/assetLibrary 2025-06-30 12:53:33 +05:00
PC-G13 2b60d4133d FacadeDistanceBlend Material, FacadeGradientDecal, facade PPM, 2025-06-30 12:53:29 +05:00
PC-G04 08df39f276 Merge branch 'master' of http://192.168.1.163:3000/Dron/assetLibrary 2025-06-30 12:52:17 +05:00
PC-G04 9474d60623 МАФ турник 2025-06-30 12:51:49 +05:00
sv-art84 3a1f64fb44 foliage
sev port + neft
2025-06-27 17:06:44 +05:00
sv-art84 d56ee13487 foliage
sev veter
2025-06-27 16:49:40 +05:00
sv-art84 1618a4f6bb foliage
hito
2025-06-27 16:28:55 +05:00
Dron 97c2a1ad8b share to lib 2025-06-24 14:46:35 +05:00
SergeyVag 1130ff2f10 материал 2025-06-11 18:14:44 +05:00
PC-G04 2f06519ed3 Merge branch 'master' of http://192.168.1.163:3000/Dron/assetLibrary 2025-06-06 17:06:11 +05:00
PC-G04 96f75aaf21 МАФ 2025-06-06 17:06:08 +05:00
SergeyVag aaea945928 Merge branch 'master' of http://192.168.1.163:3000/Dron/assetLibrary 2025-06-03 19:08:56 +05:00
SergeyVag 20edddebdf Материал 2025-06-03 19:08:54 +05:00
PC-G08 a8e0dce465 addTemp 2025-06-03 15:43:36 +05:00
PC-G08 b01e26dd29 addMafs 2025-06-02 17:14:10 +05:00
SergeyVag 632f28efde Merge branch 'master' of http://192.168.1.163:3000/Dron/assetLibrary 2025-06-02 16:33:40 +05:00
SergeyVag 42aaa23259 Текстура ткани 2025-06-02 16:33:31 +05:00