56480 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Davis	4439de240a	Trying to fix QtQml/QtScript crashes	2017-06-22 16:39:57 -07:00
Andrew Meadows	e5602aa7d3	Merge pull request #10773 from Atlante45/fix/refresh-content ... Fix reload content for baked skyboxes	2017-06-22 08:40:42 -07:00
Andrew Meadows	424848f8e3	Merge pull request #10769 from sethalves/fix-linux-fbx-lib ... have cmake find fbx library on Linux	2017-06-22 08:37:57 -07:00
David Kelly	34edd95926	Merge pull request #10776 from davidkelly/dk/avatarUrlSwitch ... new switches to override avatarURL	2017-06-22 07:11:29 -07:00
David Kelly	5da01f0074	updated comments	2017-06-22 07:09:24 -07:00
Seth Alves	b1119ff465	more changes to get oven building on Linux	2017-06-21 20:10:54 -07:00
Stephen Birarda	e2f6ad8306	Merge pull request #10781 from birarda/feat/replicants-advanced ... make broadcasting settings advanced in DS settings	2017-06-21 19:28:19 -07:00
Seth Alves	5277a0803c	Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-fbx-lib	2017-06-21 18:59:58 -07: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	95704c1ba5	make broadcasting settings advanced	2017-06-21 17:58:19 -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
Howard Stearns	ea5b074f6e	Merge pull request #10758 from howard-stearns/event-installer-interface-options ... Event installer interface options	2017-06-21 16:46:06 -07:00
Ryan Huffman	06a305d04b	Merge pull request #10777 from birarda/feat/replicants ... address code review comments	2017-06-21 16:24:02 -07:00
Stephen Birarda	aeb3f443f8	address code review comments	2017-06-21 16:14:14 -07:00
David Kelly	92cbb86e8b	remove debugging	2017-06-21 16:09:08 -07:00
David Kelly	94a33fea94	new switches to override avatarURL	2017-06-21 16:03:05 -07:00
Atlante45	4a552affe6	Fix reload content for baked skyboxes	2017-06-21 15:19:03 -07:00
Dante Ruiz	c4699e00ca	added hand offsets	2017-06-21 23:10:08 +01:00
Seth Alves	0d9aa8182e	have cmake find fbx library on Linux	2017-06-21 17:10:19 -04: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
Chris Collins	f3ae1d8078	Merge pull request #10750 from Atlante45/master ... Stable -> Master	2017-06-21 13:34:28 -07:00
Brad Hefta-Gaub	88a4f5c576	Merge pull request #10766 from humbletim/sort-running-scripts ... Sort Running Scripts... list alphabetically	2017-06-21 13:08:47 -07:00
Brad Hefta-Gaub	4ddb5e8866	Merge pull request #10562 from huffman/fix/graceful-controls ... Improvements to gracefulControls.js	2017-06-21 12:52:36 -07:00
Brad Hefta-Gaub	4f632005b6	Merge pull request #10372 from rabelaiis/21300 ... Add entity script for balloon spawner and sample json entity with us…	2017-06-21 12:50:52 -07:00
Atlante45	49623fefd8	Fix Skyboxes sometimes not showing	2017-06-21 11:40:32 -07:00
Anthony Thibault	a12109ed26	Merge pull request #10761 from hyperlogic/bug-fix/avatar-no-eyes ... Bug Fixes for Eyeless Avatars	2017-06-21 10:59:55 -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
Dante Ruiz	729065749f	fixed merge conficts	2017-06-21 16:59:53 +01: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	1e168a5f6d	Remove extra logging	2017-06-21 00:23:24 -07:00
Sam Cake	a78018345b	Fixing the last scripts maybe	2017-06-21 00:15:29 -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
Zach Fox	8dab93e299	Merge pull request #10762 from zzmp/audio/input-select-active-level ... Add a VU meter to the active mic selection	2017-06-20 18:38:49 -07:00
Zach Pomerantz	a9ffff6582	Merge pull request #10760 from zzmp/audio/mute-row ... Give audio menu mute checkbox its own row	2017-06-20 18:24:03 -07:00
Howard Stearns	fea8a95fc7	Don't leave running markers around if they weren't there before and we quit after reporting (protocol)version.	2017-06-20 18:09:27 -07:00
Howard Stearns	ac1d4d9636	Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options	2017-06-20 17:57:12 -07:00
Dante Ruiz	17832b6022	edited some button behavior	2017-06-21 01:38:05 +01:00
samcake	d853a76376	Fixing the scripts and investigating the scripting	2017-06-20 17:23:44 -07:00
Dante Ruiz	5e82b13d65	removed double include	2017-06-21 01:15:17 +01:00
Dante Ruiz	2e329602f7	minimize diff	2017-06-21 01:13:45 +01: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	0075d8619a	center MUTED text in InputLevel	2017-06-20 17:04:54 -07:00