adding the light map support from FBX
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
Update edit entities moveUp arrow position
First version of the lighmap working
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
adding the shader files for the lightmap case
adjust lighmap shading equation
clean out comments so the 2 rendering modes for entities work, scene batch or per model batch
remove spatial audio menu items
add a emissive parameter value to the lightmap shaders
Fixed syntax issues and review critics, put all the debugging code in a #define block
More typos in glsl
Merge pull request #3859 from samcake/tot

support texture transform and lightmap
Display "--" for ping values if not yet valid
Use valid font for Windows so that '-'s are displayed
more correct entity list maintenance
add lifetime to gun bullets
Adjust size of stretch overlays to be smaller
Add drawInFront property to Base3DOverlay
EntityItem::setSimulationState() now public