Andrew Meadows d2bd95703a use degrees/sec for EntityItem angular velocity		2015-01-07 14:04:22 -08:00
..
animation	clamp frame index between 0 and 100,000	2014-12-29 21:07:04 -08:00
audio	resolve conflicts on merge, add cstring inc	2015-01-05 09:25:30 -08:00
avatars	resolve conflicts on merge with upstream master	2015-01-05 14:40:48 -08:00
embedded-webserver	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
entities	fix typo	2015-01-07 12:48:16 -08:00
entities-renderer	Merge branch 'master' of https://github.com/highfidelity/hifi into tot	2015-01-05 13:23:14 -08:00
environment	more voxel-ectomy cleaning up some remaining references to voxels	2015-01-06 09:27:48 -08:00
fbx	more voxelEctomy	2014-12-30 19:58:04 -08:00
gpu	fixed pointers which were using 0 instead of NULL and syntax in resource.h	2014-12-22 11:20:04 -08:00
metavoxels	Scale back on first dropped packet, use Qt send/receive buffer size options	2014-12-30 12:30:38 -08:00
model	FIx typos	2014-12-22 15:44:46 -08:00
networking	Merge pull request #4050 from birarda/lasagna-not-spaghetti	2015-01-06 16:29:52 -08:00
octree	Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy	2014-12-31 10:50:53 -08:00
physics	use degrees/sec for EntityItem angular velocity	2015-01-07 14:04:22 -08:00
render-utils	removed renderTriangleProxies	2015-01-06 16:01:06 -08:00
script-engine	resolve conflicts on merge with upstream master	2015-01-05 14:40:48 -08:00
shared	resolve conflicts on merge with upstream master	2015-01-05 14:40:48 -08:00