Adding devices for Glass, Android
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
add a base config for a pairing server
add a PariableDevice struct that will hold device info in vector
Most of the way towards basic Oculus support.
Slow down when near other avatars - incremental commit
Merge remote-tracking branch 'upstream/master'
Avatars are now slowed down when they get near other avatars, for easy fine positioning.
Merge remote-tracking branch 'upstream/master'
Changed idle simulate call to 16msecs (which will set avatar mixer rate at 60FPS), further small stats improvements
fixed LOD issue in client
added warnings if bitstream processing takes too long
search into level appropriately
debugging voxel sending behavior
added timing details to voxel sending behavior
lower warning threshold to 1 millisecond for voxel render pipeline steps
add command line option to debug voxel sending time
More work on Oculus integration; added some notes to explain the source of the
magic numbers.
Merge branch 'master' of https://github.com/worklist/hifi

Conflicts:
	interface/src/main.cpp