Compare commits

base: devPetus/G4VR:a75da346eeff175437857f1bf9816c9ba9ceff0b

Branches Tags

devPetus/G4VR:main devPetus/G4VR:haptics

...

compare: devPetus/G4VR:6138d750cf60621c7e8361fe749fba9a6b0fff9d

Branches Tags

devPetus/G4VR:main devPetus/G4VR:haptics

2 Commits

a75da346ee ... 6138d750cf

Author	SHA1	Message	Date
devPetus	6138d750cf	Merge branch 'main' of https://gitea.losvernos.com/devPetus/G4VR	2025-10-09 17:07:27 +02:00
devPetus	64eddd61d8	Tourmaline Env Recreated	2025-10-09 17:07:11 +02:00

322 changed files with 895 additions and 76 deletions

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

Expand all files Collapse all files

Config/DefaultEditor.ini

+6

File diff suppressed because one or more lines are too long

Content/Characters/Mannequins/Materials/Functions/CA_Mannequin.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Materials/Functions/ChromaticCurve.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Materials/Functions/MF_Diffraction.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Materials/Functions/MF_logo3layers.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Materials/Functions/ML_BaseColorFallOff.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Materials/Instances/Manny/MI_Manny_01.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Materials/Instances/Manny/MI_Manny_02.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Materials/Instances/Quinn/MI_Quinn_01.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Materials/Instances/Quinn/MI_Quinn_02.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Materials/M_Mannequin.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Meshes/SKM_Manny.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Meshes/SKM_Manny_Simple.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Meshes/SKM_Quinn.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Meshes/SKM_Quinn_Simple.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Manny/T_Manny_01_ASAOPMASK_MSK.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Manny/T_Manny_01_BN.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Manny/T_Manny_01_CCRCCPlastic_MSK.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Manny/T_Manny_01_D.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Manny/T_Manny_01_MSR_MSK.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Manny/T_Manny_01_N.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Manny/T_Manny_01_Tan.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Manny/T_Manny_02_ASAOPMASK_MSK.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Manny/T_Manny_02_BN.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Manny/T_Manny_02_CCRCCPlastic_MSK.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Manny/T_Manny_02_D.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Manny/T_Manny_02_MSR_MSK.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Manny/T_Manny_02_N.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Manny/T_Manny_02_Tan.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_01ID_BN.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_01ID_D.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_01ID_MSR_MSK.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_01ID_N.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_01ID_Tan.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_01_ASAOMASK_MSK.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_01_CCRCCPlastic_MSK.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_02ID_BN.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_02ID_D.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_02ID_MSR_MSK.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_02ID_N.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_02ID_Tan.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_02_ASAOMASK_MSK.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Quinn/T_Quinn_02_CCRCCPlastic_MSK.uasset

LFS

BIN

Binary file not shown.

Content/Characters/Mannequins/Textures/Shared/T_UE_Logo_M.uasset

LFS

BIN

Binary file not shown.

Content/Env/Crystals/crystalBud.uasset

LFS

BIN

Binary file not shown.

Content/Env/Crystals/crystalPatch.uasset

LFS

BIN

Binary file not shown.

Content/Env/Rocks/Rock_M.uasset

LFS

BIN

Binary file not shown.

Content/Env/Rocks/SpirePlateau.uasset

LFS

BIN

Binary file not shown.

Content/Env/Rocks/Top.uasset

LFS

BIN

Binary file not shown.

Content/Env/Rocks/boulders/BoulderMat.uasset

LFS

BIN

Binary file not shown.

Content/Env/Rocks/boulders/SpirePlateau.uasset

LFS

BIN

Binary file not shown.

Content/Env/Rocks/boulders/Top.uasset

LFS

BIN

Binary file not shown.

Content/Env/Rocks/boulders/boulder.uasset

LFS

BIN

Binary file not shown.

Content/Env/Rocks/boulders/boulder2.uasset

LFS

BIN

Binary file not shown.

Content/Env/Rocks/boulders/boulder3.uasset

LFS

BIN

Binary file not shown.

Content/Env/Rocks/boulders/boulder_DefaultMaterial_BaseColor.uasset

LFS

BIN

Binary file not shown.

Content/Env/Rocks/boulders/boulder_DefaultMaterial_Normal.uasset

LFS

BIN

Binary file not shown.

Content/Env/Rocks/boulders/boulder_DefaultMaterial_OcclusionRoughnessMetallic.uasset

LFS

BIN

Binary file not shown.

