23087 commits

Author	SHA1	Message	Date
Stephen Birarda	4042e04946	add isDownstream for cleaner conditionals	2017-06-12 16:29:20 -07:00
Stephen Birarda	88af8b5842	use new downstream/upstream nomeclature	2017-06-12 16:29:20 -07:00
Stephen Birarda	fe668b1bb1	make codec negotiation stateless for replicated agents	2017-06-12 16:29:20 -07:00
Stephen Birarda	2929573cb0	do not punch to replicant nodes	2017-06-12 16:29:20 -07:00
Stephen Birarda	d5b466e3ae	fix replicant handling slot, add node strings for replicants	2017-06-12 16:29:20 -07:00
Ryan Huffman	a1d3c0dc7b	Fix initialization ordering error in Node	2017-06-12 15:27:24 -07:00
Ryan Huffman	eb2a417448	Add parent back to Node ctor	2017-06-12 15:24:14 -07:00
Ryan Huffman	3b3465ea05	Add isUpstream to Node	2017-06-12 14:59:45 -07:00
Ryan Huffman	4851d3b564	Remove superfluous node log	2017-06-12 14:52:02 -07:00
Ryan Huffman	3142842d5d	Fix Node initialization warnings	2017-06-12 14:51:08 -07:00
Ryan Huffman	84e1a6f893	Rename isReplicant to isReplicated	2017-06-12 13:38:58 -07:00
Ryan Huffman	2ff065f751	Add isReplicant to node list packet processing	2017-06-12 13:38:57 -07:00
Ryan Huffman	ff2800e8d5	Add isReplicant to Node	2017-06-12 13:37:49 -07:00
Atlante45	dc7c331d4c	Merge branch 'fix/node-leak' into replicants	2017-06-12 11:32:11 -07:00
Stephen Birarda	8ebf1db9a8	switch to replicator/replicant and add new node types	2017-06-12 10:58:34 -07:00
Atlante45	0b847488d7	Fix comment	2017-06-12 10:54:22 -07:00
Stephen Birarda	b5c26b596e	seek past source UUID in mirrored packets	2017-06-12 02:39:54 -07:00
Stephen Birarda	e629881665	mirror audio format negotiation	2017-06-12 02:18:27 -07:00
Stephen Birarda	45bb323723	experimental support for mirrored audio packets to other mixers	2017-06-12 00:19:24 -07:00
Chris Collins	4b6c13bc1f	Merge pull request #10646 from ZappoMan/debugAudioProblems ... Fix for no-audio on clean install	2017-06-10 11:32:42 -10:00
Seth Alves	eb049c8c6e	Merge pull request #10624 from misslivirose/feat/add-primitive-shapes ... Add additional primitive shapes	2017-06-09 19:02:54 -07:00
Brad Hefta-Gaub	6006fa0fe1	Merge pull request #10638 from samcake/hobbes ... Adjust the preview to avoid seeing the masked pixels in HMD mode	2017-06-09 15:38:33 -07:00
ZappoMan	6fe20f90a3	add better debugging for audio problems ... use OS default device if settings have no values	2017-06-09 13:36:12 -07:00
Liv	7785473ccb	moving else	2017-06-09 12:59:08 -07:00
Stephen Birarda	3582e5110e	Merge pull request #10644 from seefo/fb5005 ... Resolved FB5005	2017-06-09 11:55:45 -07:00
Liv	8c488d95d1	Stylish updates	2017-06-09 11:46:38 -07:00
seefo	06a5d0970c	Fixed issue with invalid time being sent when logging	2017-06-09 10:58:07 -07:00
Liv	1808505d8b	Coding standard fixes	2017-06-09 10:54:57 -07:00
Anthony Thibault	e3c342aa77	Merge pull request #10595 from hyperlogic/feature/spine-spline ... Spline IK target support	2017-06-08 18:09:55 -07:00
Seth Alves	485df396ef	Merge pull request #10628 from jherico/qt59 ... Fixes for Qt 5.9 compatibility	2017-06-08 16:51:08 -07:00
Seth Alves	73a88236a0	Merge pull request #10586 from ctrlaltdavid/21202 ... Relax hands to default position/rotation when controller tracking is lost	2017-06-08 16:38:08 -07:00
Anthony J. Thibault	8334dff610	compute rotation from derivative of spline ... This should fix bad rotation values for the spine during bowing/touching toes.	2017-06-08 15:00:12 -07:00
seefo	fce3badd1d	Resolved FB#5005	2017-06-08 11:57:44 -07:00
Liv	34bd2b8a2b	style fix	2017-06-08 09:01:01 -07:00
howard-stearns	fa74daf875	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-06-07 16:43:25 -07:00
samcake	1b45276de2	Adjust the preview to avoid seeing the masked pixels in HMD mode	2017-06-07 15:55:38 -07:00
Liv	c3bf915fd4	Changing loop to avoid unused warnings	2017-06-07 15:04:39 -07:00
Anthony J. Thibault	606c6415ae	Merge branch 'master' into feature/spine-spline	2017-06-07 10:53:46 -07:00
Seth Alves	b1c7c251ac	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-07 10:09:46 -07:00
Atlante45	7b10b8a6c3	Fix SharedNodePointer leak	2017-06-06 19:04:12 -07:00
Brad Hefta-Gaub	e5ac3eeea7	Merge pull request #10548 from NeetBhagat/21255 ... On Oculus Rift on/off, switch automatically to/from desktop mode	2017-06-06 18:05:56 -07:00
Bradley Austin Davis	b4bbf98fe3	Suppress TBB warnings	2017-06-06 15:02:16 -07:00
Bradley Austin Davis	fc6a278217	Fixing dangling thread issues, consolidating thread management	2017-06-06 15:02:16 -07:00
Brad Davis	171d3212fe	Merge pull request #10623 from jherico/qml_engine_singleton ... Migrate to single QML engine	2017-06-06 15:00:43 -07:00
Stephen Birarda	0ccd0d3fd6	Merge pull request #10621 from highfidelity/stable ... Merge Stable back into Master	2017-06-06 10:39:03 -07:00
NeetBhagat	c3621d7c32	Resolved two issues: ... 1) While in HMD mode -> open Tablet -> Click Desktop. Desktop mode will be on. 2) Menu sync problem while switching modes.	2017-06-06 22:31:14 +05:30
NeetBhagat	ae9a928740	Merge branch 'master' into 21255 ... # Conflicts: # interface/src/Application.cpp	2017-06-06 19:06:50 +05:30
David Rowe	5cb1918b80	Simplify code	2017-06-06 13:26:16 +12:00
Liv	5579c409e7	Style fix	2017-06-05 18:03:10 -07:00
Liv	42cb2332d5	Remove unimplemented comment on circle	2017-06-05 17:46:13 -07:00