384 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
Chris Collins	19d3646fef	Merge pull request #10817 from kencooke/audio-scripting-fix ... Audio scripting fixes	2017-06-26 10:01:52 -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
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
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
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
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
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
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
NeetBhagat	a6b1b17d45	Merge branch 'master' into 21369	2017-06-15 11:04:22 +05:30
David Rowe	16bebdd409	Rename identifiers	2017-06-15 09:20:55 +12:00
David Rowe	e3b4e4aa20	Disable print statements	2017-06-14 15:37:36 +12:00
David Rowe	395d40f0f9	Fix script default to match C++ default	2017-06-14 12:21:19 +12:00
David Rowe	05f19d54f4	Add HMD roll control JavaScript API	2017-06-14 11:55:04 +12:00
NeetBhagat	9646eba873	Complete console.trace and added a testcases for all 13 functions.	2017-06-13 23:52:48 +05:30
Olivier Prat	ace301945c	Added scale and duration debug parameters in debugFade.qml	2017-06-13 15:31:04 +02:00
Olivier Prat	24d45e0f5b	Updated from upstream master because of change of protocol	2017-06-13 10:43:25 +02:00
NeetBhagat	b0e9c62c12	Merge branch 'master' of https://github.com/highfidelity/hifi into 21369	2017-06-13 10:10:44 +05:30
Andrew Meadows	321e307c9f	Merge pull request #10609 from 1P-Cusack/21317 ... WL21317 helper functions for getting into avatar coordinate space	2017-06-12 11:18:29 -07:00
Chris Howe	08d93173f0	Minor code feedback changes, moving test scripts to developer/tests.	2017-06-09 11:07:56 -04:00
NeetBhagat	ead0d42cf3	Merge branch 'master' into 21369 ... # Conflicts: # libraries/gl/src/gl/OffscreenQmlSurface.cpp # libraries/gl/src/gl/OffscreenQmlSurface.h	2017-06-07 15:47:19 +05:30
NeetBhagat	904e25c9e3	intial commit #21369 Working on clear method of console	2017-06-07 14:37:18 +05:30
Olivier Prat	8af2f75996	Added FadeManager to centralize some common fade effect data and functions	2017-06-06 16:11:12 +02:00
NeetBhagat	0f9cd5d0c7	intial commit hifi: #21369 Implement parts of the JS "console" object	2017-06-06 15:20:08 +05:30
Olivier Prat	1936c209a5	Working fade debugging scripts for both opaque and transparents	2017-06-05 17:21:33 +02:00
Olivier Prat	08fcd6c357	Added new shaders	2017-06-05 16:32:36 +02:00
Olivier Prat	1433ae4b34	Merged from 21274	2017-06-05 11:12:57 +02:00