collision masks
Merge branch 'master' of https://github.com/derfailer/gamejamnovember14
controlpoint can give different things