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
..
Ai	활살 타워 업데이트 SJ2씬 업로드	2023-09-26 13:55:28 +09:00
Characters	$43 FieldBoss01 테스트 작업	2023-11-28 22:45:40 +09:00
HpSliders	$43 FieldBoss01 테스트 작업	2023-11-28 22:45:40 +09:00
Particles	#30 Radar target ui timing and set active	2023-09-11 10:55:36 +09:00
Props	Closes #61 CameraShake, Class name change TimeManager -> VisualFeedbackManager	2023-11-30 10:45:24 +09:00
ShipPlayer	#45 Housing Object and new inship house	2023-11-13 15:48:15 +09:00
Skills	맵 크기 변경	2023-11-29 15:13:25 +09:00
Ui	BarkUI layer index change	2023-11-20 14:31:17 +09:00
Weapon	closed #40 죽었을 때, E키로 재시작 버튼	2023-10-24 11:22:07 +09:00
Ai.meta	#24 화살타워(ArrowTower) 만드는 중	2023-09-20 02:22:19 +09:00
Arrow_01.prefab	AI 첫번째 테스트 (테스트 아처 추가, 화살 속도 증가)	2023-09-18 16:32:38 +09:00
Arrow_01.prefab.meta	#7 Add NavMeshAgent and layer	2023-08-03 14:32:17 +09:00
Characters.meta	spum 캐릭터들 업데이트	2023-09-27 14:41:24 +09:00
HpSliders.meta	#34 #35 InIslandPlayer, Crewmate, Enemy 조정	2023-10-20 14:34:30 +09:00
MouseSpot.prefab	#13 Boat now make mouse spot and line renderer	2023-08-10 15:39:59 +09:00
MouseSpot.prefab.meta	#13 Boat now make mouse spot and line renderer	2023-08-10 15:39:59 +09:00
Particles.meta	Closed #21 Canon fire with E Key	2023-09-04 13:21:57 +09:00
Props.meta	#34 #35 InIslandPlayer, Crewmate, Enemy 조정	2023-10-20 14:34:30 +09:00
ShipPlayer.meta	#45 Housing Object and new inship house	2023-11-13 15:48:15 +09:00
Skills.meta	Spine 런타임 에셋 추가	2023-11-01 16:39:12 +09:00
Ui.meta	Close #19 Ship rocking 1st fix completed	2023-08-17 11:02:18 +09:00
Weapon.meta	#34 #35 상세 내용 아래에 기재	2023-10-12 15:32:02 +09:00