add debugging
Merge branch 'master' of https://github.com/highfidelity/hifi into animationFrameIndex
clamp frame index between 0 and 100,000
Hydra hands deactivate when placed back on controller base, removed measuring non-movement for inactivity
Merge pull request #4005 from ZappoMan/gpuStreamizing

Work on removing immediate mode GL_QUADS
Update to ignore mouseRelease events if mousePress event handles by tool
Add getters/setters to Grid
Add grid colors to Grid
Rename minorGridSpacing to minorGridWidth
Update grid tool to be an overlay
Remove gridControls.html
Remove unused function
Merge pull request #4015 from PhilipRosedale/master

Hydra hands deactivate when placed back on controller base
Merge pull request #4014 from ZappoMan/animationFrameIndex

Fix stuttering in animation caused when animation plays too long without lastFrame set
Remove duplicate minorGridWidth variable
Merge pull request #4016 from huffman/grid-tools-overlay

Grid tools overlay
Scale back on first dropped packet, use Qt send/receive buffer size options
rather than setsockopt/getsockopt.
Merge branch 'master' of https://github.com/highfidelity/hifi
Fix overflow warning.
Update grid colors