21362 commits

Author	SHA1	Message	Date
Seth Alves	b5919d89a5	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-15 08:26:10 -08:00
ZappoMan	956fdd0933	CR feedback	2017-03-13 12:06:38 -07:00
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
Seth Alves	7e7bbe8785	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-13 09:43:17 -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
Anthony J. Thibault	07e10ae862	Merge branch 'tablet-ui' into feature/can-touch-this	2017-03-10 17:05:26 -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
Dante Ruiz	2cd194104f	force on to home screen	2017-03-10 20:46:01 +00: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
Vladyslav Stelmakhovskyi	e27ccab2f4	Eliminate pathToFonts not found errors at startup. Change TableFiledialog folder on click	2017-03-10 19:53:20 +01:00
Seth Alves	2068b93ccc	Merge pull request #9817 from druiz17/goto-home-bug ... cant call gotohomescreen when tablet is closed	2017-03-10 10:17:23 -08:00
Seth Alves	e3f1d80933	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-10 09:54:35 -08:00
Anthony J. Thibault	d8f04d90a7	Merge branch 'master' into feature/can-touch-this	2017-03-09 14:24:10 -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
Dante Ruiz	e9086460e3	changed function names	2017-03-08 18:14:32 +00:00
Dante Ruiz	fd3e1fb320	Merge branch 'master' of github.com:highfidelity/hifi into goto-home-bug	2017-03-08 17:42:44 +00:00
Dante Ruiz	6acf2340a2	better way to determine if we can go to the homescreen	2017-03-08 17:42:24 +00:00
Seth Alves	66d44ac6f0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-08 09:26:51 -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
Seth Alves	509ce3f2d2	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-07 18:41:36 -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
Anthony J. Thibault	1b8a624edb	Fix for potential crash due to DebugDraw data race.	2017-03-07 16:07:30 -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
Dante Ruiz	656720ae36	Merge branch 'master' of github.com:highfidelity/hifi into goto-home-bug	2017-03-07 22:22:46 +00: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	aa4cbe2892	Merge branch 'fix-tablet-qml-overlay-in-hmd' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-07 12:10:20 -08:00
Seth Alves	694fc58374	restore missing shading pipeline for simple opaque in deferred	2017-03-07 12:07:24 -08:00
Seth Alves	b938579598	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-07 11:42:44 -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
Seth Alves	f594689fa8	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-07 09:24:50 -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
Dante Ruiz	5156564f04	cant call gotohomescreen when tablet is closed	2017-03-07 00:53:36 +00:00
Andrew Meadows	d749c0c8be	use fabsf() rather than fabs()	2017-03-06 15:50:32 -08:00