23308 commits

Author	SHA1	Message	Date
David Rowe	6ff8aed5e3	Merge branch 'master' into 21396	2017-06-22 23:54:15 +12:00
David Rowe	3bdf267900	Implement fingers control	2017-06-22 23:32:06 +12:00
Seth Alves	c70365d04a	Merge pull request #10729 from druiz17/hand-pucks ... Hand pucks and Calibration UI	2017-06-21 18:10:15 -07:00
Stephen Birarda	c516dd06e4	Merge pull request #10714 from highfidelity/replicants ... add broadcasting/replication to downstream avatar mixers and audio mixers	2017-06-21 17:55:07 -07:00
Stephen Birarda	aeb3f443f8	address code review comments	2017-06-21 16:14:14 -07:00
Clément Brisset	4929939501	Merge pull request #10768 from Atlante45/fix/skyboxes ... Fix skyboxes sometimes not showing	2017-06-21 13:56:42 -07:00
Atlante45	49623fefd8	Fix Skyboxes sometimes not showing	2017-06-21 11:40:32 -07: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
Brad Hefta-Gaub	04d74a715a	Merge pull request #10765 from samcake/brown ... Adding Profiling for script engine timer callback	2017-06-21 10:13:20 -07:00
Dante Ruiz	f369303bfe	removed warning	2017-06-21 18:12:31 +01:00
Brad Hefta-Gaub	c5845787da	Merge pull request #10759 from jherico/file_cache_shutdown ... Fix crash when cache entry lifetime exceeds cache lifetime	2017-06-21 10:06:48 -07:00
Sam Cake	09529f6592	One more refinemnt of the comment	2017-06-21 00:54:04 -07:00
Sam Cake	484aeed589	More comments on the getCOnfig call	2017-06-21 00:36:03 -07:00
Sam Cake	c35be446e6	adding profiling on the script engine call back to timer event	2017-06-21 00:06:45 -07:00
Sam Cake	189ad9c706	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-06-20 22:42:40 -07:00
Thijs Wenker	2a4e9cb603	fix local include / headers	2017-06-21 06:38:16 +02:00
Thijs Wenker	47643e1efe	Expose location API to Agent scripts (side-effect, agents now can teleport)	2017-06-21 06:31:36 +02:00
samcake	d853a76376	Fixing the scripts and investigating the scripting	2017-06-20 17:23:44 -07:00
Dante Ruiz	b7286db523	fixed merge conflict	2017-06-21 01:10:54 +01:00
Dante Ruiz	2c3db0fb91	finished calibration-ui	2017-06-21 01:07:12 +01:00
Zach Pomerantz	8e1cf763e3	Merge pull request #10756 from zzmp/audio/input-level ... Update chrome for the audio input level meter	2017-06-20 15:33:17 -07:00
Zach Pomerantz	7e84f67391	Merge pull request #10744 from zzmp/audio/output-sample ... Add "Play sample sound" to audio setting	2017-06-20 15:32:57 -07:00
Brad Davis	e3fb42eefd	Fix crash when cache File lifetime exceeds cache lifetime	2017-06-20 14:38:51 -07:00
Zach Pomerantz	c826858458	revamp tablet MicBar	2017-06-20 11:43:02 -07:00
Brad Hefta-Gaub	cbded766b1	Merge pull request #10676 from NeetBhagat/21369 ... WL 21369 - Implement parts of the JS "console" object	2017-06-20 11:06:34 -07:00
samcake	3727b2af7e	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-06-20 10:53:25 -07:00
Seth Alves	428dc81083	Merge pull request #10696 from AndrewMeadows/avoid-ownership-bid-race ... ignore remote update younger than recent ownership bid	2017-06-20 10:42:54 -07:00
Sam Cake	5b6f6ab84f	Trying to fix the getCOnfig from QML...	2017-06-20 00:25:51 -07:00
Thijs Wenker	07fefdcb2f	Merge pull request #10748 from samcake/brown ... Fix the local lights issue	2017-06-20 05:17:18 +02:00
samcake	ba9dbbb4d4	Fix the local lights issue, and correct the script relying on the Render.getConfig(), this one is on me...	2017-06-19 17:34:50 -07:00
Zach Pomerantz	497ee3a522	add Audio.inputLevel	2017-06-19 17:07:43 -07:00
Stephen Birarda	cf9a97cf10	use length sent by AssetServer to verify asset size	2017-06-19 15:15:45 -07:00
Howard Stearns	ddce665613	Merge pull request #10739 from zfox23/spectatorCamera_mergeable_20170619 ... Spectator Camera - Mergeable Rendering Components	2017-06-19 14:55:43 -07:00
Brad Davis	8aeeab30e7	Merge pull request #10689 from Atlante45/fix/ktx ... Fix KTX performance problems	2017-06-19 14:44:52 -07:00
Zach Pomerantz	a7e1b75909	stopgap with MyAvatar.qmlPosition	2017-06-19 14:41:01 -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
Dante Ruiz	cfffb74a29	Merge branch 'master' of github.com:highfidelity/hifi into hand-pucks	2017-06-19 21:40:26 +01:00
Brad Davis	ed6620fc51	Merge pull request #10718 from jherico/frame_thread ... Cleanup and refactoring	2017-06-19 13:31:44 -07:00
Atlante45	c4c6142935	Merge branch 'master' of https://github.com/highfidelity/hifi into fix/ktx	2017-06-19 11:06:51 -07:00
Atlante45	8d45c4da7c	Fix comments	2017-06-19 11:02:31 -07:00
Stephen Birarda	2933a20a0c	some cleanup for audio/avatar replicated packet checking	2017-06-19 10:45:33 -07:00
Zach Fox	08eb07242d	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-19 10:31:31 -07:00
Brad Davis	1d4b443113	Prevent cache ejection of textures in use	2017-06-19 09:51:11 -07:00
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
Atlante45	d090ac4396	CR	2017-06-16 17:04:57 -07:00
Brad Davis	a69cf31f4b	PR feedback and cmake fixes	2017-06-16 16:59:58 -07:00
Andrew Meadows	b105ad8338	measure linear velocity of tractor position	2017-06-16 16:55:00 -07:00
Dante Ruiz	da29157a3c	fixed merge conflict'	2017-06-17 00:40:50 +01:00
Brad Davis	a675dfe7d2	Prevent deadlocks from different locking orders in FileCache	2017-06-16 15:30:50 -07:00