iwnc2020/OldBlueWater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2004b7936f
OldBlueWater/BlueWater/Assets/Feel/FeelDemos
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
..
_Common #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
Barbarians Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-11-30 10:46:32 +09:00
Blob Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-11-30 10:46:32 +09:00
Bounce 맵 크기 변경 2023-11-29 15:13:25 +09:00
Brass 맵 크기 변경 2023-11-29 15:13:25 +09:00
CardsUI 맵 크기 변경 2023-11-29 15:13:25 +09:00
Duck #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
GettingStartedTutorial #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
Letters 맵 크기 변경 2023-11-29 15:13:25 +09:00
MMProgressBar 맵 크기 변경 2023-11-29 15:13:25 +09:00
MMSequencer #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
MMSoundManager #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
ParallaxUI #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
Snake #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
SquashAndStretch Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-11-30 10:46:32 +09:00
Tactical Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-11-30 10:46:32 +09:00
Templates 맵 크기 변경 2023-11-29 15:13:25 +09:00
Toaster 맵 크기 변경 2023-11-29 15:13:25 +09:00
Wheel 맵 크기 변경 2023-11-29 15:13:25 +09:00
_Common.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
Barbarians.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
Blob.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
Bounce.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
Brass.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
CardsUI.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
Duck.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
GettingStartedTutorial.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
Letters.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
MMProgressBar.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
MMSequencer.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
MMSoundManager.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
MoreMountains.Feel.Demos.asmref #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
MoreMountains.Feel.Demos.asmref.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
ParallaxUI.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
Snake.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
SquashAndStretch.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
Tactical.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
Templates.meta Closes #60 HitStop 2023-11-29 11:39:46 +09:00
Toaster.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00
Wheel.meta #13 AssaultMode Boat Prefabs, Card Ani Change 2023-08-09 16:47:55 +09:00