mappy f7dd43d4f4 Merge remote-tracking branch 'origin/main' ... # Conflicts: # BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc.meta # BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/0_Hair.meta # BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/1_FaceHair.meta # BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/2_Cloth.meta		2023-09-27 14:45:33 +09:00
..
Assets	Merge remote-tracking branch 'origin/main'	2023-09-27 14:45:33 +09:00
Packages	[Asset] PixelHeroes, SPUM	2023-09-26 15:24:34 +09:00
ProjectSettings	#19 Camera bug fixed	2023-09-24 13:51:27 +09:00
mono_crash.0.0.json	Closed #30 Enemy targeting and fire to canon	2023-09-12 14:37:15 +09:00