3292 commits

Author	SHA1	Message	Date
Andrzej Kapolka	1bf19111dc	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-04-03 23:57:30 -07:00
Andrzej Kapolka	dfaa98cc34	Blend when setting.	2014-04-03 23:51:49 -07:00
Andrzej Kapolka	d706e23012	Basic voxelization.	2014-04-03 23:47:31 -07:00
Atlante45	d15e12da77	Changed FstReader categories to place models in the right dirs	2014-04-03 12:25:50 -07:00
Andrzej Kapolka	22710af111	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels ... Conflicts: interface/interface_en.ts	2014-04-03 11:37:27 -07:00
Atlante45	5acc8313ba	Manual merge	2014-04-02 18:07:55 -07:00
Andrew Meadows	715f2c53d5	merge upstream/master into avatar-interaction ... Conflicts: interface/interface_en.ts	2014-04-02 17:28:22 -07:00
Andrzej Kapolka	3a44a846ed	More set/blend bits.	2014-04-02 15:48:53 -07:00
Andrzej Kapolka	40844d2000	Working on ability to set a region of the metavoxel data directly.	2014-04-02 12:40:01 -07:00
Andrew Meadows	97ba5250a5	Only simulate() Avatar Models when necessary ... Also: rebuild collision shapes when Model scale changes	2014-04-02 12:01:18 -07:00
Atlante45	b73598ae8a	Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata	2014-04-02 11:40:41 -07:00
Atlante45	bdd5c291b0	Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata	2014-04-01 12:03:45 -07:00
Atlante45	03958f2fa0	work on metadata in the model browser + real time updates	2014-04-01 12:02:47 -07:00
Andrzej Kapolka	afb5711879	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-04-01 10:40:38 -07:00
Andrzej Kapolka	5aa9b981be	Hopefully, a fix for the Windows build.	2014-03-31 18:43:38 -07:00
Andrzej Kapolka	929f08dec2	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-03-31 18:22:43 -07:00
Andrzej Kapolka	005ae79928	Various fixes and what-not, got the basic spanner clipping working.	2014-03-31 18:21:28 -07:00
Atlante45	77f5a50738	Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_fixes	2014-03-31 17:19:45 -07:00
Atlante45	f027aac76b	Fix to model upload in account manager	2014-03-31 17:19:04 -07:00
Stephen Birarda	135d97d0a7	add a pretty important missing line for symmetric socket activation	2014-03-31 15:59:54 -07:00
Andrzej Kapolka	10588cff9f	"Clear spanners" clears the voxelized attributes, too.	2014-03-30 15:51:39 -07:00
Andrzej Kapolka	40b1d2f284	Fix for voxelization on removal.	2014-03-29 22:39:49 -07:00
Andrzej Kapolka	7580951b92	More progress on voxelizing spanners.	2014-03-28 20:19:28 -07:00
Andrzej Kapolka	176d8f746e	Finally at the point of actually getting spanners to turn into voxels.	2014-03-28 15:19:40 -07:00
Stephen Birarda	61711c7aaa	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-03-28 13:30:06 -07:00
Andrzej Kapolka	cba57f20dd	Working on spanner attributes.	2014-03-28 11:38:02 -07:00
Andrzej Kapolka	cc5ea2a465	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-03-28 11:19:58 -07:00
Andrzej Kapolka	fd5f378e1c	Better color/normal merging.	2014-03-28 11:16:55 -07:00
Stephen Birarda	eb35b63651	use a shared pointer for more elegant cleanup at assignment conclusion	2014-03-28 10:48:44 -07:00
Stephen Birarda	3c8aa90ae0	Merge pull request #2559 from AndrewMeadows/avatar-interaction-2 ... split lean input from lean perturbations	2014-03-28 09:25:36 -07:00
Stephen Birarda	be5888e692	Merge pull request #2549 from AndrewMeadows/avatar-interaction ... name changes to get rid of "tweaked" angles in Head code	2014-03-28 09:19:45 -07:00
Stephen Birarda	7b840f760c	Merge pull request #2538 from AndrewMeadows/enforce-standard ... making some type casts abide by coding standard	2014-03-28 09:19:16 -07:00
Stephen Birarda	8b1b2d8d99	send a symmetric ping packet if appropriate when pinging nodes	2014-03-28 09:11:20 -07:00
Stephen Birarda	f80b415497	handle activation and setting of symmetric socket	2014-03-28 09:07:30 -07:00
Stephen Birarda	18a293c020	add a symmetric socket to the Node class	2014-03-28 08:58:49 -07:00
Stephen Birarda	1c47b8a3e1	Revert "hack the NodeList to take the socket on which pinged as active socket" ... This reverts commit 5c7ac6d3a1.	2014-03-27 21:29:01 -07:00
Stephen Birarda	5c7ac6d3a1	hack the NodeList to take the socket on which pinged as active socket	2014-03-27 17:41:55 -07:00
Andrzej Kapolka	d3fe6f21ef	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-03-27 17:03:24 -07:00
Andrew Meadows	796d20168e	splitting lean input from lean perturbations	2014-03-27 15:30:30 -07:00
ZappoMan	bda96ef935	added back use of nodeWithUUID() instead of sharedpointer	2014-03-27 13:35:22 -07:00
Atlante45	d9c48d63fe	Made _zipDir a children of _dataMultiPart so it gets deleted at the right time.	2014-03-27 11:18:32 -07:00
Atlante45	88e7b8e68f	Fixed "memory leak" in Account Manager.	2014-03-27 11:16:52 -07:00
Andrew Meadows	7949be0319	PitchTweak and friends become DeltaPitch	2014-03-27 11:14:26 -07:00
Andrew Meadows	c383b69b61	merge upstream/master into enforce-standard ... Conflicts: interface/src/avatar/Hand.cpp	2014-03-27 10:53:54 -07:00
Andrew Meadows	b6f2150d2e	HeadData::_yaw and friends change to _baseYaw	2014-03-27 10:37:07 -07:00
Atlante45	11f40258b3	Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_fixes	2014-03-27 10:12:34 -07:00
ZappoMan	55b9dd1aee	remove non-locking version of nodeWithUUID()	2014-03-27 02:32:19 -07:00
ZappoMan	c6c4b58699	adds reset of octree element population statistics	2014-03-27 02:31:39 -07:00
Philip Rosedale	56492e3ac8	Merge pull request #2536 from ey6es/master ... Provide a simple means of tracking download progress, increase speed at which we adjust avatar LOD.	2014-03-26 23:23:27 -07:00
Andrzej Kapolka	f339a3c0d7	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-03-26 18:30:23 -07:00