Some work on Item Catalog
Finished putting in swords
Adding Lances
Adding Axes to item catalog
Adding type to weapons for future weapon triangle bonuses
Merge remote-tracking branch 'upstream/master'
Changing type to affinity of weapon, adding type for determining equip/usable items
Merge pull request #21 from mk200789/master

added a working progress of switch camera focus between pointer and acti...
Cleaned up camera toggle code.
Completed framework for non-collision-based enemy detection.
Updated records.
Merge remote-tracking branch 'upstream/master'
Adding fancy animation for assassin
Merge pull request #22 from DrkSephy/master

Added first fancy animation, adding more items for item catalogue
Hooked up battle animation overlay. Fixed some properties' scope. Added comments to properties.
Added units' data display (some placeholders) for battle animation screen.
Added health bars to battle animation screen.
Added terrain detection for battle animation screen.
Updated task tree. Minor renaming of state names in preparation for future updates to battle states.
Updated records.