NTG_Lenovo 4ec33e70fe Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG ... # Conflicts: # BlueWater/Assets/Feel/FeelDemos/Barbarians/Materials/FeelBarbarianAttackParticleMaterial.mat # BlueWater/Assets/Feel/FeelDemos/Barbarians/Materials/FeelBarbarianDustMaterial.mat # BlueWater/Assets/Feel/FeelDemos/Barbarians/Materials/FeelBarbarianTopDownGroundRocks.mat # BlueWater/Assets/Feel/FeelDemos/Barbarians/Materials/FeelBarbarianTopDownMountains.mat # BlueWater/Assets/Feel/FeelDemos/Blob/Materials/FeelBlobEyes.mat # BlueWater/Assets/Feel/FeelDemos/Blob/Materials/FeelBlobPlastic.mat # BlueWater/Assets/Feel/FeelDemos/SquashAndStretch/Materials/FeelSquashAndStretchCarBodyRed.mat # BlueWater/Assets/Feel/FeelDemos/SquashAndStretch/Materials/FeelSquashAndStretchCarBodyYellow.mat # BlueWater/Assets/Feel/FeelDemos/SquashAndStretch/Materials/FeelSquashAndStretchCarWheels.mat # BlueWater/Assets/Feel/FeelDemos/SquashAndStretch/Materials/FeelSquashAndStretchCarWindows.mat # BlueWater/Assets/Feel/FeelDemos/SquashAndStretch/Materials/FeelSquashAndStretchChalet.mat # BlueWater/Assets/Feel/FeelDemos/SquashAndStretch/Materials/FeelSquashAndStretchGround.mat # BlueWater/Assets/Feel/FeelDemos/Tactical/Materials/FeelTacticalShirtMaterial.mat # BlueWater/Assets/Feel/MMTools/Tools/MMPrototypeTextures/MMBRP_Materials/MMBPR_BlueSquares.mat # BlueWater/Assets/Feel/MMTools/Tools/MMPrototypeTextures/MMBRP_Materials/MMBPR_DarkGreyCrosses.mat # BlueWater/Assets/Feel/MMTools/Tools/MMPrototypeTextures/MMBRP_Materials/MMBPR_DarkGreyDots.mat # BlueWater/Assets/Feel/MMTools/Tools/MMPrototypeTextures/MMBRP_Materials/MMBPR_GreenCrosses.mat # BlueWater/Assets/Feel/MMTools/Tools/MMPrototypeTextures/MMBRP_Materials/MMBPR_LightGreyDots.mat # BlueWater/Assets/Feel/MMTools/Tools/MMPrototypeTextures/MMBRP_Materials/MMBPR_RedSquares.mat # BlueWater/Assets/Feel/MMTools/Tools/MMPrototypeTextures/MMBRP_Materials/MMBPR_YellowCrosses.mat		2023-11-30 10:46:32 +09:00
..
Crewmate	Spine 런타임 에셋 추가	2023-11-01 16:39:12 +09:00
Enemy	맵 크기 변경	2023-11-29 15:13:25 +09:00
Npc	Closes #60 HitStop	2023-11-29 11:39:46 +09:00
Player	Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG	2023-11-30 10:46:32 +09:00
BaseCharacter.cs	Physics 변경 Crewmate <-> Crewmate	2023-10-20 15:17:52 +09:00
BaseCharacter.cs.meta	#34 Character 폴더 내부 정리	2023-09-27 14:30:06 +09:00
Crewmate.meta	#34 #35 상세 내용 아래에 기재	2023-10-12 15:32:02 +09:00
Enemy.meta	#34 Character 폴더 내부 정리	2023-09-27 14:30:06 +09:00
Npc.meta	#34 Character 폴더 내부 정리	2023-09-27 14:30:06 +09:00
Player.meta	#34 Character 폴더 내부 정리	2023-09-27 14:30:06 +09:00