Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter

Browse Source

...

This commit is contained in:

Lenta_Mebiusa

2021-09-03 14:02:04 +05:00

parent 33751f0478 96ac007931

commit 39706e82cb

260 changed files with 14 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Content/Assetpacks/CarMoveSpline/BP/BP_CarStatic.uasset

BIN

Binary file not shown.

Content/Assetpacks/Cars/CarBMW/BMW_M3_2_3.uasset

BIN

Binary file not shown.

Content/Assetpacks/Cars/CarBMW/BMW_M3_2_4.uasset

BIN

Binary file not shown.

Content/Assetpacks/Cars/CarBMW/BMW_M3_2_5.uasset

BIN

Binary file not shown.

Content/Assetpacks/Cars/CarBMW/Material/BMW_M3_emissive.uasset

BIN

Binary file not shown.

Content/Assetpacks/Cars/CarBMW/Material/BmwMaster.uasset

BIN

Binary file not shown.

Content/Assetpacks/Cars/CarBMW/Material/BmwMaster_Inst10.uasset

BIN

Binary file not shown.

Content/Assetpacks/Cars/CarBMW/Material/BmwMaster_Inst12.uasset

BIN

Binary file not shown.

Content/Assetpacks/Kitchen/M_Metal_Chrome.uasset

BIN

Binary file not shown.

Content/Assetpacks/Kitchen/Materials/M_TileDirt.uasset

BIN

Binary file not shown.

Content/Assetpacks/SpeedTree/Materials/NorwaySpruce_Med_Leaf_Mat.uasset

BIN

Binary file not shown.

Content/Assetpacks/SpeedTree/Materials/RedDeliciousApple_Low_FacingLeaf_Mat.uasset

BIN

Binary file not shown.

Content/Assetpacks/ThreeDee/Materials/Tileable/MI_Lamp_Emissive1.uasset

BIN

Binary file not shown.

Content/Assetpacks/ThreeDee/Materials/Tileable/MI_Lamp_EmissiveBright.uasset

BIN

Binary file not shown.

Content/Assetpacks/bathroom/SM_Installation.uasset

BIN

Binary file not shown.

Content/Assetpacks/fencing/Park_3d.uasset

BIN

Binary file not shown.

Content/Assetpacks/fencing/Park_3d_Pillar.uasset

BIN

Binary file not shown.

Content/Assetpacks/fencing/zabor.uasset

BIN

Binary file not shown.

Content/Assetpacks/wardrobe/XIAOMI_LAMP_650_MM.uasset

BIN

Binary file not shown.

Content/Assetpacks/xoio_berlinflat/Materials/Chrome.uasset

BIN

Binary file not shown.

Content/Assetpacks/xoio_berlinflat/Materials/painting.uasset

BIN

Binary file not shown.

Content/Blueprints/Bps.uasset

BIN

Binary file not shown.

Content/Blueprints/Classes/RadiatorGen.uasset

BIN

Binary file not shown.

Content/Blueprints/Lamp/BP_lampStreet_Bars_lamp_big.uasset

BIN

Binary file not shown.

Content/Blueprints/Lamp/BP_lampStreet_Bars_lamp_out.uasset

BIN

Binary file not shown.

Content/Blueprints/Lamp/BP_lampStreet_Bars_lamp_small.uasset

BIN

Binary file not shown.

