3348 commits

Author	SHA1	Message	Date
Zach Fox	6f2e7f5b83	Tweak the Snapshot 'Share' button to make its purpose more clear	2017-07-05 12:39:15 -07:00
Seth Alves	d917878638	fix whitespace	2017-07-05 11:29:09 -07:00
Seth Alves	ab340530b8	don't do a lot of processing during the mouse-move event handler	2017-07-05 11:27:13 -07:00
Mohammed Nafees	eb354a4333	Cleanup menu shortcut keys	2017-07-05 14:50:48 +05:30
ZappoMan	d5acc8a6f9	Merge branch 'master' of https://github.com/highfidelity/hifi into godview	2017-07-03 12:21:29 -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	3f48c7aef5	Merge pull request #10855 from jherico/snapshot ... Fix snapshot connection errors	2017-06-30 12:58:48 -07:00
utkarshgautamnyu	82597ac424	Update snapshot.js	2017-06-30 10:22:05 -07:00
Burt Sloane	2b111358e1	extra quote	2017-06-29 16:49:00 -07:00
Brad Davis	6e5eff9407	Fix snapshot connection errors	2017-06-29 10:01:48 -07:00
utkarshgautamnyu	e6be838e79	Update snapshot.js	2017-06-28 15:30:49 -07: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
David Rowe	bed0e8ef87	Merge branch 'master' into 21396 ... # Conflicts: # interface/src/avatar/MySkeletonModel.cpp	2017-06-26 12:07:25 +12: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
David Rowe	9d0407cbdf	Merge branch 'master' into 21396	2017-06-23 16:52:04 +12: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
Burt Sloane	f1485afccc	public script	2017-06-22 13:01:11 -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
David Rowe	6ff8aed5e3	Merge branch 'master' into 21396	2017-06-22 23:54:15 +12: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
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
Burt Sloane	4f7a1a6e2e	got rid of tabs	2017-06-15 16:35:53 -07:00
Burt Sloane	7022c4009f	midi in and out	2017-06-15 15:18:06 -07:00
Zach Pomerantz	3093a73ce1	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-15 15:04:06 -04:00
Seth Alves	023ca85623	remove chat from default scripts	2017-06-15 09:27:43 -07:00
NeetBhagat	a6b1b17d45	Merge branch 'master' into 21369	2017-06-15 11:04:22 +05:30
David Rowe	a8501a7ac6	Remove old Leap Motion code	2017-06-15 14:45:40 +12:00
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
Zach Pomerantz	a8f69bb2e0	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-13 17:41:52 -04:00
Zach Pomerantz	e7da007acd	only show Audio menu title when appropriate	2017-06-13 17:13:39 -04:00
Zach Pomerantz	20c0dac8e8	update QML with Audio.muted	2017-06-13 16:10:16 -04:00
Zach Pomerantz	337b6bca14	update JS with Audio.muted	2017-06-13 16:02:58 -04:00
Anthony Thibault	0d46b78bff	Merge pull request #10541 from Menithal/21324 ... Reworked Particle Editor UI	2017-06-13 13:00:54 -07:00
NeetBhagat	9646eba873	Complete console.trace and added a testcases for all 13 functions.	2017-06-13 23:52:48 +05:30
Matti Lahtinen	35f83afd09	Removed unneccessary print	2017-06-13 20:43:14 +03:00
Menithal	c2c1e607c0	Formating	2017-06-13 20:31:41 +03:00
Menithal	395cc55fb2	Fixed formatting	2017-06-13 20:20:54 +03:00
Menithal	020760cc97	21324: Fixed accidental inccorect bracket	2017-06-13 20:16:56 +03:00
Menithal	00701eb5c7	Merge remote-tracking branch 'origin/master' into 21324	2017-06-13 19:08:37 +03:00
Menithal	0edb763dac	21324: Formatting and PR Feedback Changes	2017-06-13 19:06:47 +03:00
NeetBhagat	b0e9c62c12	Merge branch 'master' of https://github.com/highfidelity/hifi into 21369	2017-06-13 10:10:44 +05:30
Zach Pomerantz	b37a0239b0	up to reverb (needs cherry-picking)	2017-06-12 18:00:52 -04:00
Bradley Austin Davis	1968ecbc8f	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
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
NeetBhagat	e6a5930365	Merge branch 'master' into 21369	2017-06-12 11:17:26 +05:30
Seth Alves	92fe8145be	Merge pull request #10616 from vladest/create_button_sticked ... Set active button property isActive before Home menu redraw. Makes su…	2017-06-11 13:43:41 -07:00
Seth Alves	eb049c8c6e	Merge pull request #10624 from misslivirose/feat/add-primitive-shapes ... Add additional primitive shapes	2017-06-09 19:02:54 -07:00
Clément Brisset	8e62bdea40	Merge pull request #10538 from ctrlaltdavid/21345 ... Position tablet relative to hand	2017-06-09 17:01:37 -07:00
David Rowe	fff8876b21	Code review	2017-06-10 09:33:45 +12:00
Chris Howe	08d93173f0	Minor code feedback changes, moving test scripts to developer/tests.	2017-06-09 11:07:56 -04:00
NeetBhagat	c5d8268007	Merge branch 'master' of https://github.com/highfidelity/hifi into 21369	2017-06-09 18:04:34 +05:30
Seth Alves	759a87c27e	Merge pull request #10647 from misslivirose/feat/move-chat-defaultscripts ... Move chat app to run with default scripts	2017-06-08 20:26:34 -07:00
Liv Erickson	6657c4d997	Update chat.js ... remove stray semicolon	2017-06-08 17:22:18 -07:00
Seth Alves	d87b858c0a	Merge pull request #10619 from NeetBhagat/4869-Entity-resize-issue ... 4869 entity resize issue	2017-06-08 16:34:07 -07:00
Seth Alves	9fa74029c7	Merge pull request #10633 from mnafees/21299 ... CR for Job #21299 - Save category on Marketplace when using back button	2017-06-08 16:10:56 -07:00
Vladyslav Stelmakhovskyi	b7f8cc7f0b	Fix intendantion	2017-06-08 22:58:40 +02:00
Liv	03edb06ecb	change design to run chat separately so it can be removed if users prefer to not use it	2017-06-08 13:46:33 -07:00
Liv	0e27ad767c	Move chat app to be included as part of the default scripts	2017-06-08 13:07:01 -07:00