Merge pull request #1 from gintsmurans/master

Collision fix
Cocos 3.1 support and warning fix