OldBlueWater/BlueWater
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
..
Assets Merge branch 'main' of 121.165.94.242:capers/bluewater into NTG 2024-01-14 17:06:38 +09:00
Packages art02 2024-01-11 20:26:21 +09:00
ProjectSettings Merge branch 'main' of 121.165.94.242:capers/bluewater into NTG 2024-01-14 17:06:38 +09:00
mono_crash.0.0.json Closed #30 Enemy targeting and fire to canon 2023-09-12 14:37:15 +09:00
mono_crash.0.1.json Closed #33 Inship Basic Environment and #36 Start Ai 2023-10-12 10:09:31 +09:00
mono_crash.0.2.json #37 Npc Idle Action, Order Action Dialogue System 2023-10-18 11:36:56 +09:00
mono_crash.26c0b0da72.0.json #37 Npc Conversation, order action 2023-10-23 12:12:13 +09:00