Content/Env/Rocks/boulders/rock1.uasset

LFS

BIN

Binary file not shown.

Content/Env/Rocks/boulders/rock2.uasset

LFS

BIN

Binary file not shown.

Content/Env/Rocks/boulders/rock3.uasset

LFS

BIN

Binary file not shown.

Content/Env/Rocks/boulders/spire.uasset

LFS

BIN

Binary file not shown.

Content/Env/Rocks/rock1.uasset

LFS

BIN

Binary file not shown.

Content/Env/Rocks/rock2.uasset

LFS

BIN

Binary file not shown.

Content/Env/Rocks/rock3.uasset

LFS

BIN

Binary file not shown.

Content/Env/Rocks/spire.uasset

LFS

BIN

Binary file not shown.

Content/Env/SurfaceMat/Grass/grass_ambientocclusion.uasset

LFS

BIN

Binary file not shown.

Content/Env/SurfaceMat/Grass/grass_basecolor.uasset

LFS

BIN

Binary file not shown.

Content/Env/SurfaceMat/Grass/grass_height.uasset

LFS

BIN

Binary file not shown.

Content/Env/SurfaceMat/Grass/grass_metallic.uasset

LFS

BIN

Binary file not shown.

Content/Env/SurfaceMat/Grass/grass_normal.uasset

LFS

BIN

Binary file not shown.

Content/Env/SurfaceMat/Grass/grass_roughness.uasset

LFS

BIN

Binary file not shown.

Content/Env/SurfaceMat/Rock/Mortar_Gen_ambientocclusion.uasset

LFS

BIN

Binary file not shown.

Content/Env/SurfaceMat/Rock/Mortar_Gen_basecolor.uasset

LFS

BIN

Binary file not shown.

Content/Env/SurfaceMat/Rock/Mortar_Gen_height.uasset

LFS

BIN

Binary file not shown.

Content/Env/SurfaceMat/Rock/Mortar_Gen_metallic.uasset

LFS

BIN

Binary file not shown.

Content/Env/SurfaceMat/Rock/Mortar_Gen_normal.uasset

LFS

BIN

Binary file not shown.

Content/Env/SurfaceMat/Rock/Mortar_Gen_roughness.uasset

LFS

BIN

Binary file not shown.

Content/Env/vegetation/Branch.uasset

LFS

BIN

Binary file not shown.

Content/Env/vegetation/Branch_opacity.uasset

LFS

BIN

Binary file not shown.

Content/Env/vegetation/Cube.uasset

LFS

BIN

Binary file not shown.

Content/Env/vegetation/Fern.uasset

LFS

BIN

Binary file not shown.

Content/Env/vegetation/Fern_Inst.uasset

LFS

BIN

Binary file not shown.

Content/Env/vegetation/FoliageColorVar.uasset

LFS

BIN

Binary file not shown.

Content/Env/vegetation/Grass_Tuff_ambientocclusion.uasset

LFS

BIN

Binary file not shown.

Content/Env/vegetation/Grass_Tuff_basecolor.uasset

LFS

BIN

Binary file not shown.

Content/Env/vegetation/Grass_Tuff_normal.uasset

LFS

BIN

Binary file not shown.

Content/Env/vegetation/Grass_Tuff_opacity.uasset

LFS

BIN

Binary file not shown.

Content/Env/vegetation/Grass_Tuff_roughness.uasset

LFS

BIN

Binary file not shown.

Content/Env/vegetation/Main.uasset

LFS

BIN

Binary file not shown.

Content/Env/vegetation/Material.uasset

LFS

BIN

Binary file not shown.

Content/Env/vegetation/SM_MERGED_fern.uasset

LFS

BIN

Binary file not shown.

Content/Env/vegetation/SM_fern_merged.uasset

LFS

BIN

Binary file not shown.

Content/Env/vegetation/SM_grass_merged.uasset

LFS

BIN

Binary file not shown.

Content/Env/vegetation/SM_tree_merged.uasset

LFS

BIN

Binary file not shown.

Content/Env/vegetation/branch1.uasset

LFS

BIN

Binary file not shown.

Content/Env/vegetation/fern_bush_Fern_BaseColor.uasset

LFS

BIN

Binary file not shown.

Content/Env/vegetation/fern_bush_Fern_Normal.uasset

LFS

BIN

Binary file not shown.

Content/Env/vegetation/fern_bush_Fern_OcclusionRoughnessMetallic.uasset

LFS

BIN

Binary file not shown.

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