NTG_Lenovo
|
43cd84c48e
|
#78 대포(작살) 프로세스바 만드는 중
+ OceanCamera, OceanUi 추가
+ CameraManager, UiManager에 Ocean 데이터 추가
+ Scene 이름 변경 (02.Combet -> 02.Combat)
|
2023-12-13 16:14:31 +09:00 |
|
IDMhan
|
9ea7fcd4a8
|
#71 02.Ocean / Tycoon
|
2023-12-11 21:56:43 +09:00 |
|
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 |
|
IDMhan
|
286a4d0b3c
|
Closes #61 CameraShake, Class name change TimeManager -> VisualFeedbackManager
|
2023-11-30 10:45:24 +09:00 |
|
NTG_Lenovo
|
8069748e49
|
맵 크기 변경
+ 스킬 구조 변경
+ 공격시 히트스톱 추가
+ Lava 추가 중
|
2023-11-29 15:13:25 +09:00 |
|
IDMhan
|
6f1cbf4cd9
|
Closes #60 HitStop
|
2023-11-29 11:39:46 +09:00 |
|
IDMhan
|
a82255ee81
|
Closes #55 In Ship Camera Follow Offset revoke when end interaction
|
2023-11-21 04:48:10 +09:00 |
|
IDMhan
|
a15c9eb789
|
#37 OrderToPrisonState, RestorePreviousState and Light setting
|
2023-10-26 17:52:06 +09:00 |
|
IDMhan
|
4617e57d59
|
#37 Interaction and convarsation
|
2023-10-24 11:29:50 +09:00 |
|
IDMhan
|
79ec520c01
|
#37 CameraController now Manager with singleton
|
2023-10-23 12:32:29 +09:00 |
|