ZappoMan 5a246fab26 Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel ... Conflicts: tests/octree/src/main.cpp		2014-06-17 17:45:06 -07:00
..
animation	put back ssize_t definition	2014-05-20 11:56:06 -07:00
audio	remove warnings about signed/unsigned comparison	2014-06-17 11:59:37 -07:00
avatars	remove old oculus yaw offset, expand limit on head yaw	2014-05-29 16:50:13 -07:00
embedded-webserver	handle serving of scripts at temp unique UUIDs	2014-05-23 12:33:39 -07:00
fbx	Simplification. If the normal is zero, then the cross product will also be	2014-06-09 11:03:50 -07:00
metavoxels	Fix for setID.	2014-06-13 12:12:17 -07:00
models	first cut at new optimized store model, not quite working yet	2014-06-17 09:15:53 -07:00
networking	Merge pull request #3031 from stojce/19755	2014-06-17 17:28:55 -07:00
octree	Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel	2014-06-17 17:45:06 -07:00
particles	cleanup names of findModels/findParticles in cube	2014-06-13 10:37:31 -07:00
script-engine	Fix invalid remote scripts being loaded	2014-06-17 13:09:48 -07:00
shared	Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel	2014-06-17 17:45:06 -07:00
voxels	try appendElementData() a different way	2014-06-10 10:43:50 -07:00