Atlante45 f84f6e9b66 Restore joints state on stopAnimation		2015-01-26 19:12:18 -08:00
..
animation	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 20:38:52 -08:00
audio	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 20:38:52 -08:00
avatars	Account for avatar scale in Hand(Data) get/set	2015-01-26 16:48:33 -08:00
embedded-webserver	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
entities	remove setting last simulated in setLastEdited() because it may cause problems	2015-01-23 15:54:26 -08:00
entities-renderer	remove lock at EntityTreeRenderer::loadEntityScript	2015-01-11 10:44:36 -08:00
environment	more voxel-ectomy cleaning up some remaining references to voxels	2015-01-06 09:27:48 -08:00
fbx	Merge pull request #4093 from samcake/temp0	2015-01-13 17:11:17 -08:00
gpu	No more Magic numbers and fixing the code path for linux	2015-01-16 10:26:51 -08:00
metavoxels	I believe this should fix some problems with flickering/crashing on edits:	2015-01-19 21:52:56 -08:00
model	FIx typos	2014-12-22 15:44:46 -08:00
networking	add last simulated to the protocal	2015-01-23 13:32:38 -08:00
octree	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 20:38:52 -08:00
physics	Merge branch 'master' of https://github.com/highfidelity/hifi into fixGlitches	2015-01-23 15:01:35 -08:00
render-utils	Restore joints state on stopAnimation	2015-01-26 19:12:18 -08:00
script-engine	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 20:38:52 -08:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2015-01-16 11:56:04 -08:00