Commit 945dc1c4 authored by mmaluschnig's avatar mmaluschnig
Browse files

Merge remote-tracking branch 'origin/master' into simonthebear

* origin/master:
  added textures
  Added Silas the mime to textures

# Conflicts:
#	RingMaster/RingMaster/Assets/Textures/Bear-1.png.meta
parents ed319fab ee4dbd06
fileFormatVersion: 2
guid: 0fbe3504ed5384b65ba4c0f6cd8dec8b
guid: 3ae1b490507d79e4ca407331d7098f81
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
......@@ -75,7 +75,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: b08f0e383aca047188d71970815f2520
spriteID: cb2e6e3bfe182764e8dff9966d425646
vertices: []
indices:
edges: []
......
fileFormatVersion: 2
guid: 5b1cdd571c6653d4d95e3e55c00f3601
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 7
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: fb7c70ac027e9874ba7cb38cd0481b66
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
m_EditorVersion: 2018.2.12f1
m_EditorVersion: 2018.2.17f1
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment