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: 647a00acb440c0c4aa002d9f0ae2ffd5
guid: 7a81b522c3eaea24ca8fcc228b393f19
folderAsset: yes
timeCreated: 1475761198
timeCreated: 1479440498
licenseType: Free
DefaultImporter:
userData:
......
fileFormatVersion: 2
guid: 6d6525803f9c2de4e8233fc51322fdc5
guid: 3fd9c01e8800fc54681146f720a0d04b
folderAsset: yes
timeCreated: 1476403153
timeCreated: 1477008945
licenseType: Free
DefaultImporter:
userData:
......
fileFormatVersion: 2
guid: b3b2f4d882443b4479197c16a3a047f9
timeCreated: 1477616236
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 20fb6f28ca90a4a9492d76f7f0042220
timeCreated: 1478844848
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: afa3b25f0de7541cb9c01e694f6778e1
timeCreated: 1477008989
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 9e21addf110434c01b2af828e85594af
timeCreated: 1477612028
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 03f46e5f634d1cd46be9af0180ecd8b6
timeCreated: 1478831718
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
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