23116 commits

Author	SHA1	Message	Date
Clément Brisset	3262e10d76	Merge pull request #10727 from jherico/file_cache_locking ... Prevent deadlocks from different locking orders in FileCache	2017-06-17 15:13:47 -07:00
Brad Davis	1632e3b35a	PR feedback	2017-06-16 20:04:23 -07:00
Brad Davis	a675dfe7d2	Prevent deadlocks from different locking orders in FileCache	2017-06-16 15:30:50 -07:00
Chris Collins	f160034bf0	Merge pull request #10681 from zzmp/audio/parity ... Revamp audio device selection	2017-06-16 10:31:55 -07:00
Andrew Meadows	5e0be1a823	Merge pull request #10662 from ctrlaltdavid/21394 ... Smoothly ease hands from uncontrolled to controlled positions	2017-06-15 13:17:26 -07:00
Zach Pomerantz	3093a73ce1	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-15 15:04:06 -04: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
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
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
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 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
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
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
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
Zach Pomerantz	b37a0239b0	up to reverb (needs cherry-picking)	2017-06-12 18:00:52 -04: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
David Rowe	3e126c0517	Smoothly ease hands from uncontrolled to controlled positions	2017-06-12 17:14:13 +12: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