23335 commits

Author	SHA1	Message	Date
Zach Fox	1088d248e3	Howard's CR comments	2017-06-15 13:13:58 -07:00
Zach Fox	834a2a5c3b	Ensure monitor never shows frozen SpectatorCamera preview	2017-06-15 12:49:09 -07:00
Zach Pomerantz	3093a73ce1	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-15 15:04:06 -04:00
Zach Fox	47e5fb56d3	Show MyAvatar's head in the SpectatorCamera view!	2017-06-15 11:31:20 -07:00
Zach Fox	60549075dd	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-15 10:09:07 -07:00
ZappoMan	d352163d77	fix no audio device from previously removed audio device	2017-06-15 09:24:14 -07:00
Brad Hefta-Gaub	035a9e898f	Merge pull request #10684 from howard-stearns/avatar-whitelist ... avatar whitelist	2017-06-15 08:45:16 -07:00
Dante Ruiz	d65c0dfbac	Merge branch 'master' of github.com:highfidelity/hifi into controller-ui	2017-06-15 16:24:59 +01:00
NeetBhagat	a6b1b17d45	Merge branch 'master' into 21369	2017-06-15 11:04:22 +05:30
David Rowe	a8501a7ac6	Remove old Leap Motion code	2017-06-15 14:45:40 +12:00
Stephen Birarda	10649c8f6e	change new Node flag to isForcedNeverSilent	2017-06-14 17:20:37 -07:00
Stephen Birarda	224a559602	keep downstream nodes around in domain, alive in upstream	2017-06-14 17:17:14 -07:00
Stephen Birarda	1ed0b693da	Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist	2017-06-14 16:57:28 -07:00
Ryan Huffman	785156ad9f	Move downstram server adding to DS	2017-06-14 16:54:04 -07:00
Clément Brisset	72bf879eb2	Merge pull request #10677 from birarda/feat/avatar-mixer-downstream ... add replication to avatar mixers, fixes for audio	2017-06-14 16:44:56 -07:00
Andrew Meadows	8d19395b0a	ignore remote update younger than recent bid	2017-06-14 16:04:52 -07:00
Atlante45	3f1dfc346d	Merge branch 'fix/node-leak' of github.com:Atlante45/hifi into feat/replicants	2017-06-14 15:12:13 -07:00
Stephen Birarda	ca196f6141	Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/avatar-mixer-downstream	2017-06-14 15:03:26 -07:00
Clément Brisset	44117ac001	Merge pull request #10694 from highfidelity/master ... Update replicants branch with master	2017-06-14 15:01:22 -07:00
Stephen Birarda	bfa5df778d	remove avatar entity data debug	2017-06-14 14:59:49 -07:00
Stephen Birarda	e3c3831efa	only output sequence number information if debug is requested	2017-06-14 14:56:15 -07:00
Stephen Birarda	5b45beaa39	cleanup some debug from identity packet changes	2017-06-14 14:51:28 -07:00
Stephen Birarda	f2a61fa59d	change incoming/outgoing seq num handling	2017-06-14 14:41:25 -07:00
Zach Fox	f214712b33	Merge pull request #10678 from zfox23/spectatorCamera_improvements1 ... Secondary camera and rendering improvements	2017-06-14 14:39:38 -07:00
Stephen Birarda	ddb6db9f6a	fix repeated pushing of avatar identity seq nums	2017-06-14 14:31:22 -07:00
Stephen Birarda	50b56ec761	don't unpack avatar identity that is old	2017-06-14 14:02:22 -07:00
Zach Fox	6b6b6026a4	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-14 13:44:13 -07:00
howard-stearns	2deb26551f	typos in comments/help-strings	2017-06-14 11:56:47 -07:00
Atlante45	5777b5e805	Create one packet per node	2017-06-14 11:42:25 -07:00
Atlante45	3cc2396021	CR	2017-06-14 11:42:25 -07:00
Atlante45	a15660993d	Fix comment	2017-06-14 11:42:25 -07:00
Atlante45	61eb93af35	Fix SharedNodePointer leak	2017-06-14 11:42:25 -07:00
Stephen Birarda	c132e29b06	remove conditional seek from InboundAudioStream	2017-06-14 11:42:19 -07:00
Stephen Birarda	57cd819307	Merge pull request #10690 from Atlante45/fix/node-leak ... Fix for Jurisdiction listener	2017-06-14 11:15:17 -07:00
Atlante45	7b62e8854c	Create one packet per node	2017-06-14 10:53:36 -07:00
Zach Fox	ec3b488897	Remove SECONDARY_CAMERA_RENDER_MODE for now	2017-06-14 10:27:08 -07:00
Stephen Birarda	29842c67cc	use received message faking for cleaner replication in audio	2017-06-13 18:04:59 -07:00
Stephen Birarda	9085a0896a	manually activate sockets for downstream servers	2017-06-13 17:19:58 -07:00
Stephen Birarda	76f1a7445e	handle replicated bulk avatar data packets	2017-06-13 17:19:57 -07:00
Ryan Huffman	da3cd59a96	Fix avatar mixer not setting last broadcast time for downstream nodes	2017-06-13 17:19:57 -07:00
Ryan Huffman	52150ad971	Add node data to downstream avatar mixers	2017-06-13 17:19:57 -07:00
Stephen Birarda	dc94f83591	build out bulk avatar data replication	2017-06-13 17:19:57 -07:00
Stephen Birarda	8ce6590f0b	remove ReplicatedAvatarData and immediate replication of identity	2017-06-13 17:19:57 -07:00
Stephen Birarda	44a63ca27e	handle node killed and remove double IDs in kill packets	2017-06-13 17:19:57 -07:00
Atlante45	d0e8612a65	First pass at AvatarMixer replication	2017-06-13 17:19:57 -07:00
Zach Fox	bae27ec209	Merge pull request #10680 from zfox23/ZachRenderingImprovements1 ... Small rendering improvements based on spectator-camera changes	2017-06-13 17:18:43 -07:00
Ryan Huffman	ea56c568a7	Add support for replicating by username	2017-06-13 17:18:28 -07:00
howard-stearns	6271b8ee7c	avatar whitelist	2017-06-13 16:56:18 -07:00
David Rowe	570ec8457d	Refactor	2017-06-14 10:45:30 +12:00
Zach Fox	79b6dc3f78	Remove one more instance of FramebufferCache	2017-06-13 15:26:07 -07:00
Zach Fox	52ea7e7994	Rendering improvements based on spectator-camera changes	2017-06-13 15:19:29 -07:00
Zach Pomerantz	b24681125d	rm debugging	2017-06-13 18:16:16 -04:00
Zach Pomerantz	9017738a8d	start device check timer	2017-06-13 18:00:41 -04:00
Zach Pomerantz	0e2976620d	start device check timer	2017-06-13 18:00:09 -04:00
Zach Pomerantz	a8f69bb2e0	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-13 17:41:52 -04:00
Zach Fox	0d86d4f0cb	It's working!	2017-06-13 14:30:32 -07:00
Zach Pomerantz	20c0dac8e8	update QML with Audio.muted	2017-06-13 16:10:16 -04:00
Zach Pomerantz	4a39798a97	sticky audio selection	2017-06-13 14:38:52 -04:00
Zach Fox	7b6033f7bc	Getting closer to a solution	2017-06-13 11:37:27 -07:00
Atlante45	a877bf44fb	CR	2017-06-13 11:26:40 -07:00
Chris Collins	90c4d7d666	Merge pull request #10674 from samcake/brown ... Fix bug in clearFramebuffer with Stencil Buffer	2017-06-13 11:25:06 -07:00
NeetBhagat	9646eba873	Complete console.trace and added a testcases for all 13 functions.	2017-06-13 23:52:48 +05:30
Chris Collins	33bf8cc20e	Merge pull request #10672 from howard-stearns/fix-teleport-vs-stuck-in-floor ... fix teleport vs stuck-in-floor work	2017-06-13 11:13:35 -07:00
Zach Fox	4acbb81413	Checkpoint	2017-06-13 10:22:48 -07:00
Zach Fox	ec162327a2	Merge branch 'spectator-camera' into flash	2017-06-13 10:22:02 -07:00
Zach Fox	7d1a7f4c0b	Merge branch 'master' of https://github.com/highfidelity/hifi into ... spectator-camera - INCLUDING MERGE CONFLICT FIXES	2017-06-13 09:42:14 -07:00
NeetBhagat	5c324264a2	Complete the functionality of console.trace().	2017-06-13 14:12:29 +05:30
Sam Cake	f4ed635725	Fix bug in clearFramebuffer with Stencil Buffer	2017-06-12 22:59:42 -07:00
NeetBhagat	5df3b88c85	Merge branch 'master' into 21369	2017-06-13 11:01:22 +05:30
Brad Hefta-Gaub	cbff1910e2	Merge pull request #10660 from birarda/bug/fileOnUrl ... simplify fileOnUrl to only look for external textures right beside FBX	2017-06-12 21:59:17 -07:00
NeetBhagat	b0e9c62c12	Merge branch 'master' of https://github.com/highfidelity/hifi into 21369	2017-06-13 10:10:44 +05:30
Sam Cake	f973f7b5e3	Fix the background not rendering on the second frame, this was imply due to a bug in the GLBackend	2017-06-12 21:25:27 -07:00
Brad Davis	db8bdbc0a6	Merge pull request #10659 from samcake/orange ... simple Render Engine refactors coming from the Spectator Cam project	2017-06-12 20:31:07 -07:00
Stephen Birarda	ab3a0ddba2	don't emit codec mismatch upstream, handle replicated silent frames	2017-06-12 19:49:02 -07:00
Brad Hefta-Gaub	0a84a75bde	Merge pull request #10650 from jherico/web_event_handlers ... Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 19:23:01 -07:00
Stephen Birarda	30d2e9fd23	add unsafeEachNode to iterate nodes when read lock held elsewhere	2017-06-12 17:54:16 -07:00
David Rowe	5eee2d8352	Code review	2017-06-13 12:39:46 +12:00
Brad Davis	308e7295cc	Merge pull request #10657 from jherico/tablet_deadlock ... Attempt to resolve Tablet scripting interface deadlocks	2017-06-12 17:06:58 -07:00
howard-stearns	3d4f9be05b	fix teleport vs stuck-in-floor work	2017-06-12 17:01:13 -07:00
Stephen Birarda	682fa24745	fix downstream server parsing from settings	2017-06-12 16:51:25 -07:00
Brad Hefta-Gaub	347742be1b	Merge pull request #10601 from birarda/mannequin-avatar ... Update default avatar to baked mannequin	2017-06-12 16:42:37 -07:00
Stephen Birarda	63c8273a41	do not send keep alive pings to upstream nodes	2017-06-12 16:29:20 -07:00
Stephen Birarda	880157695a	do not attempt to hole punch an upstream node	2017-06-12 16:29:20 -07:00
Stephen Birarda	4539d615d7	add downstream server settings handling to ThreadedAssignment	2017-06-12 16:29:20 -07:00
Stephen Birarda	9fa97d611a	remove invoked addOrUpdate and move node to node list thread	2017-06-12 16:29:20 -07:00
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
Zach Pomerantz	b37a0239b0	up to reverb (needs cherry-picking)	2017-06-12 18:00:52 -04: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
Bradley Austin Davis	1968ecbc8f	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
Dante Ruiz	e4e261287a	Merge branch 'master' of github.com:highfidelity/hifi into controller-ui	2017-06-12 22:01:57 +01:00
Dante Ruiz	bbe675ab72	making final changes	2017-06-12 22:01:41 +01: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
Zach Fox	e96c55956f	First pass at the fix	2017-06-12 09:53:14 -07:00
Dante Ruiz	1b13cd6d45	saving work	2017-06-12 17:31:02 +01:00
Dante Ruiz	067fc9bb98	fixed merge conflict	2017-06-12 16:45:34 +01:00
NeetBhagat	e8fc766c2b	Complete Console Exception.	2017-06-12 20:24:59 +05:30
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
NeetBhagat	71bff04ce0	Update group functionality by removing consoleLog method from consoleScriptingInterfaceClass.	2017-06-12 12:38:56 +05:30
NeetBhagat	e6a5930365	Merge branch 'master' into 21369	2017-06-12 11:17:26 +05:30
David Rowe	3e126c0517	Smoothly ease hands from uncontrolled to controlled positions	2017-06-12 17:14:13 +12:00
druiz17	f6ef1443c8	some more clean up	2017-06-11 12:08:45 -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
Dante Ruiz	ef1be931dc	preparing to clean code	2017-06-10 00:50:32 +01:00
Stephen Birarda	d2bea94768	simplify fileOnUrl to always look right beside FBX	2017-06-09 15:52:21 -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
samcake	bb38938534	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-09 14:34:25 -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
Zach Fox	fd50434d86	New camera model; Cleanup; Bashing head :against desk	2017-06-09 11:42:16 -07:00
Zach Fox	3884287c41	Use 'resource' protocol instead of 'http'	2017-06-09 11:39:28 -07:00
Zach Fox	5114fd8e1f	Rename correctly?	2017-06-09 11:39:28 -07:00
Zach Fox	7aef4dab4c	Variable renaming pass	2017-06-09 11:39:28 -07:00
Zach Fox	a4f5d327a2	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-09 11:38:35 -07:00
Zach Fox	12e5fc20f7	Merge pull request #10653 from samcake/flash ... Spectator-camera : Provide a way to render the side camera always mono	2017-06-09 11:34:37 -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
NeetBhagat	2bd2804d0b	complete Group Functionality i.e Group,GroupCollapsed,GroupEnd	2017-06-09 20:31:58 +05:30
NeetBhagat	c5d8268007	Merge branch 'master' of https://github.com/highfidelity/hifi into 21369	2017-06-09 18:04:34 +05:30
NeetBhagat	dd91346c18	Started group functions.	2017-06-09 11:43:16 +05:30
Anthony Thibault	e3c342aa77	Merge pull request #10595 from hyperlogic/feature/spine-spline ... Spline IK target support	2017-06-08 18:09:55 -07:00
samcake	4c8eec4e16	Introducing a way to prevent a frame to render in stereo accross batches	2017-06-08 17:38:26 -07:00
Zach Fox	ab9b014381	Merge pull request #10648 from davidkelly/dk/5222 ... fix for avatar entities disappearing after grabbing and releasing	2017-06-08 16:52:19 -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
Dante Ruiz	73e628461e	confiration update status	2017-06-09 00:44:05 +01: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
David Kelly	32d83e375c	fix for avatar entities disappearing after grabbing and releasing	2017-06-08 13:48:01 -07:00
seefo	fce3badd1d	Resolved FB#5005	2017-06-08 11:57:44 -07:00
howard-stearns	d15657616a	comments	2017-06-08 10:40:20 -07:00
Dante Ruiz	c97ea84cbf	saving work	2017-06-08 17:44:55 +01:00
Liv	34bd2b8a2b	style fix	2017-06-08 09:01:01 -07:00
samcake	3664655512	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-07 17:43:50 -07:00