iwnc2020/OldBlueWater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
ef2f8032ec
OldBlueWater/BlueWater/Assets/Feel/FeelDemos/SquashAndStretch
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
..
Lighting #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
Materials Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-11-30 10:46:32 +09:00
PhysicsMaterials #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
PostProcessingProfile #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
Prefabs #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
Scripts #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelSquashAndStretch.unity #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
FeelSquashAndStretch.unity.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
Lighting.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
Materials.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
PhysicsMaterials.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
PostProcessingProfile.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
Prefabs.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
Scripts.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00