Commit Graph

94 Commits

Author SHA1 Message Date
SergeyVag 23cf226209 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-09-27 19:26:18 +05:00
SergeyVag 4f46c5a2f6 фасады 2023-09-27 19:26:14 +05:00
PC-G12 c303ed73f1 B2T 2023-09-27 17:04:29 +05:00
PC-G12 6ce9d1f196 B2T 2023-09-27 16:21:45 +05:00
Daniil.I.Y 24344a2755 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-09-26 20:27:36 +05:00
Daniil.I.Y 748f3dcfbb C2M_L/R;C2T_L/R 2023-09-26 20:27:30 +05:00
PC-G12 b16859409a B2M 2023-09-25 20:06:53 +05:00
PC-G12 504781eadb Villas 2023-09-25 12:04:27 +05:00
PC-G12 c2222c1b48 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-09-22 19:53:57 +05:00
PC-G12 cc56d29e99 B2M 2023-09-22 19:53:50 +05:00
SergeyVag bb9ad6dffc Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-09-22 19:07:05 +05:00
SergeyVag 7b93a61ce6 C1M 2023-09-22 19:06:56 +05:00
Daniil.I.Y 2c1ec8c44b Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-09-22 16:30:37 +05:00
Daniil.I.Y d9d19b9df9 B1M_R 2023-09-22 16:30:31 +05:00
PC-G12 1adefe165e Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-09-22 11:50:19 +05:00
PC-G12 504c59b2d5 B2M 2023-09-22 11:50:14 +05:00
Daniil.I.Y 55a3cf8f78 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-09-21 19:59:51 +05:00
Daniil.I.Y 3d5a2a531e B1M 2023-09-21 19:59:40 +05:00
PC-G12 7dec3992c0 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-09-21 19:49:38 +05:00
PC-G12 72b9d9754b B2M 2023-09-21 19:49:32 +05:00
SergeyVag 4e145b88a1 C1M 2023-09-21 19:29:32 +05:00
PC-G12 243d18bc51 A1M_B2M 2023-09-20 19:46:47 +05:00
PC-G12 39f0a2900f Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-09-19 19:54:27 +05:00
PC-G12 59e0c04c4d A1M 2023-09-19 19:54:23 +05:00
SergeyVag c642744fa3 A2T 2023-09-19 19:30:32 +05:00
SergeyVag 1031e9488b A2M 2023-09-18 18:44:03 +05:00
SergeyVag 03ba32455e A2M 2023-09-14 19:29:57 +05:00
GRAFF 4f8b3e2a92 enabled raytraced shadows, cascades works bad with nanites 2023-06-07 01:09:09 +05:00
PC-G13 e2c5862f15 nytip 2023-05-30 19:44:53 +05:00
PC-G09 05806fe990 Фуляга, тачки, трава 2023-05-29 08:20:25 +05:00
PC-G09 36ab1c9aec Genplan area Demo 2023-05-29 04:54:08 +05:00
PC-G06 513ad66c70 Furniture_Repair_Part_1 2022-11-17 23:26:57 +05:00
Andrew 5abe135f4c Merge remote-tracking branch 'origin/master' 2022-11-09 16:39:06 +05:00
Andrew cb266ec3df Перевод нерабочий 2022-11-09 16:38:31 +05:00
PC-G13 998e5622ee Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS
# Conflicts:
#	Content/Assetpacks/SpeedTree/Asset/SpeedTree/TreeMats/MM_Grass_TKT.uasset
#	Content/Maps/Interior/A1T/A1T_L_Fol.umap
#	Content/Maps/Interior/A2M/A2M_R.umap
2022-11-09 16:16:12 +05:00
PC-G13 38da3c619f makepalmgreatagainandagain 2022-11-09 16:15:06 +05:00
GRAFF 96872230bf фикс нормалей, интерфейса, вроде готов к показу 2022-11-06 21:14:14 +05:00
PC-G13 e45858e5c9 channelagainblat 2022-11-06 15:24:25 +05:00
PC-G13 c051546122 channel,coll 2022-11-06 13:45:49 +05:00
PC-G13 bd4d6715ea Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS
# Conflicts:
#	Content/Maps/Interior/C2M/C2M_L.umap
#	Content/Maps/Interior/C2M/C2M_R.umap
#	Content/Maps/Landscape.umap
#	Content/Materials/Instances/Grass/MI_Grass_Yellow.uasset
2022-11-06 13:09:10 +05:00
PC-G13 226b97648d smth 2022-11-06 13:06:47 +05:00
GRAFF eb5adc5ad0 блять сколько же кала 2022-11-04 19:06:32 +05:00
GRAFF 9d46da9bc2 adssa 2022-11-03 20:27:03 +05:00
Andrew 2d2d455861 Автопреза 2022-11-03 19:40:38 +05:00
PC-G13 16eb04aa74 bakenormalsfix 2022-11-02 22:17:00 +05:00
PC-G13 744bd28d22 channelswitch 2022-11-02 15:59:30 +05:00
PC-G13 61b8f1d657 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS
# Conflicts:
#	Content/Assetpacks/Tropical_Jungle_Pack/FoliageType/FT_PalmCoconut_03.uasset
#	Content/Assetpacks/Tropical_Jungle_Pack/FoliageType/FT_Tree_Fern_01.uasset
#	Content/Assetpacks/Tropical_Jungle_Pack/FoliageType/FT_Tree_Fern_02.uasset
#	Content/Maps/Buildings.umap
#	Content/Maps/Interior/A1T/A1T_L.umap
#	Content/Maps/Interior/A1T/A1T_R.umap
#	Content/Maps/Interior/A2M/A2M_L.umap
#	Content/Maps/Interior/A2M/A2M_R.umap
#	Content/Maps/Interior/B1T/B1T_L.umap
#	Content/Maps/Interior/B1T/B1T_R.umap
#	Content/Maps/Interior/B2M/B2M_L.umap
#	Content/Maps/Interior/B2M/B2M_R.umap
#	Content/Maps/Interior/C1T/C1T_L.umap
#	Content/Maps/Interior/C1T/C1T_R.umap
#	Content/Maps/Interior/C2M/C2M_L.umap
#	Content/Maps/Interior/C2M/C2M_R.umap
#	Content/Materials/Masters/Common/MM_Master.uasset
2022-11-01 22:19:02 +05:00
PC-G13 d7540fdf54 masteropacity, halfmembake, sockets fix, lods fo palms 2022-11-01 22:17:07 +05:00
PC-G01 92b4d3c1ab tree 2022-11-01 12:46:17 +05:00
GRAFF efab316809 gbplf 2022-11-01 11:48:34 +05:00