fixes to slow-down at jump startup and infinite air intertia growth
A* misses 1st closest node fix
Merge remote-tracking branch 'upstream/master'
AiPursue infinite package updating bug resolved
Feature 1314: make npc fight creatures
merge master, resolve conflicts
travis compile fix
travis fix #2
travis fix #3 :(
Dialogue merging
Optimized dialogue merging with a lookup map
Fix some ancient code
actor handle and id confusing fix
Merge remote-tracking branch 'mrcheko/master'
Merge remote-tracking branch 'scrawl/master'