test
Merge remote-tracking branch 'upstream/master'
improving lookat behavior
Merge remote-tracking branch 'upstream/master'
test
thingy
Merge remote-tracking branch 'upstream/master'
test
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
Refactor startup timing a little by getting the current time the moment the application enters its main function, then passing that to Application's constructor.  Also fix the titlebar bug by setting the title bar at the end of initializeGL() instead of at the end of the first frame (which would actually further the inaccuracy of the startup time).
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).
more prototyping of head feature geometry
Merge remote-tracking branch 'upstream/master'