Commit ddcf4c90 authored by Luke A Smith's avatar Luke A Smith
Browse files

Merge branch 'character' into 'master'

Character

Basic character functionality is in place.

See merge request !4
parents 236b90fc c0f97470
fileFormatVersion: 2
guid: 2db7b42c28f0d9041a3cde7edd02e518
timeCreated: 1475801918
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: ed5a94819a8e0d549afbec0dfddf7ebf
timeCreated: 1475802095
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 77f53e8beee59004491d566997b69ce1
timeCreated: 1475802383
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 62b4f2912b3967943920cc1660c1634b
timeCreated: 1475802353
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
......@@ -7,7 +7,7 @@ TextureImporter:
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
enableMipMap: 0
linearTexture: 0
correctGamma: 0
fadeOut: 0
......@@ -54,4 +54,4 @@ TextureImporter:
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
assetBundleVariant:
\ No newline at end of file
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