Merge branch 'main' into dev

Browse Source

...

This commit is contained in:

Philip W 2023-11-20 19:29:58 +00:00

parent 065984e21b 38b8de140d

commit a450f68d7c

77 changed files with 212 additions and 38 deletions

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

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

BIN

Assets/Bathroom/SM_Toilet.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Modular_pieces/SM_Doorway.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Modular_pieces/SM_Floor.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Modular_pieces/SM_Floor_Small.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Modular_pieces/SM_Pillar_1.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Modular_pieces/SM_Pillar_2.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Modular_pieces/SM_Wall.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Modular_pieces/SM_Wall_Short.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Modular_pieces/SM_stairs.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Modular_pieces/WallsFloors_maya.mb (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/living room/cabinet_01.fbx (Stored with Git LFS)

View File

Binary file not shown.

BIN

Assets/living room/carpet_01.fbx (Stored with Git LFS)

View File

Binary file not shown.

BIN

Assets/living room/chair_01.fbx (Stored with Git LFS)

View File

Binary file not shown.

BIN

Assets/living room/coffee_table_01.fbx (Stored with Git LFS)

View File

Binary file not shown.

BIN

Assets/living room/fireplace_01.fbx (Stored with Git LFS)

View File

Binary file not shown.

BIN

Assets/living room/side_table_01.fbx (Stored with Git LFS)

View File

Binary file not shown.

BIN

Assets/living room/sofa_01.fbx (Stored with Git LFS)

View File

Binary file not shown.

BIN

Assets/living room/textures/coffee_table_01_Normal.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/living room/textures/coffee_table_01_OcclusionRoughnessMetallic.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/living room/textures/coffee_table_01_bl_BaseColor.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/living room/textures/coffee_table_01_or_BaseColor.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/living room/textures/coffee_table_01_re_BaseColor.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/living room/textures/coffee_table_01_ye_BaseColor.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/living room/textures/side_table_01_Normal.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/living room/textures/side_table_01_OcclusionRoughnessMetallic.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/living room/textures/side_table_01_bl_BaseColor.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/living room/textures/side_table_01_or_BaseColor.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/living room/textures/side_table_01_re_BaseColor.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/living room/textures/side_table_01_ye_BaseColor.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bed01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/BedroomTable01_low.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/MakeupStand.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Mirror.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed02.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_BedroomTable01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Draws01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_MakeupStand01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Mirror01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Shelves01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Stool01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_lavalamp.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/LavaLamp/lavalamp_low_LavaLamp_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/LavaLamp/lavalamp_low_LavaLamp_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/LavaLamp/lavalamp_low_LavaLamp_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Lavalamp.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Shelves01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Shelves01/Shelves_low_Shelves01_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Shelves01/Shelves_low_Shelves01_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Shelves01/Shelves_low_Shelves01_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_01_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_01_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_01_bl_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_01_or_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_01_re_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_01_ye_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_bl.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_or.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_re.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_ye.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_01_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_01_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_01_bl_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_01_or_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_01_re_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_01_ye_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_bl.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_or.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_re.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_ye.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/cabinet_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/carpet_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/chair_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/coffee_table_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fireplace_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/side_table_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sofa_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Levels/TrainingFacility.umap (Stored with Git LFS)

View File

Binary file not shown.