No reason to change that...
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
More debugging of the FBXReader in order to understand how to interpret the material fields
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
hack a separate emissive information in the g-buffer
hack a separate emissive information in the g-buffer
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
remove Entities developer menu items from C++ menu, make them available through script
fixing the bug when lighmaps are diasppearing in the <apartment>, i don;t understand why
Merge pull request #3873 from samcake/tot

Fix lighmaps for VC demo 12/1/2014
Fix Hydra cursors in VR display

They weren't being drawn at the correct location an so weren't matching
up with location of voxel being added or deleted, for example.
Merge pull request #3874 from ctrlaltdavid/fix-hydra-vr-cursors

Fix Hydra cursors in VR display
fixes the stutter in animation when observer moves
Merge pull request #3875 from PhilipRosedale/master

Auto-turn body when head yaw is beyond 45 degrees in HMD
Hack for avoiding lightmaps loading in starchamber
Merge pull request #3877 from samcake/fbx

Hack for avoiding lightmaps loading in starchamber
have the domain-server write its local port into shared memory
complete sharing of local domain-server port to local AC
Merge pull request #3876 from ZappoMan/bugFixes

fixes the stutter in animation when observer moves
Merge pull request #3878 from birarda/master

changes required for AC to discover a local DS