IDMhan
|
0ccf6532d7
|
[UNITY] unity version update 23.2.3f1
|
2024-01-03 15:34:33 +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 |
|
M1_IDMhan
|
b65931de1a
|
#13 AssaultMode Boat Prefabs, Card Ani Change
|
2023-08-09 16:47:55 +09:00 |
|