Commit dc5f8507 authored by Andrew R Van Buren's avatar Andrew R Van Buren
Browse files

Merge branch 'character' into 'master'

Character

Added character updates (abilities, water boss, test maps).

See merge request !25
parents 99b88fd0 31a26346
fileFormatVersion: 2
guid: cc3560d8bda0e374b82d1a4d9d8e7edf
timeCreated: 1478828672
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: f2a6a58c27d02854da32daf5fe1d6c88
timeCreated: 1478834903
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 0
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: 0
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 16
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
......@@ -7,7 +7,7 @@ TextureImporter:
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
enableMipMap: 0
linearTexture: 0
correctGamma: 0
fadeOut: 0
......@@ -29,8 +29,8 @@ TextureImporter:
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
filterMode: 0
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0
......@@ -44,7 +44,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
spritePixelsToUnits: 16
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
......
fileFormatVersion: 2
guid: 388632b94537a27458747b2c855ad286
timeCreated: 1478834362
licenseType: Free
TextureImporter:
fileIDToRecycleName:
21300000: WaterBossSprite_0
21300002: WaterBossSprite_1
21300004: WaterBossSprite_2
21300006: WaterBossSprite_3
21300008: WaterBossSprite_4
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 0
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: 0
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 16
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites:
- name: WaterBossSprite_0
rect:
serializedVersion: 2
x: 0
y: 0
width: 32
height: 32
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline:
- - {x: -16, y: 16}
- {x: -16, y: -16}
- {x: 16, y: -16}
- {x: 16, y: 16}
- name: WaterBossSprite_1
rect:
serializedVersion: 2
x: 32
y: 0
width: 32
height: 32
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline:
- - {x: -9, y: 16}
- {x: -16, y: 12}
- {x: -16, y: -16}
- {x: 16, y: -16}
- {x: 16, y: 13}
- {x: 15, y: 16}
- name: WaterBossSprite_2
rect:
serializedVersion: 2
x: 64
y: 0
width: 32
height: 32
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline:
- - {x: -7, y: 16}
- {x: -16, y: 10}
- {x: -16, y: -15}
- {x: -15, y: -16}
- {x: 15, y: -16}
- {x: 16, y: -15}
- {x: 16, y: 7}
- {x: 14, y: 16}
- name: WaterBossSprite_3
rect:
serializedVersion: 2
x: 96
y: 0
width: 32
height: 32
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline:
- - {x: 16, y: 9}
- {x: 11, y: 16}
- {x: -6, y: 16}
- {x: -10, y: 15}
- {x: -16, y: 8}
- {x: -16, y: -16}
- {x: 16, y: -16}
- name: WaterBossSprite_4
rect:
serializedVersion: 2
x: 128
y: 0
width: 32
height: 32
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline:
- - {x: -8, y: 16}
- {x: -16, y: 13}
- {x: -16, y: -12}
- {x: -13, y: -16}
- {x: 16, y: -16}
- {x: 16, y: 16}
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: b5c8349c3dcc74544a2c657ffc029ae9
guid: 835a2f0e9729e6044ab3a96815d0362b
folderAsset: yes
timeCreated: 1475801899
licenseType: Free
......
fileFormatVersion: 2
guid: 682407675e213fe43b48bcc2b4884eee
guid: 4bdbd2a40eb2b844d9fd2d67b1991b65
folderAsset: yes
timeCreated: 1475802422
licenseType: Free
......
fileFormatVersion: 2
guid: e50eef1045910194994476ba6314412f
timeCreated: 1477614265
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 0ce8ffb2d8e4de94cbc70d88ef2c8e16
timeCreated: 1477614337
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 9d80102a95ce589448280b8cd0543acd
timeCreated: 1477614256
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: bf2ec6fc6fe538b4fb956b844a71b830
timeCreated: 1477614272
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 2db7b42c28f0d9041a3cde7edd02e518
timeCreated: 1475801918
timeCreated: 1479439923
licenseType: Free
NativeFormatImporter:
userData:
......
Markdown is supported
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