23094 commits

Author	SHA1	Message	Date
David Rowe	a8501a7ac6	Remove old Leap Motion code	2017-06-15 14:45:40 +12: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
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
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	9017738a8d	start device check timer	2017-06-13 18:00:41 -04: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
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
Sam Cake	f4ed635725	Fix bug in clearFramebuffer with Stencil Buffer	2017-06-12 22:59:42 -07:00
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
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
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
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
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
Bradley Austin Davis	1968ecbc8f	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
Zach Fox	e96c55956f	First pass at the fix	2017-06-12 09:53:14 -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
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
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
samcake	3664655512	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-07 17:43:50 -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
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
samcake	bac66ee4c7	Introducing the renderview task	2017-06-06 18:00:41 -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
Bradley Austin Davis	30c86ff321	Attempt to resolve Tablet scripting interface deadlocks	2017-06-06 14:58:56 -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