638 commits

Author	SHA1	Message	Date
Zach Fox	2a75d97006	First steps	2017-08-22 12:56:16 -07:00
Elisa Lupin-Jimenez	44f1f340e1	Merge pull request #11147 from elisa-lj11/blocks ... Adding Blocks Tablet App to Marketplace	2017-08-18 15:06:18 -07:00
Sam Gondelman	cbf2bb3a61	Merge pull request #10980 from SamGondelman/sharks ... Reduce laser pointer lag	2017-08-18 13:14:38 -07:00
Elisa Lupin-Jimenez	65f876acf3	enabled version check	2017-08-18 10:49:40 -07:00
Elisa Lupin-Jimenez	4c28b9f09a	attempt to check version of interface	2017-08-17 18:16:41 -07:00
Zach Fox	ecd1f13197	Allow users to take a snapshot from the secondary camera	2017-08-16 15:34:06 -07:00
SamGondelman	489e08aef0	Merge branch 'master' of https://github.com/highfidelity/hifi into sharks	2017-08-07 13:29:00 -07:00
Brad Davis	86e3489167	Updates from Threaded Rendering project	2017-08-04 15:22:14 -07:00
Sam Gondelman	fcaa39b245	Merge branch 'master' into sharks	2017-07-26 18:18:09 -07:00
SamGondelman	3149c3e16c	warnings	2017-07-25 10:16:50 -07:00
SamGondelman	3c8b964cc9	replace setHandLasers with drawHUDLayer overlay property	2017-07-24 18:16:40 -07:00
Brad Davis	5b5e94700e	Additional audio fixes	2017-07-21 09:52:44 -07:00
Brad Davis	d1c2218a31	Temporary patch for deadlock	2017-07-21 09:52:36 -07:00
David Rowe	091b666d7e	Fix noise reduction checkbox not always working	2017-07-20 12:06:19 +12:00
Brad Davis	d43432bd71	Cleanup dead code, fix startup behavior	2017-07-17 18:54:52 -07:00
Brad Davis	aab56cf2a9	Trying to resolve QML / Audio deadlocks	2017-07-17 16:21:28 -07:00
Tingjin	80916b62bb	Remove unnecessary code ... Remove two lines of unnecessary code.	2017-07-11 20:52:28 -07:00
Seth Alves	70a7b302fc	Merge pull request #10860 from jherico/deadlock_guards ... Don't use blocking connections on the main thread	2017-07-03 09:05:56 -07:00
Brad Davis	31d2c9980e	Merge pull request #10797 from ctrlaltdavid/21396 ... Make Leap Motion a plugin	2017-06-30 14:37:23 -07:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Brad Davis	8372d73fec	Additional thread safety	2017-06-30 09:15:06 -07:00
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07:00
Seth Alves	794495c197	make ResourceManager be owned by DependencyManager	2017-06-28 14:18:14 -07:00
David Rowe	6e266dfbac	Merge branch 'master' into 21396	2017-06-24 09:19:12 +12:00
Brad Hefta-Gaub	dc649e84df	Merge pull request #10792 from jherico/qml_crashes ... Trying to fix QtQml/QtScript crashes	2017-06-23 12:41:43 -07:00
druiz17	91ce9235ea	Merge pull request #10747 from zzmp/audio/select-log ... Log audio selections	2017-06-23 07:54:03 -07:00
Zach Pomerantz	a82cc0ec09	retab	2017-06-23 09:35:48 -04:00
Brad Davis	4439de240a	Trying to fix QtQml/QtScript crashes	2017-06-22 16:39:57 -07:00
David Rowe	6ff8aed5e3	Merge branch 'master' into 21396	2017-06-22 23:54:15 +12:00
Brad Hefta-Gaub	f7d42c782d	Merge pull request #10764 from thoys/feat/ac-location-jsapi ... Expose location scripting interface to Agent (AC script)	2017-06-21 10:22:48 -07:00
Thijs Wenker	47643e1efe	Expose location API to Agent scripts (side-effect, agents now can teleport)	2017-06-21 06:31:36 +02:00
Zach Pomerantz	497ee3a522	add Audio.inputLevel	2017-06-19 17:07:43 -07:00
Zach Pomerantz	4bff925506	rm unused bools	2017-06-19 17:01:39 -07:00
Zach Pomerantz	3d80774317	clean up select_audio_device	2017-06-19 15:57:24 -07:00
Zach Pomerantz	837f37220a	log selected_audio_device	2017-06-19 15:11:02 -07:00
Zach Pomerantz	5f236bd025	simplify device settings	2017-06-19 15:11:02 -07:00
Zach Fox	cbdffce88e	Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619	2017-06-19 13:53:29 -07:00
Brad Davis	ed6620fc51	Merge pull request #10718 from jherico/frame_thread ... Cleanup and refactoring	2017-06-19 13:31:44 -07:00
Zach Fox	7a76c9cf7f	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-16 14:59:23 -07:00
Zach Fox	416ebaa2e8	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-16 10:08:10 -07:00
Brad Davis	fece438602	Cleanup and refactoring	2017-06-15 18:58:56 -07:00
ZappoMan	d352163d77	fix no audio device from previously removed audio device	2017-06-15 09:24:14 -07:00
David Rowe	a8501a7ac6	Remove old Leap Motion code	2017-06-15 14:45:40 +12:00
Zach Pomerantz	969582c23d	clean audio device names	2017-06-14 09:04:22 -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	79563b7d83	fix header on AudioDevices.h	2017-06-13 14:55:20 -04:00
Zach Pomerantz	9b131ee4af	rm old AudioDevice interface	2017-06-13 14:55:10 -04:00
Zach Pomerantz	4a39798a97	sticky audio selection	2017-06-13 14:38:52 -04: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
Zach Pomerantz	89bd895054	mv showAudioTools to just AvatarInputs	2017-06-13 12:31:05 -04:00