Dron/Onejsky4U
1
0
Fork 0
Code Pull Requests Releases Activity
73 Commits 6 Branches 0 Tags
1663debbce5507f539093e8e9e2ee622b95d878a
Commit Graph

68 Commits

Author SHA1 Message Date
Lenta_Mebiusa 1663debbce Добавил МАФ Горка. Сдвинул остальные МАФ, людей, и пр. 2020-12-10 18:35:48 +05:00
Lenta_Mebiusa 1a85f43b73 Поправлена придомовая, тачки реже, столбы освещения вокруг, бордюр во дворе у газона, ступенька на входе со двора в подъезд, материалы МАФ. Перила. Че-то еще не помню 2020-12-10 15:03:15 +05:00
Lenta_Mebiusa f9b722eca4 Сквад 05 2020-12-08 18:40:23 +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
Lenta_Mebiusa f59f646a84 Добавил разметку на парковку, машины, добавил деревья на придомовую, Фонари (не все), МАФ - карусель 2020-12-08 17:32:27 +05:00
DYVOL3316 89ce26876f Поправлены тайлы 2020-12-08 17:14:18 +05:00
DYVOL3316 874e3d8913 Изменил материал баскетбольной площадки 2020-12-08 14:19:52 +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 afc5a560e6 no message 2020-12-07 11:37: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 9517ae7161 Merge remote-tracking branch 'origin/Danis' 2020-12-05 23:21:18 +05:00
Lenta_Mebiusa 8b453191e7 Обновил террэйн от Игоря 2020-12-05 23:14:40 +05:00
GRAFF 7e3f019b1c правки травянога мата, параллакс эффект 2020-12-05 23:08:30 +05:00
Lenta_Mebiusa 6c23aea13c Переместил все что делал в уровень Yard 2020-12-05 22:25:47 +05:00
Lenta_Mebiusa 8770bbe54c Merge remote-tracking branch 'origin/master' into Danis 2020-12-05 21:51:11 +05:00
Lenta_Mebiusa 40636cc1e9 Добавил МАФ workout площадки 2020-12-05 21:49:48 +05:00
GRAFF ad444c7057 добавил бп ходящих чертов, переименовал бнв, удалил стартерконтент 2020-12-05 21:17:38 +05:00
GRAFF d2eb54550c Merge remote-tracking branch 'origin/Danis' 2020-12-05 20:46:56 +05:00
Lenta_Mebiusa 113eb0d4da Добавил растительность во двор 2020-12-05 20:31:49 +05:00
GRAFF 43765a5b33 лут, еще инфраструктурная фигня, инфа о проекте 2020-12-05 20:24:45 +05:00
GRAFF 7ce3c63458 Merge branch 'Nikolay' of http://192.168.1.163:3000/Dron/Onejsky4U 2020-12-05 19:39:36 +05:00
DYVOL3316 d584641920 Merge remote-tracking branch 'origin/Danis' into Nikolay 
# Conflicts:
#	Content/Maps/Yard.umap
 2020-12-05 19:37:42 +05:00
DYVOL3316 3a4c6e2c05 Добавил решетки в паркинг, Убрал забор по периметру двора. 
Signed-off-by: DYVOL3316 <NikolayVolov3316@gmail.com>
 2020-12-05 19:29:04 +05:00
GRAFF 524760637a Merge remote-tracking branch 'origin/Danis' 2020-12-05 12:49:24 +05:00
GRAFF 7cfb14c491 Merge remote-tracking branch 'origin/Danis' 
еще добавлен гномский заборчик
 2020-12-05 12:47:42 +05:00
Lenta_Mebiusa 6e620309af Двор. Почти все МАФы, деревья, немного кустов, пара людей 2020-12-05 04:10:33 +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
Lenta_Mebiusa 688de95bd9 Добавил придомовую 2020-12-04 21:23:49 +05:00
Lenta_Mebiusa 2bc7634123 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-04 21:14:44 +05:00
Lenta_Mebiusa d0c4e29bb8 Часть МАФ 2020-12-04 20:59:05 +05:00
DYVOL3316 c499a8128d Назначены все материалы на дворовой территории 
Signed-off-by: DYVOL3316 <NikolayVolov3316@gmail.com>
 2020-12-04 20:57:11 +05:00
Lenta_Mebiusa 1b4eef0779 Merge remote-tracking branch 'origin/Nikolay' into Danis 
# Conflicts:
#	Content/Maps/Test_Level.umap
#	Content/Maps/Yard.umap
 2020-12-04 18:43:14 +05:00
Lenta_Mebiusa f0276980d1 Частично добавлены МАФы 2020-12-04 18:38:32 +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
Lenta_Mebiusa f9547463e2 Merge remote-tracking branch 'origin/Nikolay' into Danis 2020-12-04 14:12:17 +05:00
GRAFF 0f40e9fe2c Merge branch 'Nikolay' of http://192.168.1.163:3000/Dron/Onejsky4U 2020-12-04 14:00:59 +05:00
Lenta_Mebiusa 0143b9a837 Двор (покрытия / клумбы / уровень Yard). Все без материалов 2020-12-04 02:22:14 +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 7ad6eb22c3 вкрячен полинин интерфейс 2020-11-25 21:12:49 +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