Merge branch 'tot' of https://github.com/samcake/hifi into temp0
first pass at removing immediate mode GL_QUADS
more work on removing immediate mode GL_QUADS
more work on removing immediate mode GL_QUADS
Add the autoScribeShader cmake
fix typo
first version of SCribe used for shaders in render-utils
Merge branch 'temp0' of https://github.com/samcake/hifi into temp0
fix the c++ header generation for mac though the brand new raw string format of c++11
polishing the scribe -c++ case
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
almost completely eliminate immediate mode QUADS
replace the model.frag and model.vert files from resource by the sl version of the shaders
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
removing shaders from resource
clean cmake file for autoScribeShader
fixing the size of the name displayed on screen
Merge pull request #4012 from samcake/temp1

fixing the size of the name displayed on screen
Merge pull request #4006 from samcake/temp0

Adding the use of AutoScribeShaders to the build for the equivalent of model.frag and .vert
Hydra hands deactivate when placed back on controller base, removed measuring non-movement for inactivity