Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR

Browse Source

# Conflicts:
#	Assets/01_Scenes/WhaleAdventure_VR/Rooms/CatsRoom.unity

...

This commit is contained in:

dldydtn9755-crypto

2026-06-25 16:44:47 +09:00

parent 37d705d3c9 e522e8f74b

commit 246afce4c4

99 changed files with 4112 additions and 143 deletions

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

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

BIN

Assets/Stylized Water 3/_Demo/DemoAssets/Terrain/SW3 Demo Island.asset LFS

Binary file not shown.