iwnc2020/OldBlueWater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
ef2f8032ec
OldBlueWater/BlueWater/Assets/Feel/FeelDemos/Barbarians/Materials
History
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
..
FeelBarbarianAttack2ParticleMaterial.mat Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-11-30 10:46:32 +09:00
FeelBarbarianAttack2ParticleMaterial.mat.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelBarbarianAttackParticleMaterial.mat Closes #61 CameraShake, Class name change TimeManager -> VisualFeedbackManager 2023-11-30 10:45:24 +09:00
FeelBarbarianAttackParticleMaterial.mat.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelBarbarianBackgroundGrass.mat 맵 크기 변경 2023-11-29 15:13:25 +09:00
FeelBarbarianBackgroundGrass.mat.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelBarbarianBackgroundGroundRocks.mat 맵 크기 변경 2023-11-29 15:13:25 +09:00
FeelBarbarianBackgroundGroundRocks.mat.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelBarbarianBackgroundMountains.mat 맵 크기 변경 2023-11-29 15:13:25 +09:00
FeelBarbarianBackgroundMountains.mat.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelBarbarianBackgroundRock.mat 맵 크기 변경 2023-11-29 15:13:25 +09:00
FeelBarbarianBackgroundRock.mat.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelBarbarianBackgroundTreeLeaves.mat 맵 크기 변경 2023-11-29 15:13:25 +09:00
FeelBarbarianBackgroundTreeLeaves.mat.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelBarbarianBackgroundTreeWood.mat 맵 크기 변경 2023-11-29 15:13:25 +09:00
FeelBarbarianBackgroundTreeWood.mat.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelBarbarianBodyGreenMaterial.mat #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelBarbarianBodyGreenMaterial.mat.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelBarbarianBodyMaterial.mat #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelBarbarianBodyMaterial.mat.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelBarbarianDustMaterial.mat Closes #61 CameraShake, Class name change TimeManager -> VisualFeedbackManager 2023-11-30 10:45:24 +09:00
FeelBarbarianDustMaterial.mat.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelBarbarianEnemyHelmetMaterial.mat #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelBarbarianEnemyHelmetMaterial.mat.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelBarbarianEnemyHelmetRimMaterial.mat Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-11-30 10:46:32 +09:00
FeelBarbarianEnemyHelmetRimMaterial.mat.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelBarbariansSkybox.mat #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelBarbariansSkybox.mat.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelBarbarianTopDownGrass.mat Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-11-30 10:46:32 +09:00
FeelBarbarianTopDownGrass.mat.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelBarbarianTopDownGroundRocks.mat Closes #61 CameraShake, Class name change TimeManager -> VisualFeedbackManager 2023-11-30 10:45:24 +09:00
FeelBarbarianTopDownGroundRocks.mat.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelBarbarianTopDownLeaves.mat Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-11-30 10:46:32 +09:00
FeelBarbarianTopDownLeaves.mat.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelBarbarianTopDownMountains.mat Closes #61 CameraShake, Class name change TimeManager -> VisualFeedbackManager 2023-11-30 10:45:24 +09:00
FeelBarbarianTopDownMountains.mat.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelBarbarianTopDownRock.mat Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-11-30 10:46:32 +09:00
FeelBarbarianTopDownRock.mat.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelBarbarianTrail.mat 맵 크기 변경 2023-11-29 15:13:25 +09:00
FeelBarbarianTrail.mat.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00