OldBlueWater/BlueWater/Assets/NWH
NTG 2cba165516 Merge branch 'main' of 121.165.94.242:capers/bluewater into NTG
# Conflicts:
#	BlueWater/Assets/01.Scenes/99.art_Tycoon.meta
#	BlueWater/Assets/01.Scenes/99.art_Tycoon.unity.meta
#	BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for SW2 Underwater Integration.unitypackage.meta
#	BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for URP.unitypackage.meta
#	BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Compass Navigator Pro Support.unitypackage.meta
#	BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Corgi Support.unitypackage.meta
2024-01-14 17:06:38 +09:00
..
Common #98 New Ocean Material and Wave System 2023-12-19 11:31:29 +09:00
Dynamic Water Physics 2 Merge branch 'main' of 121.165.94.242:capers/bluewater into NTG 2024-01-14 17:06:38 +09:00
Common.meta #98 New Ocean Material and Wave System 2023-12-19 11:31:29 +09:00
Dynamic Water Physics 2.meta #98 New Ocean Material and Wave System 2023-12-19 11:31:29 +09:00