Content/Blueprints/Lift/BM_Elevator.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/GI.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/GameplayFunctions.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/VR/Materials/Colors.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/VR/Materials/M_TeleportPreviews.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/VR/Materials/M_VRpointer.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/VR/Materials/M_VRtraceSphere.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/VR/VRHand.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/VR/VRPawn.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/FloorView/MainButtons/Section1/Section1_default.uasset → Content/Blueprints/UI/Imgs/VR_Components/FloorView/SectionButtons/Section1/Section1_default.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/FloorView/MainButtons/Section1/Section1_disabled.uasset → Content/Blueprints/UI/Imgs/VR_Components/FloorView/SectionButtons/Section1/Section1_disabled.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/FloorView/MainButtons/Section1/Section1_hovered.uasset → Content/Blueprints/UI/Imgs/VR_Components/FloorView/SectionButtons/Section1/Section1_hovered.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/FloorView/MainButtons/Section1/Section1_pressed.uasset → Content/Blueprints/UI/Imgs/VR_Components/FloorView/SectionButtons/Section1/Section1_pressed.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/FloorView/MainButtons/Section2/Section2_default.uasset → Content/Blueprints/UI/Imgs/VR_Components/FloorView/SectionButtons/Section2/Section2_default.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/FloorView/MainButtons/Section2/Section2_disabled.uasset → Content/Blueprints/UI/Imgs/VR_Components/FloorView/SectionButtons/Section2/Section2_disabled.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/FloorView/MainButtons/Section2/Section2_hovered.uasset → Content/Blueprints/UI/Imgs/VR_Components/FloorView/SectionButtons/Section2/Section2_hovered.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/FloorView/MainButtons/Section2/Section2_pressed.uasset → Content/Blueprints/UI/Imgs/VR_Components/FloorView/SectionButtons/Section2/Section2_pressed.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/FloorView/MainButtons/Section3/Section3_default.uasset → Content/Blueprints/UI/Imgs/VR_Components/FloorView/SectionButtons/Section3/Section3_default.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/FloorView/MainButtons/Section3/Section3_disabled.uasset → Content/Blueprints/UI/Imgs/VR_Components/FloorView/SectionButtons/Section3/Section3_disabled.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/FloorView/MainButtons/Section3/Section3_hovered.uasset → Content/Blueprints/UI/Imgs/VR_Components/FloorView/SectionButtons/Section3/Section3_hovered.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/FloorView/MainButtons/Section3/Section3_pressed.uasset → Content/Blueprints/UI/Imgs/VR_Components/FloorView/SectionButtons/Section3/Section3_pressed.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/HouseView/MainButtons/Section1/Section1_default.uasset → Content/Blueprints/UI/Imgs/VR_Components/HouseView/SectionButtons/Section1/Section1_default.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/HouseView/MainButtons/Section1/Section1_disabled.uasset → Content/Blueprints/UI/Imgs/VR_Components/HouseView/SectionButtons/Section1/Section1_disabled.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/HouseView/MainButtons/Section1/Section1_hovered.uasset → Content/Blueprints/UI/Imgs/VR_Components/HouseView/SectionButtons/Section1/Section1_hovered.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/HouseView/MainButtons/Section1/Section1_pressed.uasset → Content/Blueprints/UI/Imgs/VR_Components/HouseView/SectionButtons/Section1/Section1_pressed.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/HouseView/MainButtons/Section2/Section2_default.uasset → Content/Blueprints/UI/Imgs/VR_Components/HouseView/SectionButtons/Section2/Section2_default.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/HouseView/MainButtons/Section2/Section2_disabled.uasset → Content/Blueprints/UI/Imgs/VR_Components/HouseView/SectionButtons/Section2/Section2_disabled.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/HouseView/MainButtons/Section2/Section2_hovered.uasset → Content/Blueprints/UI/Imgs/VR_Components/HouseView/SectionButtons/Section2/Section2_hovered.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/HouseView/MainButtons/Section2/Section2_pressed.uasset → Content/Blueprints/UI/Imgs/VR_Components/HouseView/SectionButtons/Section2/Section2_pressed.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/HouseView/MainButtons/Section3/Section3_default.uasset → Content/Blueprints/UI/Imgs/VR_Components/HouseView/SectionButtons/Section3/Section3_default.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/HouseView/MainButtons/Section3/Section3_disabled.uasset → Content/Blueprints/UI/Imgs/VR_Components/HouseView/SectionButtons/Section3/Section3_disabled.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/HouseView/MainButtons/Section3/Section3_hovered.uasset → Content/Blueprints/UI/Imgs/VR_Components/HouseView/SectionButtons/Section3/Section3_hovered.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/HouseView/MainButtons/Section3/Section3_pressed.uasset → Content/Blueprints/UI/Imgs/VR_Components/HouseView/SectionButtons/Section3/Section3_pressed.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Imgs/VR_Components/VR_MARKER_Atlas_16fr_64ms_128ms.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Materials/FasadHide.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Materials/M_flatCap.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Materials/MovePoint.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/WBPS/Menu/welcomeData.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/WBPS/VR/VRfloorBtn.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/WBPS/VR/VRmainWin.uasset

