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: 06102c4709669bc43971949da782722c
timeCreated: 1477614498
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: fd115c284f2f6bc478417069ddfd6e45
timeCreated: 1477614659
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 89bdbcc31067b764dbb3c9903f340b9a
timeCreated: 1477614668
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: d0cc507645df953449f38a438549ed07
folderAsset: yes
timeCreated: 1478222467
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 41837885083aa994daaa5dc8a58eaa27
timeCreated: 1478222668
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 453989064e52b4d4c8555aa637a59b2b
timeCreated: 1478222669
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: e738b364eb77f9d4d825b0ea03e69145
timeCreated: 1478222467
licenseType: Free
NativeFormatImporter:
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