Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts: # Assets/04_Models/Festival/Canopy/swing-sofa/shaded 1.png.meta # Assets/04_Models/Festival/Canopy/swing-sofa/texture_diffuse 1.png.meta # Assets/04_Models/Festival/Canopy/swing-sofa/texture_metallic 1.png.meta # Assets/04_Models/Festival/Canopy/swing-sofa/texture_normal 1.png.meta # Assets/04_Models/Festival/Canopy/swing-sofa/texture_roughness 1.png.meta # Assets/XR/Settings/OpenXR Package Settings.asset
This commit is contained in:
Binary file not shown.
Reference in New Issue
Block a user