2943 commits

Author	SHA1	Message	Date
Zach Fox	880bcf3b1e	Checkpoint	2017-04-27 14:01:06 -07:00
Zach Fox	c08b40b950	Initial sharing code hooked up	2017-04-27 14:01:06 -07:00
Zach Fox	01e78612c7	Soooo much progress today	2017-04-27 14:01:06 -07:00
Zach Fox	16b4af8a9d	Rearchitecture	2017-04-27 14:01:06 -07:00
Zach Fox	2880b22f9f	External share buttons!	2017-04-27 14:01:06 -07:00
Zach Fox	4270086a22	Support 1 and 2 images	2017-04-27 14:01:06 -07:00
Zach Fox	0b4cd41d75	More and more progress!	2017-04-27 14:01:06 -07:00
Zach Fox	a4f428a6e6	Lots of progress	2017-04-27 14:01:06 -07:00
Zach Fox	7acdc86644	Progress	2017-04-27 14:01:05 -07:00
Zach Fox	0860352caa	Checkpoint before switching to crash duty	2017-04-27 14:01:05 -07:00
Howard Stearns	88c3b4d9d3	Merge pull request #10258 from howard-stearns/watch-for-announcements ... watch for announcements	2017-04-27 14:00:39 -07:00
Seth Alves	467505e421	Merge branch 'master' of github.com:highfidelity/hifi into grab-try-timer-instead-of-update	2017-04-27 10:33:04 -07:00
Seth Alves	93f9716557	merge from upstream	2017-04-27 10:17:00 -07:00
Seth Alves	15661987be	load tablet overlay models with higher priority	2017-04-27 10:16:08 -07:00
Vladyslav Stelmakhovskyi	1916eafc41	Trigger rebuild	2017-04-27 16:02:47 +02:00
Vladyslav Stelmakhovskyi	0d53b82326	Renamed EDIT to CREATE	2017-04-27 09:30:00 +02:00
volansystech	87ceebca82	Merge branch 'master' of https://github.com/highfidelity/hifi into 21200 ... # Conflicts: # scripts/system/controllers/handControllerGrab.js	2017-04-27 12:58:18 +05:30
Seth Alves	60453f8748	Merge pull request #10294 from ctrlaltdavid/record-for-marketplace ... Make record script able to be put on the marketplace	2017-04-26 19:34:39 -07:00
Thijs Wenker	2fd6786225	Merge pull request #10295 from PhilipRosedale/halfDuplex ... Reduce log spam	2017-04-27 02:17:48 +02:00
Philip Rosedale	a880ca1262	Reduce log spam	2017-04-26 16:51:26 -07:00
David Rowe	9c7353deb2	Make record script able to be put on the marketplace	2017-04-27 11:22:25 +12:00
anshuman64	d146431e9b	Merge pull request #10268 from druiz17/input-recorder ... Input recorder/ input playback system for all input actions	2017-04-26 16:20:20 -07:00
anshuman64	c088bd6891	Merge pull request #10271 from humbletim/21281 ... CR Job #21281 -- Doppleganger Mirror	2017-04-26 16:18:14 -07:00
Howard Stearns	7654823775	Merge pull request #10292 from thoys/make-connection-fix ... makeUserConnection.js Fix for alternative skeletons	2017-04-26 16:02:16 -07:00
Zach Fox	9ace7a7488	Merge pull request #10279 from andrewd440/21174 ... 21174 Make the Particle Emitter Easier to Use	2017-04-26 15:35:29 -07:00
humbletim	6e07933356	uncomment UserActivityLogger.logAction	2017-04-26 18:28:54 -04:00
humbletim	f8bbd9174c	Merge remote-tracking branch 'upstream/master' into 21281	2017-04-26 18:26:15 -04:00
anshuman64	5bd9b2e631	Merge pull request #10130 from ctrlaltdavid/21249 ... New avatar record and playback script	2017-04-26 15:18:30 -07:00
humbletim	cabeced66e	* changes per feedback and testing ... * add support for UserActivityLogger.logAction (commented-out, pending #10130) * autodisable doppleganger when avatar changes model * autodisable doppleganger when user moves to a different domain * use ModelCache.prefetch for detecting model load status * expose new signals to help keep activity logging and debugging decoupled	2017-04-26 17:51:21 -04:00
Thijs Wenker	26173700b8	Merge pull request #10267 from Triplelexx/21287 ... 21287 - Newly created entities in Edit.js should be grabbable	2017-04-26 23:16:04 +02:00
Thijs Wenker	bf81ae78b9	Merge branch 'master' of https://github.com/highfidelity/hifi into make-connection-fix ... # Conflicts: # scripts/system/makeUserConnection.js	2017-04-26 22:52:57 +02:00
David Rowe	a68ee02e8d	Log script start-up	2017-04-27 08:41:29 +12:00
Brad Hefta-Gaub	f1bd371fbe	Merge pull request #10175 from PhilipRosedale/springHold ... New Tutorial and entity scripts	2017-04-26 13:16:17 -07:00
Triplelexx	e295ab2778	change location of menu item Create Entities As Grabbable	2017-04-26 21:13:39 +01:00
Thijs Wenker	d05229d3b4	fix conversion	2017-04-26 22:11:56 +02:00
Thijs Wenker	20a9b60e7b	this might make it work	2017-04-26 21:42:36 +02:00
Triplelexx	06b3b84145	changes from CR	2017-04-26 18:50:15 +01:00
Seth Alves	aeaa95b7a0	Merge branch 'master' of github.com:highfidelity/hifi into grab-try-timer-instead-of-update	2017-04-26 10:23:27 -07:00
Seth Alves	186b86e3d4	load stylus model before it's needed so that it will appear quickly	2017-04-26 10:23:20 -07:00
Seth Alves	37233b9fdb	avoid a rare script-crash	2017-04-26 10:19:50 -07:00
Thijs Wenker	0363e96f34	Allow skeletons with different bone structures to become friends (still requires hands)	2017-04-26 18:55:50 +02:00
Thijs Wenker	a25584c90f	ESLINT, style and spelling fixes	2017-04-26 18:51:55 +02:00
Zach Fox	3e24296996	Swap the two lines	2017-04-26 09:10:05 -07:00
Dante Ruiz	d8e6e8e7d0	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-26 16:53:02 +01:00
Dante Ruiz	79d827c6be	added requested features	2017-04-26 16:52:51 +01:00
Howard Stearns	0f8ee7051c	lint	2017-04-26 08:20:12 -07:00
David Rowe	4581b9a0df	Refresh countdown number upon reopening dialog	2017-04-26 20:13:21 +12:00
Triplelexx	01b11022e3	add menu item to control grabbable setting on newly created entites	2017-04-26 07:26:00 +01:00
humbletim	84c8b2945a	detect and update doppleganger when user changes skeletonModelURLs; cleanup	2017-04-26 01:58:51 -04:00
Philip Rosedale	8826dbef78	removed old gravity example	2017-04-25 22:37:20 -07:00
Philip Rosedale	c69d064cc3	code review fixes	2017-04-25 22:14:03 -07:00
David Rowe	06f56f024b	Increase delay of checking a recording loaded to reduce false positives	2017-04-26 15:55:59 +12:00
David Rowe	c5f384d8fb	Don't fade playback avatar when approaches observer	2017-04-26 14:02:45 +12:00
David Rowe	4a5f84f4b9	Merge branch 'master' into 21249 ... # Conflicts: # libraries/audio-client/src/AudioClient.cpp	2017-04-26 13:24:18 +12:00
Anthony J. Thibault	1b9e609447	viveMotionCapture.js: updated to route pucks through input system ... Removed use of animationStateHandler() to set IK targets.	2017-04-25 17:23:15 -07:00
Thijs Wenker	5457b8d214	Merge pull request #10260 from PhilipRosedale/halfDuplex ... Half Duplex script	2017-04-26 01:47:16 +02:00
Dante Ruiz	5a9cf554e7	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-25 23:57:48 +01:00
Philip Rosedale	16dd6a2ce1	Code review / lint	2017-04-25 15:37:39 -07:00
Anthony J. Thibault	1931a8d1f6	viveMotionCapture.js: can now disable puck control, with a second controller squeeze	2017-04-25 15:13:23 -07:00
Anthony J. Thibault	ce8b71ff94	viveMotionCapture.js: can now disable puck control, with a second controller squeeze	2017-04-25 15:07:16 -07:00
David Rowe	c83f82f5da	Delay start of recording until after beep finishes	2017-04-26 08:59:50 +12:00
Brad Hefta-Gaub	1962a49f3b	Merge pull request #10225 from sethalves/bullet-constraints-1 ... Bullet constraints + far-grab bootstrap fix	2017-04-25 13:36:47 -07:00
humbletim	a833912399	cleanup and documentation	2017-04-25 16:30:05 -04:00
Brad Hefta-Gaub	0783433d75	Merge pull request #10251 from birarda/edit-baked-column ... add a column to edit.js to identity baked models	2017-04-25 13:04:48 -07:00
howard-stearns	ee9b953b1c	typo	2017-04-25 12:12:26 -07:00
Dante Ruiz	8c020a0ec2	saving work	2017-04-25 18:01:19 +01:00
Philip Rosedale	eaa2102d3f	Code review fixes	2017-04-24 21:03:17 -07:00
Philip Rosedale	663e682f23	Merge branch 'halfDuplex' of https://github.com/PhilipRosedale/hifi into springHold	2017-04-24 20:46:48 -07:00
David Rowe	79346673ed	Log user activity events in record and playback scripts	2017-04-25 13:43:28 +12:00
Andrew Lowry	5ffb8eba86	Initialize background color for color picker correctly.	2017-04-24 20:37:43 -04:00
Anthony J. Thibault	8b16a7c7e1	Added hipsIkTest.js test script	2017-04-24 16:40:24 -07:00
Clément Brisset	77cd2d08b2	Merge pull request #10106 from MrRoboman/W-21204-tetherball-toy ... Added tetherball create and entity scripts	2017-04-24 16:36:21 -07:00
humbletim	6f178ee1ec	initial checkin of doppleganger module and tablet app scripts	2017-04-24 19:28:03 -04:00
Dante Ruiz	b023356fb7	added javascript file	2017-04-24 22:29:13 +01:00
Triplelexx	d689a43678	changes from CR	2017-04-24 22:07:51 +01:00
David Rowe	c0a258f9b3	Disable "load" button while making a recording	2017-04-25 09:04:26 +12:00
Triplelexx	d63c4d11c7	enable grabbable property for all newly created entities	2017-04-24 21:33:08 +01:00
David Rowe	d73fd6e08d	Update AC script URL in info	2017-04-25 07:42:21 +12:00
Andrew Lowry	6a218eaca9	Embeds colpick color picker in dat.GUI for particle explorer. ... Cleans up eslint for particleExplorer.js.	2017-04-24 13:35:37 -04:00
Andrew Lowry	aea89824c5	Switches tablet edit tab to particle explorer when particle entities are ... selected or created.	2017-04-24 13:35:37 -04:00
Andrew Lowry	ecf3826050	Always show hand lasers when in edit mode.	2017-04-24 13:35:37 -04:00
Andrew Lowry	8479d835b2	Adds laser selection of particle systems while in edit mode in HMD.	2017-04-24 13:35:37 -04:00
volansystech	1abbca6737	Merge branch 'master' into 21200	2017-04-24 19:09:02 +05:30
Philip Rosedale	92368d981b	Half Duplex script	2017-04-21 18:22:53 -07:00
howard-stearns	fac40f51d9	message waiting art	2017-04-21 16:00:23 -07:00
David Rowe	7fe0ba19b5	Don't display the "Record" button as pressed while recording	2017-04-22 10:05:02 +12:00
howard-stearns	ce7f3197f6	watch for announcements	2017-04-21 14:27:38 -07:00
Seth Alves	ec687bdb4b	cleanups	2017-04-21 11:03:43 -07:00
Seth Alves	1e6b2682c9	use timers rather than relying on update calls	2017-04-21 10:17:57 -07:00
David Rowe	ce86ce4530	Red buttons to unload recordings	2017-04-21 19:45:14 +12:00
David Rowe	8060e98bd5	Right-align "i" icon and update info text	2017-04-21 17:46:30 +12:00
David Rowe	d064511121	Rearrange dialog controls	2017-04-21 17:01:29 +12:00
David Rowe	1aa6e20791	Change "Record" button to "Stop" while recording	2017-04-21 16:15:49 +12:00
David Rowe	477237cca2	Red "recording" ring animation with countdown numbers inside	2017-04-21 16:07:50 +12:00
David Rowe	aaf9b40bb3	New app icon	2017-04-21 15:20:08 +12:00
David Rowe	daedb94b04	Merge branch 'master' into 21249	2017-04-21 14:50:28 +12:00
David Rowe	076bf0943e	Attach HMD "recording" indicator to camera	2017-04-21 10:33:24 +12:00
Stephen Birarda	3452dd0251	increment colspan count in table footer	2017-04-20 15:20:48 -07:00
Stephen Birarda	924624b127	add new glyphs with check, reference in entityList	2017-04-20 14:21:13 -07:00
Stephen Birarda	f64efe18c0	add an isBaked column to edit.js	2017-04-20 14:21:13 -07:00
volansystech	9e2899678a	Resolving conflicts of #21206	2017-04-20 23:54:41 +05:30
volansystech	abc87c0338	Increased accuracy for converting far-grab to near-grab for every object ... Near-grab radius reduced to its default = 0.3	2017-04-20 23:37:16 +05:30
Seth Alves	f7378abb08	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-20 02:40:10 -07:00
David Rowe	43619d1db1	Finish with TODOs	2017-04-20 14:22:54 +12:00
David Rowe	0da4e3e3c4	Display scrollbar in recordings table when needed	2017-04-20 14:19:25 +12:00
Brad Hefta-Gaub	a555846d5d	Merge pull request #10235 from volansystech/21206 ... 21206 Far grab improvement to draw held entity toward yourself	2017-04-19 14:33:09 -07:00
David Rowe	2108300272	Merge branch 'master' into 21249	2017-04-20 08:43:00 +12:00
volansystech	b194ddeb66	Resolve Comments of @sethalves	2017-04-19 16:39:23 +05:30
David Rowe	f7d87c4c28	Tweak start-up delay	2017-04-19 16:32:46 +12:00
David Rowe	00b6b2a2c0	Implement desktop recordings browser dialog	2017-04-19 12:34:59 +12:00
howard-stearns	3113dced7b	Be sure to callback even on profile failure.	2017-04-18 12:06:44 -07:00
Rob Kayson	a0c8c4df52	tetherball stick and ball remove themselves after 2 seconds if user who has them equipped leaves the domain	2017-04-18 10:07:02 -07:00
volansystech	e5c7587ad8	Improve far grabbing based on timescale.	2017-04-18 20:01:02 +05:30
David Rowe	dae6d6fb69	Stub desktop dialog to select recording to play from ATP assets	2017-04-18 11:43:42 +12:00
David Rowe	f920192244	Fix up script tear-down	2017-04-18 08:22:29 +12:00
volansystech	7e0efed062	Improve speed of grabbing.	2017-04-18 00:54:01 +05:30
David Rowe	7dcda47f95	Fix recording GIF still displaying when reopen tablet to stop recording	2017-04-16 12:57:37 +12:00
Seth Alves	db98020974	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-15 07:22:16 -07:00
David Rowe	15128faa49	Fix (work around) tablet access at Interface start-up crashing Interface	2017-04-15 17:11:03 +12:00
David Rowe	ef8f36026c	Improve speed of starting playing animations at server start-up	2017-04-15 13:20:42 +12:00
David Rowe	e91cf4a4e8	Use "i" circle for info button	2017-04-15 12:50:00 +12:00
David Rowe	e7fb268843	Update to use modified Recording API	2017-04-15 12:18:50 +12:00
Anthony J. Thibault	d3b4a2c08d	better "auto" configuration	2017-04-14 17:00:47 -07:00
Anthony J. Thibault	0ebaba7cf8	Now supports sensorConfig with hips and chest sensors	2017-04-14 17:00:46 -07:00
Anthony J. Thibault	adaf7dda7c	Check in viveMotionCapture test script.	2017-04-14 17:00:45 -07:00
Seth Alves	371118a6c0	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-14 16:26:30 -07:00
Zach Fox	b410399a16	Resolve your paths, silly!	2017-04-14 16:26:29 -07:00
Zach Fox	85e5173abe	Fix embedded location	2017-04-14 16:11:37 -07:00
Zach Fox	f81dce5e70	Fix the bug	2017-04-14 15:42:19 -07:00
Chris Collins	6a6800b8c3	Merge pull request #10222 from sethalves/fix-late-touch-cant-grab-tablet ... fix can't grab tablet	2017-04-14 14:57:06 -07:00
David Rowe	2731c13a5c	Merge remote-tracking branch 'upstream/master' into 21249	2017-04-15 09:51:16 +12:00
Andrew Meadows	45bb639ef5	Merge pull request #10128 from kunalgosar/fingerpainting ... Make it easier to exit FingerPaint	2017-04-14 14:34:57 -07:00
Seth Alves	110cfb47d1	turn off handControllerGrab debug prints	2017-04-14 14:23:27 -07:00
Seth Alves	6420ddd038	grab script checks for touch devices continually, rather than just when the script starts	2017-04-14 14:20:04 -07:00
kunalgosar	891d52909e	fixed typo in comments	2017-04-14 14:10:19 -07:00
Sam Gateau	3519a72f8a	Merge pull request #10190 from samcake/ambient-bis ... Introducing a tool to debug the current Zone Stack	2017-04-14 13:28:59 -07:00
Seth Alves	d17d12446b	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-14 12:49:03 -07:00
Thijs Wenker	6f58e91d76	Merge pull request #10121 from birarda/bug/recording-cache ... cleanup Agent RSI handling, make loadRecording async	2017-04-14 21:35:51 +02:00
Stephen Birarda	7b48feca66	address code review comments	2017-04-14 11:53:53 -07:00
Seth Alves	1009182c06	grab and handControllerGrab use new far-grab action	2017-04-14 11:52:07 -07:00
Seth Alves	af5a352f02	turn on handControllerGrab debug prints	2017-04-14 08:10:31 -07:00
David Rowe	f715850766	Display animated GIF while recording	2017-04-14 16:13:45 +12:00
David Rowe	08f4fc2cf9	Remove hover highlight from "x"s	2017-04-14 15:51:59 +12:00
David Rowe	c2d8755b15	Merge branch 'master' into 21249	2017-04-14 15:32:45 +12:00
David Rowe	11a2559df9	Use HiFi glyph for delete "x"s	2017-04-14 15:30:28 +12:00
David Rowe	5f333ee02c	Style "i" button and info text	2017-04-14 15:14:39 +12:00
David Rowe	1d43e5a992	Style overall dialog layout	2017-04-14 15:12:36 +12:00
David Rowe	fd919f0db7	Play sounds during countdown and beep when recording starts and finishes	2017-04-14 10:34:15 +12:00
David Rowe	072e06123f	Fix recording just made not being played	2017-04-14 10:02:15 +12:00
volansystech	70855b1c53	Improve the accuracy of Far to near Equip State.	2017-04-13 19:24:47 +05:30