Merge branch 'master' of https://cgvrgit.ulno.net/Tuwi/BlockCraft

Browse Source

# Conflicts:
#	Content/StarterContent/Maps/Minimal_Default_BuiltData.uasset
#	Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset
#	Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/7E/BEYC27T14FHBU6LF2F60RR.uasset
#	Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/8/3J/6B9RJI3FDPCETRKXUXCQ4C.uasset
#	Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/E/8O/GK06JAEJ82TQ0GA2QB0DJG.uasset

...

This commit is contained in:

JyrgensonRasmus

2023-04-29 15:51:15 +03:00

parent da87922117 fdfbd878ad

commit b7706a57cf

406 changed files with 102 additions and 9 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

BIN

Content/Furniture/ground.uasset LFS Normal file

Binary file not shown.

BIN

Content/Furniture/plastic.uasset LFS Normal file

Binary file not shown.

BIN

Content/Furniture/switchbutton.uasset LFS Normal file

Binary file not shown.

BIN

Content/Furniture/switchbutton_Cube_PhysicsAsset.uasset LFS Normal file

Binary file not shown.

BIN

Content/Furniture/switchbutton_Cube_Skeleton.uasset LFS Normal file

Binary file not shown.

BIN

Content/Furniture/switchbutton_Plane_001_Skeleton.uasset LFS Normal file

Binary file not shown.

BIN

Content/Furniture/white.uasset LFS Normal file

Binary file not shown.