Dron/Onejsky4U
1
0
Fork 0
Code Pull Requests Releases Activity
105 Commits 6 Branches 0 Tags
ac333fbf8a5bd72ec5a299544c04f0d685b27696
Commit Graph

51 Commits

Author SHA1 Message Date
Lenta_Mebiusa ac333fbf8a Импорт материалов плитки, штукатурки...Добавил ID на внутр стены 4 секции 2021-02-25 13:25:59 +05:00
GRAFF c5aa746b0d добавление масочных инстансов на каждый дом, перемещение генераторов ну имного чего еще 2021-01-26 14:58:36 +05:00
GRAFF 6892f48fc4 оптимизация тачек, деревья, еще по мелочи, этажи 2021-01-13 19:10:17 +05:00
GRAFF 3530528888 допилены пролеты, призрак дома, удалены ЕЩЕ РАЗ тачки из корня 2020-12-24 12:51:32 +05:00
GRAFF 445dc93ade Merge remote-tracking branch 'origin/Danis' оформил срез дома первого 2020-12-18 19:07:50 +05:00
GRAFF e21b5a1e4e Merge remote-tracking branch 'origin/Danis' если не будет правок, то сдача 1го этапа 2020-12-14 19:12:08 +05:00
GRAFF 8ea7e53f60 настроил почти сцену 2020-12-13 15:11:09 +05:00
GRAFF 2d68ee31b4 ну тут всякое... 2020-12-11 23:50:09 +05:00
GRAFF 210ae4178a и еще 2020-12-11 15:50:02 +05:00
GRAFF 58420f9f9d почти готов 1й этап 2020-12-11 14:26:21 +05:00
GRAFF 8857627567 подправки 2020-12-10 18:20:28 +05:00
GRAFF 1cb2d81443 Merge branch 'Danis' of http://192.168.1.163:3000/Dron/Onejsky4U 2020-12-10 16:18:57 +05:00
GRAFF f72e9481c4 много всякой фигни, фантомы домов, материал стекла, фейки, 2020-12-10 16:09:57 +05:00
Lenta_Mebiusa 1a85f43b73 Поправлена придомовая, тачки реже, столбы освещения вокруг, бордюр во дворе у газона, ступенька на входе со двора в подъезд, материалы МАФ. Перила. Че-то еще не помню 2020-12-10 15:03:15 +05:00
GRAFF 19135b0bd0 Merge branch 'Danis' of http://192.168.1.163:3000/Dron/Onejsky4U 
greymat
 2020-12-10 14:30:08 +05:00
GRAFF f2649b7d76 Merge remote-tracking branch 'origin/Danis' 2020-12-08 18:18:39 +05:00
Lenta_Mebiusa 0ecb6e1064 Merge remote-tracking branch 'origin/Nikolay' into Danis 
# Conflicts:
#	Content/Maps/MainScene.umap
#	Content/Maps/Test_Level.umap
#	Content/Maps/Test_Level_BuiltData.uasset
#	Content/Maps/Yard.umap
#	Content/Materials/Instances/Dvor/Texture/Floor_rubber_mix.uasset
#	Content/Megascans/Surfaces/Thai_Beach_Sand_2x2_M_tgrhebdk_surface/Sand.uasset
 2020-12-08 17:35:19 +05:00
DYVOL3316 89ce26876f Поправлены тайлы 2020-12-08 17:14:18 +05:00
DYVOL3316 874e3d8913 Изменил материал баскетбольной площадки 2020-12-08 14:19:52 +05:00
GRAFF 70822a7492 Merge remote-tracking branch 'origin/Danis' 2020-12-08 12:26:16 +05:00
GRAFF e12ad5c10c всякая фигня 2020-12-07 20:59:49 +05:00
Lenta_Mebiusa 176a00ecfa песок, LOD кустов и деревьев 2020-12-07 20:34:54 +05:00
Lenta_Mebiusa 6056c3a068 Добавил МАФ, людей, детей, столбы освещения 2020-12-07 18:38:23 +05:00
Lenta_Mebiusa 53a9a3e2aa Merge branch 'Nikolay' of http://192.168.1.163:3000/Dron/Onejsky4U into Danis 
# Conflicts:
#	Content/Maps/Test_Level.umap
#	Content/Maps/Test_Level_BuiltData.uasset
#	Content/Maps/Yard.umap
 2020-12-07 11:37:12 +05:00
