Merge branch 'develop' into develop_aabb
Tested HMap class, started implementing CollisionModel system
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!
Merging develop's shooting particles into here
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
shove
Fixed collision, got it out of physics engine
Merge branch 'develop' into develop_shooter2
Swap Trigger and B. Pitch directed attacks.
Merge branch 'develop_shooter2' into develop