Merge branch 'develop' into develop_aabb
Tested HMap class, started implementing CollisionModel system
With the tentacle

Problem: the rotation of the tentacle is problematic
shovestash need to make BulletCObj and connect the two.
Implemented draft 1 of the heightmap collision code
Shooter fires cubes! Basic shooter cyborg separation complete!
Yay, single change!
Merging develop's shooting particles into here
Merge branch 'develop_ai' of https://github.com/haroniti/NinjaCoders125 into develop_ai
Performed first stage of moving to collision models: Moved AABBs to new system
Merged aabb
Merge branch 'develop' into develop_shooter
Fixed collision with negative dimmensions
Merge branch 'develop' into develop_ai
shove
slam proportions done

a little off the standard anglings, only problem is that when we slam at
an axis that's not +/-y the boxes aren't done correctly
Merge branch 'develop_ai' of https://github.com/haroniti/NinjaCoders125 into develop_ai
Fixed collision, got it out of physics engine
Merge branch 'develop' into develop_ai
streamlined, init position of slam set in config