DYVOL3316 a4fbcaf540 Баскетбольная площадка 2020-12-06 01:28:51 +05:00
GRAFF ad444c7057 добавил бп ходящих чертов, переименовал бнв, удалил стартерконтент 2020-12-05 21:17:38 +05:00
GRAFF 7cfb14c491 Merge remote-tracking branch 'origin/Danis' 
еще добавлен гномский заборчик
 2020-12-05 12:47:42 +05:00
GRAFF 2522e3da5a Merge remote-tracking branch 'origin/Danis' 
# Conflicts:
#	Content/AssetPacks/CarMoveSpline/Materials/VehicleVarietyPack/Textures/Hatchback/TX_Hatchback_Diffuse_0.uasset
#	Content/AssetPacks/Procedural_Ecosystem/Materials/Material_Functions/MF_Landscape_birch_Asphalt10.uasset
#	Content/AssetPacks/Procedural_Ecosystem/Materials/Material_Functions/MF_Landscape_birch_Asphalt11.uasset
 2020-12-04 21:44:53 +05:00
DYVOL3316 c499a8128d Назначены все материалы на дворовой территории 
Signed-off-by: DYVOL3316 <NikolayVolov3316@gmail.com>
 2020-12-04 20:57:11 +05:00
DYVOL3316 fd1b5d623b Частично назначены материалы на покрытия дворовой территории 2020-12-04 18:09:33 +05:00
DYVOL3316 890de822a2 Merge remote-tracking branch 'origin/Danis' into Nikolay 2020-12-04 15:02:47 +05:00
GRAFF 0f40e9fe2c Merge branch 'Nikolay' of http://192.168.1.163:3000/Dron/Onejsky4U 2020-12-04 14:00:59 +05:00
GRAFF 617a156dae всякое всякое, ночной режим 2020-12-03 19:21:48 +05:00
DYVOL3316 967598346d Обновление фотограмметрии 2020-12-03 19:08:30 +05:00
GRAFF f3383e3cde Merge remote-tracking branch 'origin/Nikolay' 
# Conflicts:
#	.gitignore
#	Content/AutomotiveMaterials/Textures/CarbonFiber/T_MetalFlakes_N.uasset
#	Content/Blueprints/Player/GI.uasset
#	Content/Blueprints/Player/MyPawn.uasset
#	Content/Blueprints/Player/WalkingPawn.uasset
#	Content/Blueprints/Player/getFunctions.uasset
#	Content/Blueprints/Player/infoHud.uasset
#	Content/Blueprints/UI/Actors/HousePoint.uasset
#	Content/Blueprints/UI/Imgs/22.uasset
#	Content/Blueprints/UI/Imgs/Эскизный_Альбом2_Страница_32_Mat.uasset
#	Content/Blueprints/UI/Materials/FasadHide.uasset
#	Content/Blueprints/UI/Materials/TestFasad.uasset
#	Content/Blueprints/UI/Others/InfraData.uasset
#	Content/Blueprints/UI/WBPS/FlatInfo.uasset
#	Content/Blueprints/UI/WBPS/FloorPointer.uasset
#	Content/Blueprints/UI/WBPS/InfraPointer.uasset
#	Content/Blueprints/UI/WBPS/MainMenu.uasset
#	Content/Blueprints/UI/WBPS/MenuBtn.uasset
#	Content/Blueprints/UI/WBPS/map.uasset
#	Content/Maps/MainScene.umap
#	Content/Maps/Test_Level.umap
#	Content/Maps/Test_Level_BuiltData.uasset
#	Content/Materials/AutomotiveMaterials/Textures/CarPaint/T_Bump_N.uasset
#	Content/Materials/AutomotiveMaterials/Textures/CarPaint/T_FlakeMask.uasset
#	Content/Materials/AutomotiveMaterials/Textures/CarbonFiber/T_MetalFlakes_N.uasset
#	Content/Materials/Instances/MI_Squad_01.uasset
#	Content/Materials/Instances/MI_Squad_03_01.uasset
#	Content/Materials/Instances/MI_Squad_04_01.uasset
#	Content/Materials/Instances/MI_Squad_05.uasset
#	Content/Textures/Squads/T_Squad_03_01_RA.uasset
#	Content/Textures/Squads/T_Squad_04_01_RA.uasset
 2020-11-30 16:30:56 +05:00
