new animation
Support for multiple environments, collisions with notional planet surfaces.
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Fix for default environment, better capsule placement.
Merge branch 'master' of https://github.com/worklist/hifi
Added back "floor," "bounce."
Reverted change that would have added glm to shared library.
Since we're not using deltaTime (yet), don't pass it as a parameter (yet).
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
fix crashing on deleting voxels in server and client
fix whitespace
fix CS issues
fix CS issues
fix CR issues
fix CR issues
fix coding standard issues
fix coding standard issues
fix coding standard issues