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
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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