GRAFF 146032bb57 допиливания полины, расставлены инфрапоинты 2020-11-30 14:20:06 +05:00
Lenta_Mebiusa 10b8e084e4 Merge remote-tracking branch 'origin/Nikolay' into Danis 
# Conflicts:
#	Content/AssetPacks/Procedural_Ecosystem/Materials/Material_Functions/MF_Landscape_birch_Asphalt10.uasset
#	Content/AssetPacks/Procedural_Ecosystem/Materials/Material_Functions/MF_Landscape_birch_Asphalt11.uasset
#	Content/AutomotiveMaterials/Textures/CarbonFiber/T_MetalFlakes_N.uasset
#	Content/Blueprints/UI/Imgs/22.uasset
#	Content/Blueprints/Utils/CarStatic.uasset
#	Content/Materials/AutomotiveMaterials/Textures/CarPaint/T_Bump_N.uasset
#	Content/Materials/AutomotiveMaterials/Textures/CarPaint/T_FlakeMask.uasset
#	Content/Materials/AutomotiveMaterials/Textures/CarbonFiber/T_MetalFlakes_N.uasset
#	Content/Materials/M_newAsphalt.uasset
 2020-11-30 13:40:05 +05:00
Lenta_Mebiusa 0398734c0c Merge remote-tracking branch 'origin/master' into Danis 
# Conflicts:
#	Content/AssetPacks/CarMoveSpline/Materials/VehicleVarietyPack/Textures/BoxTruck/TX_Truck_Glass_ORM.uasset
#	Content/AssetPacks/CarMoveSpline/Materials/VehicleVarietyPack/Textures/BoxTruck/TX_Truck_Interior_Diffuse.uasset
#	Content/AssetPacks/CarMoveSpline/Materials/VehicleVarietyPack/Textures/Hatchback/TX_Hatchback_Diffuse_0.uasset
#	Content/AssetPacks/CarMoveSpline/Materials/VehicleVarietyPack/Textures/Hatchback/TX_Hatchback_Diffuse_1.uasset
#	Content/AssetPacks/CarMoveSpline/Materials/VehicleVarietyPack/Textures/Pickup/TX_Pickup_Normal_2.uasset
#	Content/AssetPacks/CarMoveSpline/Materials/VehicleVarietyPack/Textures/SUV/TX_SUV_Main_ORM.uasset
#	Content/AssetPacks/CarMoveSpline/Materials/VehicleVarietyPack/Textures/TX_Asphalt_Dry_Normal.uasset
#	Content/AssetPacks/CarMoveSpline/Textures/TexturesOld/Textures/Tileable/T_FabricPlain_A.uasset
#	Content/AssetPacks/CompactSUV/Parameters/P_Car_GlobalParameters.uasset
#	Content/AssetPacks/CompactSUV/Textures/T_BrushedMetal_Normal.uasset
#	Content/AssetPacks/CompactSUV/Textures/T_Car_AO.uasset
#	Content/AssetPacks/CompactSUV/Textures/T_Car_Normal.uasset
#	Content/AssetPacks/CompactSUV/Textures/T_DirtHighlights.uasset
#	Content/AssetPacks/CompactSUV/Textures/T_Dirt_Col.uasset
#	Content/AssetPacks/CompactSUV/Textures/T_Dirt_ColVar.uasset
#	Content/AssetPacks/CompactSUV/Textures/T_Dirt_Mask.uasset
#	Content/AssetPacks/CompactSUV/Textures/T_Dirt_Normal.uasset
#	Content/AssetPacks/CompactSUV/Textures/T_Dots.uasset
#	Content/AssetPacks/CompactSUV/Textures/T_Fabric_Normal.uasset
#	Content/AssetPacks/CompactSUV/Textures/T_Fabric_Roughness.uasset
#	Content/AssetPacks/CompactSUV/Textures/T_Lights_Mask_01.uasset
#	Content/AssetPacks/CompactSUV/Textures/T_Lights_Mask_02.uasset
#	Content/AssetPacks/CompactSUV/Textures/T_Noise_Mask_02.uasset
#	Content/AssetPacks/CompactSUV/Textures/T_Plastic_Normal.uasset
#	Content/AssetPacks/CompactSUV/Textures/T_Reflector_Normal.uasset
#	Content/AssetPacks/CompactSUV/Textures/T_Rubber_Col.uasset
#	Content/AssetPacks/CompactSUV/Textures/T_Rubber_Roughness.uasset
#	Content/AssetPacks/CompactSUV/Textures/T_Waterspots.uasset
#	Content/AssetPacks/Procedural_Ecosystem/Materials/Material_Functions/MF_Landscape_birch_Asphalt10.uasset
#	Content/AssetPacks/Procedural_Ecosystem/Materials/Material_Functions/MF_Landscape_birch_Asphalt11.uasset
#	Content/AssetPacks/Sedan/Parameters/P_Car_GlobalParametersSedan.uasset
#	Content/AssetPacks/Sedan/Textures/T_BrushedMetal_Normal.uasset
#	Content/AssetPacks/Sedan/Textures/T_Car_AO.uasset
#	Content/AssetPacks/Sedan/Textures/T_Car_Normal.uasset
#	Content/AssetPacks/Sedan/Textures/T_DSP_Mask.uasset
#	Content/AssetPacks/Sedan/Textures/T_DirtHighlights.uasset
#	Content/AssetPacks/Sedan/Textures/T_Dirt_Col.uasset
#	Content/AssetPacks/Sedan/Textures/T_Dirt_ColVar.uasset
#	Content/AssetPacks/Sedan/Textures/T_Dirt_Normal.uasset
#	Content/AssetPacks/Sedan/Textures/T_Fabric_Normal.uasset
#	Content/AssetPacks/Sedan/Textures/T_Fabric_Roughness.uasset
#	Content/AssetPacks/Sedan/Textures/T_Noise_Mask_02.uasset
#	Content/AssetPacks/Sedan/Textures/T_Plastic_Normal.uasset
#	Content/AssetPacks/Sedan/Textures/T_Reflector_Normal.uasset
#	Content/AssetPacks/Sedan/Textures/T_Rubber_Col.uasset
#	Content/AssetPacks/Sedan/Textures/T_Rubber_Roughness.uasset
#	Content/AssetPacks/Sedan/Textures/T_Waterspots.uasset
#	Content/AutomotiveMaterials/Textures/CarbonFiber/T_MetalFlakes_N.uasset
#	Content/Blueprints/Utils/CarStatic.uasset
#	Content/CarAssetSedan/Sedan/Textures/T_DSP_Mask.uasset
#	Content/CarAssetSedan/Sedan/Textures/T_Dirt_Col.uasset
#	Content/CarAssetSedan/Sedan/Textures/T_Dirt_Normal.uasset
#	Content/CarAssetSedan/Sedan/Textures/T_Noise_Mask_02.uasset
#	Content/CarAssetSedan/Sedan/Textures/T_Plastic_Normal.uasset
#	Content/CompactSUVCar/CompactSUV/Textures/T_Car_AO.uasset
#	Content/CompactSUVCar/CompactSUV/Textures/T_Dirt_Col.uasset
#	Content/CompactSUVCar/CompactSUV/Textures/T_Dirt_Normal.uasset
#	Content/CompactSUVCar/CompactSUV/Textures/T_Plastic_Normal.uasset
#	Content/Materials/AutomotiveMaterials/Textures/CarPaint/T_Bump_N.uasset
#	Content/Materials/AutomotiveMaterials/Textures/CarPaint/T_FlakeMask.uasset
#	Content/Materials/AutomotiveMaterials/Textures/CarbonFiber/T_MetalFlakes_N.uasset
#	Content/Materials/M_newAsphalt.uasset
#	Content/Meshes/Section_01/SM_Section_01_SM_Section_01_04.uasset
 2020-11-30 13:32:57 +05:00
