3295 commits

Author	SHA1	Message	Date
Olivier Prat	6a31dc2659	Selection of edited object working	2017-06-29 12:13:55 +02:00
Olivier Prat	8a12d0c106	Fade effect working again for basic enter domain but with various Fade jobs	2017-06-29 08:54:23 +02:00
Olivier Prat	b76a8a6f9b	Merge branch 'master' of git://github.com/highfidelity/hifi into 21378	2017-06-28 14:37:03 +02:00
Brad Davis	de88a34e97	Fix toolbar button activation states	2017-06-26 23:33:32 -07:00
Ryan Huffman	209a4f33b5	Merge pull request #10784 from huffman/feat/pal-replicated ... Disable silence + ban buttons for replicated users	2017-06-26 12:50:23 -07:00
Chris Collins	19d3646fef	Merge pull request #10817 from kencooke/audio-scripting-fix ... Audio scripting fixes	2017-06-26 10:01:52 -07:00
Brad Hefta-Gaub	a32f7b2395	Merge pull request #10743 from humbletim/21383 ... CR 21383: Integrate attachments into doppleganger mirror	2017-06-26 09:54:04 -07:00
Ken Cooke	fba1a8ddaa	Fix halfDuplex script	2017-06-26 08:28:29 -07:00
Ken Cooke	db2b702221	Fix reverbTest script	2017-06-26 08:08:52 -07:00
Olivier Prat	1bb0d51849	Merged with master	2017-06-26 11:55:46 +02:00
anshuman64	9d9f4ee64a	Merge pull request #10811 from ctrlaltdavid/21414 ... EZRECORD app	2017-06-24 22:46:30 -07:00
anshuman64	d1891069d2	Merge pull request #10763 from hyperlogic/feature/puck-attach ... Added script that will attach an entity to a vive sensor	2017-06-24 22:35:45 -07:00
David Rowe	48caad1ad2	Add user activity logging	2017-06-24 16:03:55 +12:00
David Rowe	3de1c0a312	Make and save recording	2017-06-24 15:57:57 +12:00
David Rowe	bae04966f9	Add "REC" indicator	2017-06-24 14:35:28 +12:00
David Rowe	6543b74b52	Add beeps	2017-06-24 14:26:01 +12:00
David Rowe	ce32f1704e	Start/cancel/finish recording logic	2017-06-24 13:22:00 +12:00
David Rowe	1ddae1c61a	Change keyboard shortcut to avoid conflict	2017-06-24 13:19:25 +12:00
David Rowe	ced9473eb3	Icon toggling and keyboard shortcut	2017-06-24 12:49:45 +12:00
David Rowe	b546d977f4	"EZRECORD" app script and button	2017-06-24 12:07:20 +12:00
Anthony J. Thibault	aabbcfd23d	code review feedback	2017-06-23 16:47:53 -07:00
Ryan Huffman	b56cfa56c7	Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated	2017-06-23 14:23:20 -07:00
Brad Hefta-Gaub	7668fbb7a0	Merge pull request #10755 from seefo/fb5278 ... Fixed an issue where toolbar buttons duplicated themselves when reloading scripts	2017-06-22 13:35:05 -07:00
Anthony J. Thibault	e531468ac7	Fix for html url	2017-06-22 13:14:47 -07:00
Anthony J. Thibault	3184d4e9d1	Puck attach only shows available tracked objects.	2017-06-22 12:17:22 -07:00
Anthony J. Thibault	6e10a6fc60	Merge branch 'master' into feature/puck-attach	2017-06-22 11:32:59 -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
Ryan Huffman	0e7ddfd29f	Disable silence/ban buttons in PAL if avatar is replicated	2017-06-21 09:49:16 -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	189ad9c706	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-06-20 22:42:40 -07:00
samcake	d853a76376	Fixing the scripts and investigating the scripting	2017-06-20 17:23:44 -07:00
Anthony J. Thibault	b78e278102	adjusted print statements	2017-06-20 17:19:57 -07:00
Anthony J. Thibault	e84d0358cc	updated images	2017-06-20 17:18:35 -07:00
Anthony J. Thibault	287dc3e1b8	updated license and button name	2017-06-20 17:10:53 -07:00
Anthony J. Thibault	cd1beceb75	Added script that will attach an entity to a vive sensor.	2017-06-20 17:02:50 -07: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
Thijs Wenker	b22b45461f	Merge pull request #10754 from ctrlaltdavid/21405 ... Fix import of JSON with parent-child relationships	2017-06-20 20:48:01 +02:00
Zach Pomerantz	c826858458	revamp tablet MicBar	2017-06-20 11:43:02 -07:00
seefo	00a3fc77a1	Fixed an issue where toolbar buttons duplicated themselves when reloading scripts	2017-06-20 11:18:22 -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
Sam Cake	5b6f6ab84f	Trying to fix the getCOnfig from QML...	2017-06-20 00:25:51 -07:00
David Rowe	513e0cd232	Fix import of JSON with parent-child relationships	2017-06-20 16:44:25 +12: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
Olivier Prat	21276a85ad	Merge branch 'master' of git://github.com/highfidelity/hifi into 21378	2017-06-19 18:20:03 +02:00
humbletim	89ebf4998f	relocate/archive original doppleganger mirror into unpublishedScripts/marketplace/doppleganger-mirror	2017-06-19 10:28:56 -04:00
Stephen Birarda	39e8510ccb	Merge pull request #10720 from seefo/fb5386 ... Fixed a bug where you could not print polaroids if you took a gif	2017-06-16 15:03:45 -07:00
NeetBhagat	2909aa9ac8	Resolve comments of @zappoman. ... -- Rename "asserts" to "assert" -- Log printing methods will accept lists of objects or strings.	2017-06-17 01:00:32 +05:30
Chris Collins	f160034bf0	Merge pull request #10681 from zzmp/audio/parity ... Revamp audio device selection	2017-06-16 10:31:55 -07:00
seefo	a4d008eec9	Fixed a bug where you could not print polaroids if you took a gif	2017-06-16 08:57:27 -07:00