Merge branch 'develop' into 'feature/story-Scenes'
# Conflicts: # Assets/_CompletedAssets/Scenes/Complete-GameSettings.lighting.meta
Showing
- Assets/Materials/Orbs.meta 8 additions, 0 deletionsAssets/Materials/Orbs.meta
- Assets/Materials/Orbs/GlowGreenCircleMat.mat 85 additions, 0 deletionsAssets/Materials/Orbs/GlowGreenCircleMat.mat
- Assets/Materials/Orbs/GlowGreenCircleMat.mat.meta 8 additions, 0 deletionsAssets/Materials/Orbs/GlowGreenCircleMat.mat.meta
- Assets/Materials/Orbs/GlowRedCircleMat.mat 85 additions, 0 deletionsAssets/Materials/Orbs/GlowRedCircleMat.mat
- Assets/Materials/Orbs/GlowRedCircleMat.mat.meta 8 additions, 0 deletionsAssets/Materials/Orbs/GlowRedCircleMat.mat.meta
- Assets/Materials/Orbs/GlowYellowCircleMat.mat 85 additions, 0 deletionsAssets/Materials/Orbs/GlowYellowCircleMat.mat
- Assets/Materials/Orbs/GlowYellowCircleMat.mat.meta 8 additions, 0 deletionsAssets/Materials/Orbs/GlowYellowCircleMat.mat.meta
- Assets/Materials/Orbs/Sphere 1.mat 82 additions, 0 deletionsAssets/Materials/Orbs/Sphere 1.mat
- Assets/Materials/Orbs/Sphere 1.mat.meta 8 additions, 0 deletionsAssets/Materials/Orbs/Sphere 1.mat.meta
- Assets/Materials/nc-Pink-Hollow-Ring.mat 69 additions, 0 deletionsAssets/Materials/nc-Pink-Hollow-Ring.mat
- Assets/Materials/nc-Pink-Hollow-Ring.mat.meta 8 additions, 0 deletionsAssets/Materials/nc-Pink-Hollow-Ring.mat.meta
- Assets/Textures/nc-Green-Hollow-Ring.png 0 additions, 0 deletionsAssets/Textures/nc-Green-Hollow-Ring.png
- Assets/Textures/nc-Green-Hollow-Ring.png.meta 135 additions, 0 deletionsAssets/Textures/nc-Green-Hollow-Ring.png.meta
- Assets/Textures/nc-Red-Hollow-Ring.png 0 additions, 0 deletionsAssets/Textures/nc-Red-Hollow-Ring.png
- Assets/Textures/nc-Red-Hollow-Ring.png.meta 135 additions, 0 deletionsAssets/Textures/nc-Red-Hollow-Ring.png.meta
- Assets/Textures/nc-Yellow-Hollow-Ring.png 0 additions, 0 deletionsAssets/Textures/nc-Yellow-Hollow-Ring.png
- Assets/Textures/nc-Yellow-Hollow-Ring.png.meta 135 additions, 0 deletionsAssets/Textures/nc-Yellow-Hollow-Ring.png.meta
- Assets/_CompletedAssets/Prefabs/Orbs.meta 8 additions, 0 deletionsAssets/_CompletedAssets/Prefabs/Orbs.meta
- Assets/_CompletedAssets/Prefabs/Orbs/DamageOrb.prefab 24193 additions, 0 deletionsAssets/_CompletedAssets/Prefabs/Orbs/DamageOrb.prefab
- Assets/_CompletedAssets/Prefabs/Orbs/DamageOrb.prefab.meta 7 additions, 0 deletionsAssets/_CompletedAssets/Prefabs/Orbs/DamageOrb.prefab.meta
Please register or sign in to comment