DYVOL3316 75122678f0 Обновление тестового уровня. 2020-11-30 12:54:05 +05:00
GRAFF 91dd967e0a Merge remote-tracking branch 'origin/Nikolay' 2020-11-24 16:29:16 +05:00
GRAFF 5ab8ddc2f7 Merge remote-tracking branch 'origin/Danis' 2020-11-24 16:29:06 +05:00
DYVOL3316 05bdc66eea последние дома 2020-11-24 16:14:38 +05:00
GRAFF f2088be3bb практически до конца сделанный интерфейс и переходы, ночное освещение, импорт от Коляна 2020-11-24 14:37:36 +05:00
Lenta_Mebiusa 25b527cf62 Люди, ограждения. Машины, скамейка и урна старые 2020-11-24 13:26:59 +05:00
Lenta_Mebiusa b6171181ba Добавил тачки, МАФы, карту Index и Environment, 2020-11-10 16:57:39 +05:00
GRAFF 0cb87268cf Перенес всякую фигню в ассетпакс, доработал скрытие фасадов, рентген через фасады 2020-11-06 17:45:29 +05:00
DYVOL3316 85f2bc4b5a Контент 2020-11-06 13:26:37 +05:00
Lenta_Mebiusa 16af463055 исправление говна после LFS 2020-11-05 21:37:25 +05:00
DYVOL3316 72a62a0f0d Мастер материал под тайлы + функция трипланара + первая тестовая сцена. 2020-10-30 15:13:20 +05:00
GRAFF ab1a00eaea add any 2020-10-23 17:40:07 +05:00