BIN

Binary file not shown.

Content/Blueprints/Utils/Generators/CarStatic.uasset

BIN

Binary file not shown.

Content/Instances/Metal/MI_Metal_Gray.uasset

BIN

Binary file not shown.

Content/Instances/Rook/MI_Marble_SlabWhite2.uasset

BIN

Binary file not shown.

Content/Instances/Rubber/MI_RubberBrownUntiling.uasset

BIN

Binary file not shown.

Content/Maps/Buildings_Outside.umap

BIN

Binary file not shown.

Content/Maps/Cars_p2-3.umap

BIN

Binary file not shown.

Content/Maps/DayLight.umap

BIN

Binary file not shown.

Content/Maps/Flat_baked_test.umap

BIN

Binary file not shown.

Content/Maps/Foliage.umap

BIN

Binary file not shown.

Content/Maps/Interiors/Bake/F1.umap

BIN

Binary file not shown.

Content/Maps/Interiors/Bake/Volumetric2.umap

BIN

Binary file not shown.

Content/Maps/Interiors/K1_S1/Furniture/K1_S1_furniture.umap

BIN

Binary file not shown.

Content/Maps/Interiors/K1_S1/Furniture/K1_S1_furniturebuild.umap

BIN

Binary file not shown.

Content/Maps/Interiors/K1_S1/K1_S1_F2.umap

BIN

Binary file not shown.

Content/Maps/Interiors/K1_S2/Furniture/K1_S2_Furniture.umap

BIN

Binary file not shown.

Content/Maps/Interiors/K1_S2/Furniture/K1_S2_Furniturebuild.umap

BIN

Binary file not shown.

Content/Maps/Interiors/K1_S2/K1_S2_F2.umap

BIN

Binary file not shown.

Content/Maps/Interiors/K1_S2/K1_S2_F3.umap

BIN

Binary file not shown.

Content/Maps/Interiors/K1_S2/K1_S2_F4.umap

BIN

Binary file not shown.

Content/Maps/Interiors/K1_S3/Furniture/K1_S3_Furniture.umap

BIN

Binary file not shown.

Content/Maps/Interiors/K1_S3/Furniture/K1_S3_Furniturebuild.umap

BIN

Binary file not shown.

Content/Maps/Interiors/K1_S3/K1_S3_F2.umap

BIN

Binary file not shown.

Content/Maps/Interiors/K1_S3/K1_S3_F3.umap

BIN

Binary file not shown.

Content/Maps/MAF_Yard.umap

BIN

Binary file not shown.

Content/Maps/MainScene.umap

BIN

Binary file not shown.

Content/Maps/NightLight.umap

BIN

Binary file not shown.

Content/Maps/Yard.umap

BIN

Binary file not shown.

Content/Maps/commercial.umap

BIN

Binary file not shown.

Content/Materials/Decals/CarAO/M_carAOdecal.uasset

BIN

Binary file not shown.

Content/Materials/Decals/CarAO/M_carAOdecal_1.uasset

BIN

Binary file not shown.

Content/Materials/Decals/CarAO/M_carAOdecal_2.uasset

BIN

Binary file not shown.

Content/Materials/Decals/CarAO/id0.uasset

BIN

Binary file not shown.

Content/Materials/Decals/CarAO/id1.uasset

BIN

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More