Compare commits

base: devPetus:6138d750cf60621c7e8361fe749fba9a6b0fff9d

Branches Tags

devPetus:main

devPetus:haptics

..

compare: devPetus:a75da346eeff175437857f1bf9816c9ba9ceff0b

Branches Tags

devPetus:main

devPetus:haptics

No commits in common. "6138d750cf60621c7e8361fe749fba9a6b0fff9d" and "a75da346eeff175437857f1bf9816c9ba9ceff0b" have entirely different histories.

6138d750cf ... a75da346ee

322 changed files with 76 additions and 895 deletions

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

Show Stats Expand all files Collapse all files

6

Config/DefaultEditor.ini

File diff suppressed because one or more lines are too long

BIN

Content/Characters/Mannequins/Materials/Functions/CA_Mannequin.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Materials/Functions/ChromaticCurve.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Materials/Functions/MF_Diffraction.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Materials/Functions/MF_logo3layers.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Materials/Functions/ML_BaseColorFallOff.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Materials/Instances/Manny/MI_Manny_01.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Materials/Instances/Manny/MI_Manny_02.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Materials/Instances/Quinn/MI_Quinn_01.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Materials/Instances/Quinn/MI_Quinn_02.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Materials/M_Mannequin.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Meshes/SKM_Manny.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Meshes/SKM_Manny_Simple.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Meshes/SKM_Quinn.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Meshes/SKM_Quinn_Simple.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Manny/T_Manny_01_ASAOPMASK_MSK.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Manny/T_Manny_01_BN.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Manny/T_Manny_01_CCRCCPlastic_MSK.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Manny/T_Manny_01_D.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Manny/T_Manny_01_MSR_MSK.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Manny/T_Manny_01_N.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Manny/T_Manny_01_Tan.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Manny/T_Manny_02_ASAOPMASK_MSK.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Manny/T_Manny_02_BN.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Manny/T_Manny_02_CCRCCPlastic_MSK.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Manny/T_Manny_02_D.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Manny/T_Manny_02_MSR_MSK.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Manny/T_Manny_02_N.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Manny/T_Manny_02_Tan.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_01ID_BN.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_01ID_D.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_01ID_MSR_MSK.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_01ID_N.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_01ID_Tan.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_01_ASAOMASK_MSK.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_01_CCRCCPlastic_MSK.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_02ID_BN.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_02ID_D.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_02ID_MSR_MSK.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_02ID_N.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_02ID_Tan.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_02_ASAOMASK_MSK.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_02_CCRCCPlastic_MSK.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Characters/Mannequins/Textures/Shared/T_UE_Logo_M.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/Crystals/crystalBud.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/Crystals/crystalPatch.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/Rocks/Rock_M.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/Rocks/SpirePlateau.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/Rocks/Top.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/Rocks/boulders/BoulderMat.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/Rocks/boulders/SpirePlateau.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/Rocks/boulders/Top.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/Rocks/boulders/boulder.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/Rocks/boulders/boulder2.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/Rocks/boulders/boulder3.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/Rocks/boulders/boulder_DefaultMaterial_BaseColor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/Rocks/boulders/boulder_DefaultMaterial_Normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/Rocks/boulders/boulder_DefaultMaterial_OcclusionRoughnessMetallic.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/Rocks/boulders/rock1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/Rocks/boulders/rock2.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/Rocks/boulders/rock3.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/Rocks/boulders/spire.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/Rocks/rock1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/Rocks/rock2.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/Rocks/rock3.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/Rocks/spire.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/SurfaceMat/Grass/grass_ambientocclusion.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/SurfaceMat/Grass/grass_basecolor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/SurfaceMat/Grass/grass_height.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/SurfaceMat/Grass/grass_metallic.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/SurfaceMat/Grass/grass_normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/SurfaceMat/Grass/grass_roughness.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/SurfaceMat/Rock/Mortar_Gen_ambientocclusion.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/SurfaceMat/Rock/Mortar_Gen_basecolor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/SurfaceMat/Rock/Mortar_Gen_height.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/SurfaceMat/Rock/Mortar_Gen_metallic.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/SurfaceMat/Rock/Mortar_Gen_normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/SurfaceMat/Rock/Mortar_Gen_roughness.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/vegetation/Branch.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/vegetation/Branch_opacity.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/vegetation/Cube.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/vegetation/Fern.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/vegetation/Fern_Inst.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/vegetation/FoliageColorVar.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/vegetation/Grass_Tuff_ambientocclusion.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/vegetation/Grass_Tuff_basecolor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/vegetation/Grass_Tuff_normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/vegetation/Grass_Tuff_opacity.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/vegetation/Grass_Tuff_roughness.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/vegetation/Main.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/vegetation/Material.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/vegetation/SM_MERGED_fern.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/vegetation/SM_fern_merged.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/vegetation/SM_grass_merged.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/vegetation/SM_tree_merged.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/vegetation/branch1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/vegetation/fern_bush_Fern_BaseColor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/vegetation/fern_bush_Fern_Normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Env/vegetation/fern_bush_Fern_OcclusionRoughnessMetallic.uasset (Stored with Git LFS)

Binary file not shown.

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