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
move gen_stars to the tools folder
Merge branch 'master' of github.com:worklist/hifi
Working on reorientation.
Merge branch 'master' of https://github.com/worklist/hifi
Merge pull request #383 from PhilipRosedale/master

Fix linux build, pair to own menu
Merge pull request #384 from PhilipRosedale/master

moved include stdint to header file
non-DRY fix for correct copy of resources for OS X bundle
Merge pull request #385 from birarda/master

non-DRY fix for resources copy on OS X
fix crashing on deleting voxels in server and client