Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA

Browse Source

# Conflicts:
#	Content/Level/Index.umap
#	Content/Materials/M_Grass.uasset

...

This commit is contained in:

Lenta_Mebiusa

2019-11-20 18:32:35 +05:00

parent fda9d8a7cf 35bb800496

commit f671e475d3

41 changed files with 3 additions and 1 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/Blueprints/Player/VR/BP_MotionController.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/VR/Ipad.uasset

BIN

Binary file not shown.

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

BIN

Binary file not shown.

Content/Blueprints/Player/VR/Materials/Ipad/Body_Diffuse_1.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/VR/Materials/Ipad/Body_Diffuse_2.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/VR/Materials/Ipad/Button.uasset

BIN

Binary file not shown.

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

BIN

Binary file not shown.

Content/Blueprints/Player/VR/Materials/Ipad/M_Ipad.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/VR/Materials/Ipad/M_Ipad_Btn.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/VR/Materials/Ipad/M_Ipad_Front.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/VR/Materials/Ipad/M_Ipad_Screen.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/VR/Materials/Ipad/M_Ipad_back.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/VR/Materials/Ipad/Screen_Diffuse.uasset

BIN

Binary file not shown.

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

BIN

Binary file not shown.

Content/Blueprints/Player/VR/Materials/NewController/ControllerGhost.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/VR/Materials/NewController/MI_NewController_left.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/VR/Materials/NewController/M_NewController.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/VR/Materials/NewController/left_diff.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/VR/Materials/NewController/left_spec.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/VR/Materials/NewController/oculus_rifts_controller_left.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/VR/Materials/NewController/oculus_rifts_controller_right.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/VR/Materials/NewController/right_diff.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/VR/Materials/NewController/right_spec.uasset

BIN

Binary file not shown.

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

BIN

Binary file not shown.

Content/Blueprints/Player/VR/MotionControllerPawn.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/123.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/456.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Materials/WidgetMat_Inst.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Wbps/Ipad/IpadBtn.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Wbps/Ipad/IpadPoint.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Wbps/Ipad/IpadScreen.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Wbps/Ipad/IpadSelections.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/Wbps/Stoika.uasset

BIN

Binary file not shown.

Content/Level/fuck.umap

BIN

Binary file not shown.

Content/Materials/M_Grass.uasset

BIN

Binary file not shown.

Content/Materials/PhysGrass.uasset

BIN

Binary file not shown.

Content/Splash/EdSplash.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 47 KiB

Content/Splash/Icon.ico

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 87 KiB

Content/Splash/Splash.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 54 KiB