21296 commits

Author	SHA1	Message	Date
ZappoMan	099ee1db7f	CR feedback	2017-03-13 12:05:42 -07:00
ZappoMan	3e020ede78	CR feedback	2017-03-13 11:58:43 -07:00
ZappoMan	81d01da21d	Merge branch 'master' of https://github.com/highfidelity/hifi into fadeInWhenOpeningNoiseGate	2017-03-13 10:55:09 -07:00
Andrew Meadows	6e7f4b0418	Merge pull request #9829 from ZappoMan/addDoubleClick ... Add double click message support to entities and overlays	2017-03-13 10:44:54 -07:00
Brad Hefta-Gaub	a38965d628	add more audio stats	2017-03-11 09:50:30 -08:00
Brad Hefta-Gaub	eaea718de1	add various scriping interfaces for managing the audio scope and detecting noise gate transitions	2017-03-10 17:08:19 -08:00
Chris Collins	49efd8ad42	Merge pull request #9841 from AndrewMeadows/fix-crash-copying-joint-data ... fix crash when unpacking too many joints	2017-03-10 14:39:27 -08:00
Brad Hefta-Gaub	69fdea3621	fix typo in comment	2017-03-10 11:44:53 -08:00
Brad Hefta-Gaub	a4eac3cbc0	Merge branch 'master' of https://github.com/highfidelity/hifi into fadeInWhenOpeningNoiseGate ... Conflicts: libraries/audio-client/src/AudioNoiseGate.cpp	2017-03-10 11:43:30 -08:00
Brad Hefta-Gaub	bdab24d9bf	fix spelling	2017-03-09 08:25:56 -08:00
Brad Hefta-Gaub	79d8d90581	CR feedback	2017-03-08 20:35:24 -08:00
Brad Hefta-Gaub	2d595c1f87	CR feedback	2017-03-08 20:29:32 -08:00
Brad Hefta-Gaub	7acfcf6750	fade in and out when opening/closing the noise gate	2017-03-08 18:15:32 -08:00
Brad Hefta-Gaub	60daaba525	small cleanup	2017-03-08 17:30:44 -08:00
Brad Hefta-Gaub	1bdad89cbe	properly handle silent packet transitions	2017-03-08 17:27:46 -08:00
Andrew Meadows	30d7ffb303	fix warning about signed unsigned compare	2017-03-08 17:17:49 -08:00
Andrew Meadows	5847f86db8	fix crash when unpacking too many joints	2017-03-08 16:12:03 -08:00
Andrew Meadows	31fc50b38c	Merge pull request #9828 from kunalgosar/recorderFix ... Fixed bug where recording sends you to (0, 0, 0)	2017-03-08 09:24:29 -08:00
Brad Hefta-Gaub	8ae6f2727d	add support for double click messages to overlays and entities	2017-03-07 17:52:55 -08:00
kunalgosar	d2a2ba1846	Fixed recording bug	2017-03-07 17:19:21 -08:00
Brad Hefta-Gaub	1e51ae62b1	Merge pull request #9804 from jherico/oculus_update ... Update Oculus SDK to 1.11	2017-03-07 15:00:44 -08:00
Seth Alves	71c2b4215d	Merge pull request #9811 from ZappoMan/triangleSet ... Cleanup how Models do ray-picking and determination of point inside of convex hull	2017-03-07 14:12:56 -08:00
Seth Alves	cd91d6ff3c	Merge pull request #9824 from sethalves/fix-tablet-qml-overlay-in-hmd ... fix -- restore missing shading pipeline for simple opaque in deferred	2017-03-07 13:25:44 -08:00
Ryan Huffman	a744e0d11c	Merge pull request #9685 from humbletim/21114-part2 ... CR-2 21114 -- BaseScriptEngine.cpp, order-of-operations fixes, reworked JS Exceptions	2017-03-07 13:25:25 -08:00
Brad Hefta-Gaub	f7e824e47c	Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet	2017-03-07 12:18:36 -08:00
Seth Alves	694fc58374	restore missing shading pipeline for simple opaque in deferred	2017-03-07 12:07:24 -08:00
Brad Hefta-Gaub	d8b7076a9e	Merge pull request #9816 from AndrewMeadows/sphere-means-sphere ... ModelEntityItems that use 'sphere' for shapeType should collide as true spheres	2017-03-07 09:53:52 -08:00
Brad Hefta-Gaub	87934ee82d	fix bugs in some meshes	2017-03-06 21:50:32 -08:00
Atlante45	ff9d6d657c	Remove weighted offset, special case downward pressure	2017-03-06 19:41:08 -08:00
Andrew Meadows	d749c0c8be	use fabsf() rather than fabs()	2017-03-06 15:50:32 -08:00
Andrew Meadows	10b3e7fc67	sphere shapeType for models means 'sphere'	2017-03-06 15:14:51 -08:00
Zach Fox	5223f872c1	Merge pull request #9753 from zfox23/FB_3234_TakeTwo ... Optimize AvatarMixer with respect to Identity and Avatar Data	2017-03-06 13:37:29 -08:00
Andrew Meadows	1b8f6b9835	Merge pull request #9784 from samcake/blue ... Fixing Emissive on overlay for models (opaque and transparent)	2017-03-06 13:24:00 -08:00
Brad Hefta-Gaub	f27475613f	Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet	2017-03-06 12:53:59 -08:00
samcake	21f36d7212	removing comments and restoring the correct behavior for Pal.js	2017-03-06 12:41:00 -08:00
ZappoMan	faba160331	more CR feedback	2017-03-06 11:10:04 -08:00
Andrew Meadows	6ea6477c73	Merge pull request #9683 from jherico/cache_flush ... Clear caches on domain switch	2017-03-06 11:05:44 -08:00
ZappoMan	af97e9bdd9	CR feedback	2017-03-06 10:49:38 -08:00
Zach Fox	718ecea404	Potential non-spammy solution using pseudo-state	2017-03-06 10:03:41 -08:00
Zach Fox	cfb8534d71	Comment	2017-03-06 10:03:41 -08:00
Zach Fox	c9c07c4269	Basically rebase and squash	2017-03-06 10:03:41 -08:00
ZappoMan	2a663cbcb1	cleanup	2017-03-05 19:28:15 -08:00
ZappoMan	87bcced409	cleanup use of triangleSet for picking	2017-03-05 19:23:55 -08:00
sam	cffd838d1d	merging with master	2017-03-05 12:57:13 -08:00
ZappoMan	32add6635d	checkpoint on reducing raypicking recalcs	2017-03-04 23:33:17 -08:00
Ken Cooke	a5571bd49d	redo unsafe optimization	2017-03-04 16:02:39 -08:00
Ken Cooke	44c1f8500d	redo unsafe optimization	2017-03-04 15:55:53 -08:00
Ken Cooke	0bababf1f5	Safe replacement of glm_mat4_mul() for unaligned arguments instead of __m128	2017-03-04 14:53:07 -08:00
ZappoMan	9908723bb9	fist cut at basic TriangleSet class	2017-03-03 22:27:38 -08:00
Bradley Austin Davis	ce9d637b3f	Expose ASW activation status, provide normalized present rate information	2017-03-03 10:46:05 -08:00