overte/libraries
ZappoMan 2bcad6ab2b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
2014-08-28 21:19:56 -07:00
..
animation remove TARGET_NAME from cmake macros where it is not required 2014-08-08 13:17:54 -07:00
audio coding standard 2014-08-28 11:12:17 -07:00
avatars Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-28 21:19:56 -07:00
embedded-webserver remove TARGET_NAME from cmake macros where it is not required 2014-08-08 13:17:54 -07:00
entities fix the issue with moving entities not being simulated makes motion smoother 2014-08-28 16:44:52 -07:00
fbx use dispatchTable for shape-vs-shape collisions 2014-08-21 16:40:25 -07:00
metavoxels Support for scaling splat textures in S and T, use mipmaps for them. 2014-08-22 16:43:09 -07:00
networking Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-28 21:19:56 -07:00
octree correct cleanup of Models/geometry and all EntityItems for various cases 2014-08-27 15:45:45 -07:00
particles Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-18 15:16:35 -07:00
script-engine Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-28 21:19:56 -07:00
shared Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-28 21:19:56 -07:00
voxels Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-18 15:16:35 -07:00