Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR_Diet
# Conflicts: # Assets/01_Scenes/Cave_Test_2/NavMesh-Cube (2).asset.meta # Assets/09_UI/talk/menu_panel_REAL_transparent_cropped.png.meta # Assets/09_UI/talk/pinocchio_title_banner_REAL_transparent_cropped.png.meta # Assets/09_UI/talk/wood_button_plain_REAL_transparent.png.meta # Assets/My project/Fishing Scripts/model/New Material.mat.meta # Assets/XR/Settings/OpenXR Package Settings.asset.meta # Assets/XR/Settings/OpenXRPackageSettings.asset
This commit is contained in:
BIN
Assets/09_UI/talk/menu_panel_REAL_transparent_cropped.png
LFS
Normal file
BIN
Assets/09_UI/talk/menu_panel_REAL_transparent_cropped.png
LFS
Normal file
Binary file not shown.
BIN
Assets/09_UI/talk/pinocchio_title_banner_REAL_transparent_cropped.png
LFS
Normal file
BIN
Assets/09_UI/talk/pinocchio_title_banner_REAL_transparent_cropped.png
LFS
Normal file
Binary file not shown.
BIN
Assets/09_UI/talk/wood_button_plain_REAL_transparent.png
LFS
Normal file
BIN
Assets/09_UI/talk/wood_button_plain_REAL_transparent.png
LFS
Normal file
Binary file not shown.
Reference in New Issue
Block a user