2989 commits

Author	SHA1	Message	Date
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
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
Delanir	956d1e9d95	Fix Code Standard	2017-04-19 16:30:49 +01: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
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
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
Seth Alves	d17d12446b	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-14 12:49:03 -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
David Rowe	75e4fb3820	On tablet with option enabled recording ends when open tablet or dialog	2017-04-13 19:28:40 +12:00
David Rowe	8f3789421f	Show "busy" spinner when counting down or recording	2017-04-13 19:23:22 +12:00
David Rowe	9638b093d8	Fix number of available player instances being wrong on tablet	2017-04-13 18:55:02 +12:00
David Rowe	ff42715a15	Retain "Record" button's pressed state when close and reopen dialog	2017-04-13 18:41:55 +12:00
David Rowe	45ca8438fa	Persist finish-on-open checkbox value to settings	2017-04-13 18:29:39 +12:00
David Rowe	b508d6882f	Add checkbox that stops countdown/finishes recording when reopen dialog	2017-04-13 17:59:28 +12:00
David Rowe	84cfe1cb75	Don't close dialog when start recording; press "Record" again to finish	2017-04-13 17:00:35 +12:00
David Rowe	c369b1314a	Remove countdown overlays	2017-04-13 16:32:03 +12:00
David Rowe	afd82f09c0	Provide instructions on running the AC player script	2017-04-13 15:18:04 +12:00
David Rowe	e21e15c064	Update warning dialog to refer to player "instance"	2017-04-13 14:01:37 +12:00
David Rowe	5ad44b6caf	Display empty rows for unused players	2017-04-13 13:50:26 +12:00
David Rowe	24a68ea685	Report the numnber of free players rather than total number	2017-04-13 13:40:52 +12:00
David Rowe	464bc17491	Column heading for "unload" buttons	2017-04-13 13:40:20 +12:00
David Rowe	8bbce53f74	Reset player details when domain restarts or user teleports	2017-04-13 12:23:10 +12:00
Seth Alves	0dab94fada	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0	2017-04-12 16:34:46 -07:00
Seth Alves	0eb9507a10	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0	2017-04-12 16:25:50 -07:00
Zach Fox	3f91fb8e55	Remove unnecessary comment	2017-04-12 14:45:57 -07:00
Zach Fox	c724c2e50b	New loading icon	2017-04-12 14:45:57 -07:00
Zach Fox	87b2d5bf8a	New loading icon	2017-04-12 14:45:57 -07:00
Zach Fox	75f1168b19	Clearer function names	2017-04-12 14:45:57 -07:00
Zach Fox	7b92989b1d	Fix it	2017-04-12 14:45:57 -07:00
Zach Fox	2579ac1baa	It's working!	2017-04-12 14:45:57 -07:00
Zach Fox	e296383b1b	Checkpoint!	2017-04-12 14:45:56 -07:00
volansystech	7bc3435cfa	Initial Commit.. ... If distanceToObject from avatar is more than 15, we are accelarting entity travel by 2x. This will help user to grab the entity in lesser time.	2017-04-13 02:51:30 +05:30
David Rowe	7dddd266ba	Merge branch 'master' into 21249	2017-04-13 08:39:32 +12:00
Seth Alves	026dde2e68	allow kinematic near-grab to be turned on or off for a given entity	2017-04-12 10:14:16 -07:00
volansystech	5639a3f92a	Far to near grab: If the object is capable of being equipped, transfer from far-grab to an equipped state.	2017-04-12 20:08:26 +05:30
David Rowe	50a06db1b9	Display "REC" indicator when recording	2017-04-12 15:56:59 +12:00
David Rowe	f30dc4b560	Add a "record" button to initiate recording	2017-04-12 15:04:29 +12:00
David Rowe	905560b96d	Remove checkbox and record-on-close functionality	2017-04-12 14:48:15 +12:00
Thijs Wenker	695c55bc3d	fix teleport cool-in, added missing TARGETTING state and some ESLINT style fixes	2017-04-12 03:44:24 +02:00
David Rowe	3ae388bded	Rework auto-playback	2017-04-12 13:32:34 +12:00
David Rowe	0d9e0ebfec	Merge branch 'master' into 21249	2017-04-12 08:45:01 +12:00
Chris Collins	b07ed13023	Merge pull request #10184 from druiz17/snapshot-fix ... snapshot bug fixes	2017-04-11 13:00:46 -07:00
volansystech	99af493ac8	Resolved the issue from the Initial commit - "grabbedEntity" stays into that grabbed position for a few seconds (hanging into mid of air) before dropping down automatically. ... Successfully converted far grab into near grab when entity is closer to the Avatar. When Trigger is released after converted far grab into near grab far, the obect is dropped successfully.	2017-04-11 21:57:01 +05:30
David Rowe	86baf785aa	Add "Load" button	2017-04-11 15:23:09 +12:00
Dante Ruiz	daf25c1fe8	fix crashes when clicking in the homebutton	2017-04-11 00:25:08 +01:00
David Rowe	559fba39ab	Remove avatar after stopping recording	2017-04-11 10:17:52 +12:00
David Rowe	9a9bcaf2ae	Stop button stops playing recording	2017-04-11 09:37:57 +12:00
Dante Ruiz	382204a9a9	open feed after logging in	2017-04-10 22:33:07 +01:00
Delanir	fcde85e51b	Fix Style ... - Replace tabs by 4 spaces; - Add indents and spaces; - Formated multi/line statement - Removed out-of-scope comments.	2017-04-10 22:16:56 +01:00
Dante Ruiz	df6498c67c	fix snapshot login for toolbar-mode	2017-04-10 21:59:37 +01:00
Dante Ruiz	6922ba5c77	removed unnessary prints	2017-04-10 21:08:40 +01:00
Dante Ruiz	e0f19944bc	Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix	2017-04-10 20:58:46 +01:00
Dante Ruiz	4e94aaa9e8	finished allowing to go back to previous app	2017-04-10 20:58:10 +01:00
Delanir	19de579057	Merge branch 'master' of https://github.com/CraftsmanMG/hifi	2017-04-10 20:37:51 +01:00
Delanir	25a89a631b	hifi: #21216 - Resize entities with hand controllers while editing ... hifi: #21216 - Resize entities with hand controllers while editing Modified StretchTool to allow for movement in 3D - uses data from motion controller (position and rotation) to stretch/resize the entities/primitives in 3D. - the range of the resize depends on distance to the object.	2017-04-10 20:25:30 +01:00
David Rowe	bd63960876	Add table of recordings currently being played	2017-04-11 07:23:52 +12:00
David Rowe	0a19b502fd	Merge branch 'master' into 21249	2017-04-11 07:04:05 +12:00
David Rowe	9495bf6a47	Fix auto-playback logic	2017-04-10 19:56:46 +12:00
David Rowe	8e3bc31c36	Fix persisting new recording	2017-04-10 19:28:21 +12:00
David Rowe	b5bf7dc12f	Tidying	2017-04-10 16:47:35 +12:00
David Rowe	6a88398e8e	Handle AC script not being able to create an entity	2017-04-10 15:55:05 +12:00
David Rowe	1cc215e14b	Fix test that recording just made started playing	2017-04-10 15:31:38 +12:00
David Rowe	3b32a4f74f	Address AC scripts claiming same entity to play	2017-04-10 15:04:54 +12:00
Anthony Thibault	746b7aadbd	Merge pull request #10133 from sethalves/fix-teleport-which-something-equipped ... Fix teleport when something equipped	2017-04-09 19:00:21 -07:00
David Rowe	6896fe3ac6	Merge branch 'master' into 21249	2017-04-10 09:05:57 +12:00
David Rowe	d60d4d0755	Auto-play recording at start-up	2017-04-09 15:52:56 +12:00
David Rowe	adabcab888	Add invisible entity to persist playback of recording	2017-04-08 16:24:58 +12:00
David Rowe	d1e49cd926	Add and stub out stop, autoplay, and persistence to AC script	2017-04-08 14:57:37 +12:00
Dante Ruiz	86c67a3017	tablet pages	2017-04-08 02:01:21 +01:00
Chris Collins	8e12f62cbb	Merge pull request #10153 from druiz17/goto-fix ... Ability to toggle goto with the crt-l and enter keys	2017-04-07 16:36:41 -07:00
David Rowe	ef4f3368f9	Play recording just made from original start position and orientation	2017-04-08 11:06:34 +12:00
David Rowe	ebe3561582	Merge branch 'master' into 21249	2017-04-08 10:46:16 +12:00
volansystech	e0b08a5e4e	Initial Commit of far to near grab conversion. Works only if object drawn at chest level And Object is near by to hand.	2017-04-07 21:55:26 +05:30
Howard Stearns	5d341778c5	fix notification word wrapping	2017-04-07 07:08:19 -07:00
David Rowe	1ef5f048a3	Inform user if recording failed to start	2017-04-07 18:53:20 +12:00
David Rowe	ce898ae42a	Play recording	2017-04-07 18:38:55 +12:00
David Rowe	75d970f5d5	Remove unresponsive players from list	2017-04-07 17:30:03 +12:00
David Rowe	81d8d238de	Refactor log and error messages	2017-04-07 17:13:23 +12:00
David Rowe	5e55233934	Assignment client player script receives "play" command from recorder	2017-04-07 17:04:24 +12:00
David Rowe	506a414762	Lint fix	2017-04-07 14:06:16 +12:00
David Rowe	858e9650a3	Encapsulate recording methods in Recorder object	2017-04-07 14:03:08 +12:00
howard-stearns	b089fd03b8	make connection messaging when not logged in	2017-04-06 16:48:11 -07:00
David Rowe	68901c8af5	Merge branch 'master' into 21249	2017-04-07 11:04:43 +12:00
David Rowe	49907970fb	Fix countdown showing if restart with dialog open and recording enabled	2017-04-07 11:01:11 +12:00
David Rowe	f164fe7532	Improve error handling	2017-04-07 10:46:40 +12:00
Dante Ruiz	a89081601c	fix merge issues	2017-04-06 22:31:47 +01:00
Dante Ruiz	52fd446d4d	toggle goto in tablet	2017-04-06 22:27:37 +01:00
Howard Stearns	f7ef587c61	Merge pull request #10138 from davidkelly/dk/3935 ... Now you can forget connections	2017-04-06 14:05:25 -07:00
David Kelly	34a2cefb98	Merge pull request #10132 from davidkelly/dk/analyticsForConnections ... initial analytics for connections	2017-04-06 10:45:39 -07:00
David Kelly	a92162dea9	no mo useless debug statements	2017-04-06 08:50:22 -07:00
David Rowe	23c937e55d	Make avatar recording and upload to asset server	2017-04-06 18:50:47 +12:00
David Rowe	a9f5b60319	Fix recording starting on tablet when close dialog rather than tablet	2017-04-06 15:32:42 +12:00
David Rowe	982c0ec559	Display countdown in overlay	2017-04-06 15:01:53 +12:00
David Kelly	61ece265f4	now you can forget connections	2017-04-05 18:16:16 -07:00
David Rowe	4580b89aa6	Add countdown delay before starting recording	2017-04-06 12:08:27 +12:00
David Rowe	096909d423	Close dialog if open when stop script	2017-04-06 10:10:07 +12:00
David Rowe	b8de31db12	Make toolbar icon close dialog if it's open	2017-04-06 10:09:41 +12:00
David Rowe	813a5684e3	Display instruction text only if recording is enabled	2017-04-06 09:22:01 +12:00
Seth Alves	2e4e10759f	teleport raypick now ignores equipped or grabbed entities	2017-04-05 13:17:03 -07:00
David Kelly	1b6bf90843	initial analytics for connections	2017-04-05 11:10:06 -07:00
David Rowe	b29bfd4bb4	Dialog instructions refer to tablet or window as appropriate	2017-04-05 17:49:13 +12:00
David Rowe	54a0bea8c0	Toolbar icon state and start/stop recording with window closing/opening	2017-04-05 17:48:35 +12:00
David Rowe	a625fd4523	Add dialog with "Enable recording" checkbox	2017-04-05 16:20:04 +12:00
David Rowe	d748068373	Stub new avatar recording script that records when tablet is hidden	2017-04-05 13:19:46 +12:00
Anthony J. Thibault	c33f10ca1b	Recenter body on teleport, also it works more consistently. ... If your avatar happens to be squatting, your body will stand up straight after you teleport. Also, setting MyAvatar.position can sometimes fail due to the multi-threaded nature of scripting. Instead, teleport.js uses goToPosition to move the avatar, as a result teleport feels much more responsive now.	2017-04-04 18:05:46 -07:00
kunalgosar	a5b10cc51e	alert window to give directions	2017-04-04 15:35:38 -07:00
kunalgosar	b8500e45ad	added tutorial	2017-04-04 15:35:38 -07:00
kunalgosar	d66038fff2	press B to exit finger painting	2017-04-04 15:35:38 -07:00
Seth Alves	b0b214012c	Merge pull request #10118 from hyperlogic/bug-fix/tablet-restart-scripts ... Fix broken eventBridge on tablet after Reload All Scripts.	2017-04-04 10:45:08 -07:00
Anthony J. Thibault	8ff457a1b6	Fix broken eventBridge on tablet after Reload All Scripts. ... The main issue here was the "webEventReceived" connection between the OffscreenQMLSurface and the TabletProxy object. For whatever reason, if this is not a direct Signal to Slot connection, the webEventReceived event does not propagate.	2017-04-03 16:03:55 -07:00
Anthony Thibault	999bd0d339	Merge pull request #10075 from sethalves/tablet-ui ... Tablet ui -- misc changes + landscape mode	2017-04-03 10:43:34 -07:00
Seth Alves	b9e84691ad	Merge pull request #10092 from ctrlaltdavid/dead-code ... Remove some dead code in edit.js	2017-04-03 09:40:30 -07:00
Seth Alves	43e1cec8a3	merge from upstream	2017-04-03 06:28:59 -07:00
Chris Collins	3c62826ef9	Merge pull request #10091 from ctrlaltdavid/21248 ... Fix HTML controls not working properly in the tablet	2017-04-01 08:41:44 -07:00
Zach Fox	8a96969471	Merge pull request #9873 from highfidelity/PAL_v2 ... PAL v2.0	2017-03-31 17:00:41 -07:00
David Rowe	6a23f3a59b	Remove some dead code noticed in passing	2017-04-01 11:25:42 +13:00
David Rowe	f397adb22a	Reinstate scrollbars to marketplace pages	2017-04-01 11:06:27 +13:00
David Kelly	8ceb6a20f0	friend/unfriend working	2017-03-31 15:05:21 -07:00
Zach Fox	6a4c2c5e12	Fix issues; checkpoint on new ComboDialog	2017-03-31 14:56:42 -07:00
David Rowe	260309ae24	Remove CSS hack no longer needed	2017-04-01 10:53:46 +13:00
Seth Alves	54c66aff07	use tablet-ui stylus as default, rather than avatar finger	2017-03-31 13:18:40 -07:00
Seth Alves	3073b47ea3	Merge pull request #10065 from ctrlaltdavid/21242 ... Address tablet scrollbar issues	2017-03-31 12:43:53 -07:00
Ken Cooke	fa53ebef30	Merge pull request #9996 from zfox23/cleanup_selectAudioDevice ... FB3651: Fix audio devices switching when they shouldn't	2017-03-31 12:07:49 -07:00
Seth Alves	715493922e	code review	2017-03-30 17:33:01 -07:00
Zach Fox	4712ec7400	Reset pollCount; debug log when expired generated by client	2017-03-30 17:02:15 -07:00
David Rowe	a5c683192b	Improve entity properties scroll handle operation in tablet	2017-03-31 12:26:22 +13:00
Howard Stearns	0edbf1fbd9	Merge pull request #10044 from howard-stearns/pal-backend-integration ... Pal backend integration	2017-03-30 12:55:11 -07:00
Howard Stearns	3056bb16a2	typo, and delete request on abort/fail	2017-03-30 12:40:54 -07:00
Seth Alves	c62b07d26f	add setLandscape call to tablet	2017-03-30 11:36:21 -07:00
David Kelly	e66c075f8e	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-30 10:14:29 -07:00
David Rowe	9c4414cff6	No custom styling of marketplaces directory scrollbar	2017-03-30 14:38:17 +13:00
David Rowe	c7f648a6c2	Disable marketplace directory and Clara.io scrollbars in tablet	2017-03-30 14:20:32 +13:00
Zach Pomerantz	4a9fbf2bbd	delay 200ms to avoid recursive audio dev switches	2017-03-29 19:05:41 -04:00
Zach Pomerantz	c30ab4de8b	rm extra setDevice	2017-03-29 18:48:22 -04:00
Zach Fox	a6ff3fcdb7	Tablet PAL bugfix; Connections help text v1	2017-03-29 15:47:19 -07:00
Zach Fox	1b74576259	Fix tablet-close behavior for PAL; remove users-tablet.js	2017-03-29 14:53:45 -07:00
Seth Alves	ce9eb1a377	more tablet landscape changes	2017-03-29 14:21:38 -07:00
Seth Alves	371df35013	remove code related to tablet being a model rather than an overlay. start on landscape mode	2017-03-29 14:16:14 -07:00
Howard Stearns	b8f557ca54	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration	2017-03-29 13:30:15 -07:00
Howard Stearns	53d484c318	makes connections!	2017-03-29 13:23:31 -07:00
Howard Stearns	b0c97d3a82	putative connection integration for 2-machine testing	2017-03-29 12:22:26 -07:00
David Rowe	c618e8e001	Open feed in tablet after sharing snapshot from tablet	2017-03-29 16:52:52 +13:00
Zach Fox	b776f25b3b	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-28 18:09:17 -07:00
Zach Fox	81264c998b	Revert "Merge from upstream/master" ... This reverts commit b5ba4a109d.	2017-03-28 17:39:45 -07:00
Zach Fox	b5ba4a109d	Merge from upstream/master	2017-03-28 17:37:34 -07:00
howard-stearns	c2a49a582e	send credentials to local metaverse servers, and initial users data ... integration.	2017-03-28 16:44:16 -07:00
Seth Alves	4516ddf855	Merge pull request #9847 from highfidelity/tablet-ui ... Tablet ui	2017-03-28 14:48:02 -07:00
Andrew Meadows	b9e80d3fa5	Merge pull request #9972 from kunalgosar/marketsBug ... Fixed buttons on Marketplace	2017-03-28 12:45:25 -07:00
Zach Pomerantz	06bf5807ae	fix audio setting persistence for already selected device	2017-03-28 15:34:42 -04:00
Zach Pomerantz	5e0cfb6137	short-circuit audio switching on missing device	2017-03-28 15:34:13 -04:00
Zach Pomerantz	1bdef141c3	simplify audio menu parsing	2017-03-28 15:33:54 -04:00
Seth Alves	6df4dda746	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-28 11:42:14 -07:00
Seth Alves	8e38b41e44	Merge branch 'tablet-ui' of github.com:sethalves/hifi into tablet-ui	2017-03-28 11:41:58 -07:00
Seth Alves	851ea7dabc	fix initial finger/stylus setting	2017-03-28 11:41:51 -07:00
Clément Brisset	82114ae6ab	Merge pull request #9940 from Atlante45/fix/sit ... Fix a few sitting bugs noticed at the meetup	2017-03-28 11:14:31 -07:00
Dante Ruiz	e276bb52d2	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help-script	2017-03-28 18:14:28 +01:00
Dante Ruiz	b0e437cc5a	remove help button from tablet when reloading scripts	2017-03-28 18:14:05 +01:00
Seth Alves	0cae616ab5	Merge pull request #10031 from hyperlogic/bug-fix/mouse-disconnect-issue ... WebTablet.js: Don't remove or add mouse callbacks onHMDChanged	2017-03-28 10:07:52 -07:00
Seth Alves	9e675d4c93	Merge pull request #9990 from hyperlogic/bug-fix/sliders ... Added inputMode property to Web3DOverlay	2017-03-28 10:07:37 -07:00
Anthony J. Thibault	29a159b90d	WebTablet.js: Don't remove or add mouse callbacks onHMDChanged ... This should prevent the exception on destroy, caused by disconnecting a signal that is not attached.	2017-03-28 09:27:13 -07:00
David Kelly	92718b6051	cr feedback	2017-03-28 08:57:27 -07:00
Seth Alves	b50a02ea19	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-28 08:16:59 -07:00
David Rowe	6a3dea030e	Settings link	2017-03-28 15:15:33 +13:00
David Rowe	55033df354	Merge branch 'tablet-ui' into 21238-b	2017-03-28 14:47:57 +13:00
David Rowe	a6ef592353	Non-scrolling window with images scaled to fit	2017-03-28 14:43:26 +13:00
Seth Alves	cdac011472	fix home button	2017-03-27 18:21:00 -07:00
Zach Fox	0ae4ce7e98	Have I finally tamed the beast?	2017-03-27 16:15:11 -07:00
Brad Hefta-Gaub	3bdcfd8b78	Merge pull request #9796 from ZappoMan/removePropertiesFromRayPick ... remove properties from RayToEntityIntersectionResult	2017-03-27 14:26:51 -07:00
David Rowe	ead1f00bbf	Title	2017-03-28 09:10:20 +13:00
David Rowe	35305b4476	Make dialog single column with images above controls	2017-03-28 08:55:38 +13:00
David Kelly	5c1e085e7b	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-27 11:29:18 -07:00
David Kelly	76657a670c	added notifications (faked user name for now), along with switch to avatar entities	2017-03-27 11:28:57 -07:00
Anthony J. Thibault	5796cbc898	Bug-fix for touching deleted entities or overlays.	2017-03-27 10:26:33 -07:00
Zach Fox	e1a880a5d4	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-27 09:10:12 -07:00
David Rowe	e58e3fbbf7	Disconnect snapshot event handler when tablet "home" button pressed	2017-03-27 17:32:04 +13:00
David Rowe	dc3095bfcd	Fix "don't share" button not closing window	2017-03-27 16:24:14 +13:00
David Rowe	d0fc352d3b	Address event bridge being shared with other scripts	2017-03-27 16:07:58 +13:00
David Rowe	aa8a1e1dda	Open snapshot dialog in tablet or window appropriately	2017-03-27 15:04:33 +13:00
Seth Alves	bb28976d0e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-26 09:32:35 -07:00
Seth Alves	90db9af2f9	Merge pull request #9978 from Triplelexx/fix-tablet-users-typo ... fix myVisibility typo	2017-03-26 07:36:11 -08:00
Seth Alves	d45e124529	Merge pull request #9995 from hyperlogic/bug-fix/no-scroll-bar-on-marketplace ... Hide the scrollbar on the marketplace	2017-03-25 08:36:31 -08:00
Seth Alves	3abd6b3948	Merge pull request #10006 from druiz17/tablet-help ... Ported help into the tablet	2017-03-25 08:33:41 -08:00
Vladyslav Stelmakhovskyi	edb66ae704	Merge branch 'tablet-ui' into tablet-ui-audio-screen	2017-03-25 13:20:43 +01:00
Vladyslav Stelmakhovskyi	fc23c348cb	Implemented Audio settings screen for Tablet UI	2017-03-25 13:17:38 +01:00
Zach Fox	73a77f7f25	OK, how about now	2017-03-24 18:19:34 -07:00
Zach Fox	e88895935b	Revert "Actually merge from master" ... This reverts commit 056d6fbe4f.	2017-03-24 17:56:48 -07:00
Dante Ruiz	6178a86a46	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help	2017-03-24 23:56:33 +01:00
Seth Alves	f1470e34f9	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-24 15:17:52 -07:00
Brad Hefta-Gaub	9b26e8ee95	Merge pull request #9871 from Triplelexx/21208 ... 21208 - Muted microphone indicator	2017-03-24 13:07:43 -07:00
Zach Fox	31ae326880	Pretty sure about this now	2017-03-24 13:05:07 -07:00
Zach Fox	e5741869e5	Checkpoint	2017-03-24 12:22:11 -07:00
Anthony J. Thibault	7e6ff7c2fb	Scrollbar is visible on marketplace in toolbar mode.	2017-03-24 11:40:10 -07:00
Lexx	fa606446a7	remove cache buster	2017-03-24 18:27:38 +00:00
Anthony J. Thibault	54b11bb6ee	Hide the scrollbar on the marketplace	2017-03-24 11:22:50 -07:00
Zach Fox	056d6fbe4f	Actually merge from master	2017-03-24 10:10:17 -07:00
Zach Fox	915ace0087	Revert "Merge from Master" ... This reverts commit e48123b5bb.	2017-03-24 10:04:51 -07:00
ZappoMan	52335e20a2	fix typo	2017-03-24 09:59:55 -07:00
ZappoMan	bc331af6a0	Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick	2017-03-24 08:46:43 -07:00
Seth Alves	902e3d41d6	merge from upstream	2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub	9a38b36f59	Merge pull request #9970 from Triplelexx/21223 ... 21223 - Quat functions have naming inconsistencies	2017-03-24 08:12:11 -07:00
Zach Fox	665b21f2f7	Checkpoint	2017-03-23 17:08:32 -07:00
Anthony J. Thibault	bab9890fea	Added inputMode property to Web3DOverlay. ... This allows user to switch between Touch messages and Mouse messages. Added a sliderTestMain.js script which demonstrates this behavior.	2017-03-23 13:54:18 -07:00
ZappoMan	246f377a07	Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick	2017-03-23 10:40:37 -07:00
David Kelly	0edcdde746	better key mapping	2017-03-23 10:40:34 -07:00
David Kelly	a08346719c	one bit of defensive code, plus some temporary logging	2017-03-23 10:29:45 -07:00
Zach Fox	e48123b5bb	Merge from Master	2017-03-23 09:54:14 -07:00
Dante Ruiz	dfa6174069	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help	2017-03-23 17:34:50 +01:00
Seth Alves	62f10204d9	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui	2017-03-23 09:25:48 -07:00
David Kelly	aa085e577d	more vis work	2017-03-23 09:19:04 -07:00
David Kelly	a0c19d6b59	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-22 17:02:03 -07:00
David Kelly	7b52afb58b	vis changes to fade. Still needs more work	2017-03-22 17:01:42 -07:00
Zach Fox	692ef369c7	Attempted Stale PAL fix - hard to test!	2017-03-22 15:14:11 -07:00
Triplelexx	6a17e328e8	fix myVisibility typo	2017-03-22 22:13:39 +00:00
David Kelly	675612c1e9	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-22 14:56:23 -07:00
David Kelly	020dcca78d	end handshake when successful, stop handshake sound if other guy pulls out	2017-03-22 14:55:57 -07:00
Zach Fox	bf191eabb7	Some new stale PAL behavior	2017-03-22 13:35:48 -07:00
David Kelly	34a89e4b9a	added sounds, new haptics, and some cleanup	2017-03-22 13:26:51 -07:00
Dante Ruiz	3a89654111	saving work	2017-03-22 19:14:53 +01:00
Anthony J. Thibault	2c38d7ff89	Tablet spawn orientation now takes hand orientation into account. ... Perhaps this will make the tablet spawn location feel more predictable and consistent to the user.	2017-03-22 11:03:03 -07:00
David Kelly	a594419688	friend->connection which I should have done long ago	2017-03-22 10:09:48 -07:00
Triplelexx	2d1ca99e2e	change variable names that use Quat.getForward	2017-03-22 17:00:12 +00:00
Seth Alves	bd32104bc1	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-22 08:41:59 -08:00
Ryan Huffman	1285f2a9eb	Merge pull request #9937 from thoys/boppo ... El Boppo the Clown punching bag game	2017-03-22 09:30:54 -07:00
David Kelly	59b02261e5	minor cleanup, remove waiting visualization completely	2017-03-21 16:08:25 -07:00
Triplelexx	a964edee91	change all references of Quat.getFront to Quat.getForward in scripts directory	2017-03-21 22:25:30 +00:00
Dante Ruiz	d2c139ce6e	fix error from using a misspelled function	2017-03-21 22:25:45 +01:00
kunalgosar	f09ee92fe1	spacing issues	2017-03-21 14:16:49 -07:00
kunalgosar	30d2ea0ea5	spacing issues	2017-03-21 14:15:56 -07:00
kunalgosar	a4af973ae4	fixed back button on marketplace	2017-03-21 14:12:54 -07:00
David Kelly	5bcd7ca97f	visuals update. Will do some cleaning shortly	2017-03-21 13:27:00 -07:00
Seth Alves	14027d4acb	Merge pull request #9968 from druiz17/tablet-xbox ... Fixed the third eye for the xbox controller	2017-03-21 11:03:53 -08:00
Seth Alves	04a334fd07	unmangle merge	2017-03-21 11:02:18 -08:00
Dante Ruiz	bf3c5dbf0e	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-xbox	2017-03-21 19:47:16 +01:00
Dante Ruiz	1811a2edc7	fixed third eye laser	2017-03-21 19:45:00 +01:00
Seth Alves	1da6349505	merge from upstream	2017-03-21 10:26:02 -07:00
Ryan Huffman	13222468e3	Merge pull request #9712 from huffman/feat/edit-particle-icon ... Add particle system overlay in edit.js	2017-03-21 10:02:52 -07:00
Seth Alves	cc4ddd1387	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-21 08:43:35 -08:00
Brad Hefta-Gaub	b7f48644af	Merge pull request #9955 from druiz17/tablet-edit-selecting ... Fix edit.js from deselecting an object when trying to delete it	2017-03-21 09:27:30 -07:00
Zach Fox	29e97381eb	PAL open, user leaves, gray out row	2017-03-20 17:20:28 -07:00
Seth Alves	bc90e9081b	Merge pull request #9957 from hyperlogic/bug-fix/tablet-scale ... Tablet scale settings now take effect soon after they are changed.	2017-03-20 15:05:47 -08:00
Zach Fox	d16acc5a7f	Stale PAL Notification	2017-03-20 15:24:49 -07:00
Anthony J. Thibault	f5c3d41f2c	Tablet scale settings now take effect soon after they are changed.	2017-03-20 14:51:47 -07:00
Dante Ruiz	de24023a21	Fix edit.js from deselecting an object when trying to delete it	2017-03-20 20:43:32 +01:00
Seth Alves	8988110c3b	Merge pull request #9953 from fayeli/edit-export-entities ... Adding Export Entities Functionality in Tablet Edit	2017-03-20 11:35:18 -08:00
David Kelly	81cb63df6b	new particle effect, first pass	2017-03-20 11:42:58 -07:00
Faye Li	f57905fbb3	remove code for jump to selection	2017-03-20 10:23:55 -07:00
Seth Alves	2e29ff3114	Merge pull request #9934 from fayeli/edit-import-entities ... Adding Import Entities button on the Create tab of Edit	2017-03-20 09:13:08 -08:00
Brad Hefta-Gaub	af790d8474	Merge pull request #9875 from birarda/bug/spin-strafe ... fix double snap turn strafing	2017-03-20 10:08:05 -07:00
Ryan Huffman	df644edde4	Fix hand controller not able to select light/particle icons	2017-03-20 09:45:50 -07:00
Thijs Wenker	a8740614e2	CR Fixes	2017-03-18 01:22:06 +01:00
Faye Li	197a06c423	changes in TWO entityList.js to register the export event	2017-03-17 16:17:21 -07:00
Atlante45	4c75680877	Set teleport target to Cancel if seat in use	2017-03-17 16:10:15 -07:00
Faye Li	1a46f18aa3	adding export button + hiding jump to selection	2017-03-17 15:56:55 -07:00
David Kelly	c425c32b8f	hack somewhat different visualization in. If this is ok, will cleanup	2017-03-17 14:56:47 -07:00
Thijs Wenker	febe25511b	teleport.js - ignore entity support (for boxing gloves)	2017-03-17 21:10:06 +01:00
Faye Li	6531efffbc	hook up qml button to edit.js	2017-03-17 11:22:07 -07:00
David Kelly	58ac34b336	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-17 08:46:04 -07:00
David Kelly	2758e740bf	hacked in a particle effect (as entity) plus popped sphere into existence	2017-03-17 08:45:24 -07:00
Seth Alves	df84ff27e9	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui	2017-03-17 07:52:22 -07:00
Seth Alves	a5d19439f9	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-16 16:32:07 -07:00
Zach Fox	fc2a501474	Cleanup JS<->QML messaging	2017-03-16 15:38:39 -07:00
David Kelly	60000becce	more careful stopping of intervals, edge case stuff	2017-03-16 13:19:17 -07:00
David Kelly	f0fad5981a	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into dk/newMessageStuff	2017-03-16 09:01:13 -07:00
Seth Alves	31e0cfe296	Merge pull request #9825 from thoys/record-fixes ... Avatar Recorder and Playback Fixes	2017-03-16 07:27:42 -08:00
David Kelly	4f6123ee29	more messaging rework - dealing with edges	2017-03-15 16:41:07 -07:00
howard-stearns	84fd17bd88	use location.metaverseServerUrl instead of hardcoded value.	2017-03-15 16:33:23 -07:00
Dante Ruiz	a5f1fb9e9a	fixed notification spelling error	2017-03-15 19:45:30 +01:00
Dante Ruiz	dac16af1df	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-notifcation	2017-03-15 19:27:11 +01:00
Dante Ruiz	4bc050e583	added tablet notification	2017-03-15 19:26:50 +01:00
David Kelly	d8719ac3a9	cleanup, switch to overlays with texture swapping, move overlay to between hands	2017-03-15 11:15:58 -07:00
Stephen Birarda	d13752a7c6	use the correct property name for useAdvancedMovementControls	2017-03-15 10:34:43 -07:00
Stephen Birarda	bfc51d8222	use property not function for advanced movement controls	2017-03-15 10:25:06 -07:00
Seth Alves	96a3e2a6d3	Merge pull request #9898 from ctrlaltdavid/21214 ... Load controller scripts in their own script engine	2017-03-15 08:42:20 -08:00
Seth Alves	b5919d89a5	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-15 08:26:10 -08:00
howard-stearns	6c88bc98b4	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-15 09:24:30 -07:00
Triplelexx	5883bd39dc	rename color to component	2017-03-15 11:17:27 +00:00
Triplelexx	41041c711f	use utils.js	2017-03-15 11:09:13 +00:00
Triplelexx	9e0091ebe0	use utils.js, move easing function, use mixes ... some cleanup	2017-03-15 11:08:54 +00:00
Triplelexx	84d157ab18	handle overlay lifetime during update, remove color conv	2017-03-15 10:31:09 +00:00
David Rowe	cb4bd58381	Load controller scripts in their own script engine	2017-03-15 14:31:13 +13:00
Stephen Birarda	7ddb5ff770	use correct boolean when changing AMC	2017-03-14 18:09:17 -07:00
Stephen Birarda	188530590a	add missing curly brace to script	2017-03-14 17:16:49 -07:00
Stephen Birarda	490cb83489	move advanced movement control changes to MyAvatar	2017-03-14 15:03:01 -07:00
David Kelly	0a35fa34f9	some reworking, cleaning, bug fixing...	2017-03-14 14:22:44 -07:00
Zach Fox	5da0dfc4ac	Merging from Pal_v2_Zach	2017-03-14 14:05:50 -07:00
Triplelexx	6971aeb081	additional reference information	2017-03-14 17:18:11 +00:00
David Kelly	f821ccc8c3	fix typo - doh!	2017-03-14 10:00:19 -07:00
Triplelexx	8a39ce16bd	add simple easing function ... dodgy add push	2017-03-14 16:57:45 +00:00
Triplelexx	4dd9a7c37f	add simple easing function	2017-03-14 16:51:43 +00:00
David Kelly	246d2f4017	fix comments at top	2017-03-14 08:58:14 -07:00
Triplelexx	30c16984c0	change offsetPosition to use Camera.position	2017-03-14 06:07:22 +00:00
Triplelexx	c729ceccb5	change color lerp to use HSV color	2017-03-14 03:59:24 +00:00
David Kelly	7765daf382	handle cleanup, race, etc..., more to come	2017-03-13 18:57:01 -07:00
David Kelly	fa7283a6e2	initial new messaging - working but needs cleanup	2017-03-13 18:33:36 -07:00
Triplelexx	2e0cac4676	add extra safeguards	2017-03-14 01:25:39 +00:00
Triplelexx	8bd155cb86	change offsetPosition to use Camera.orientation	2017-03-14 01:23:04 +00:00
Ryan Huffman	8246dbafab	Update particle explorer to work outside of entity list	2017-03-13 15:15:36 -07:00
Stephen Birarda	0926b2df2a	add LX snap turn to standard mapping	2017-03-13 15:14:20 -07:00
Ryan Huffman	9880d40cfb	Update edit.js light icons to now use the name entityIcon	2017-03-13 14:38:56 -07:00
David Kelly	515e6fd34e	map Controller.Standard.RB so xbox controller works. whee.	2017-03-13 13:10:05 -07:00
howard-stearns	db06c2650f	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-13 11:53:48 -07:00
Triplelexx	95fcb1df7a	fix spelling mistake	2017-03-13 18:32:53 +00:00
Ryan Huffman	d4ade8278c	Fix js linting errors in entityIconOverlayManager.js	2017-03-13 11:27:12 -07:00
Ryan Huffman	b7783dcffe	Update edit.js light/particle overlays to be clickable when behind something	2017-03-13 11:26:34 -07:00
David Kelly	e2e7573e93	handle stopping handshake part-way through	2017-03-13 11:04:51 -07:00
Zach Fox	beb848373b	Update from zfox23/PALv2 branch	2017-03-13 10:15:06 -07:00
Ryan Huffman	c2564800dc	Add edit.js particle + light icons	2017-03-13 10:10:53 -07:00
Ryan Huffman	dbcd7fd9e9	Fix light icon overlay not updating to represent light type	2017-03-13 10:10:53 -07:00
Ryan Huffman	42d518fafb	Remove debug log in entityIconOverlayManager	2017-03-13 10:10:53 -07:00
Ryan Huffman	86116aaad7	Update light/particel icons to be shown by default in edit mode	2017-03-13 10:10:53 -07:00
Ryan Huffman	ce5ee42961	Update LightOverlayManager to work with particles	2017-03-13 10:10:53 -07:00
Seth Alves	524e4bdfbc	Merge pull request #9853 from sethalves/tablet-ui-fix-edit-props-race ... Tablet ui fix edit props race	2017-03-13 08:56:56 -08:00
Triplelexx	873a9aa39e	change color swapping to be more concise	2017-03-11 07:40:32 +00:00
Brad Hefta-Gaub	23e47f2fdc	added icons to the audioScope app	2017-03-10 18:13:35 -08:00
Brad Hefta-Gaub	b8a2525f9e	add auto pause/resume to the Audio Scope App	2017-03-10 17:38:00 -08:00
Anthony J. Thibault	3abc78e7d3	Fix for finger/sytlus on invisible/hidden tablet.	2017-03-10 17:18:13 -08:00
Brad Hefta-Gaub	5f3ee2e98f	add a basic tablet app for the audio scope	2017-03-10 17:08:54 -08:00
Anthony J. Thibault	07e10ae862	Merge branch 'tablet-ui' into feature/can-touch-this	2017-03-10 17:05:26 -08:00
Triplelexx	8a0dd55275	change naming and comment	2017-03-11 00:19:02 +00:00
Triplelexx	eb4dee0495	create audioMuteOverlay.js ... client scipt that creates an overlay to provide mute feedback	2017-03-10 23:37:29 +00:00
Seth Alves	2098cd5b5e	remove stylus and search-beams when grab script is shut down	2017-03-10 13:02:16 -08:00
Seth Alves	88e74251a1	cleanups	2017-03-10 12:51:34 -08:00
Seth Alves	411ec9a791	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-fix-edit-props-race	2017-03-10 10:22:10 -08:00
Seth Alves	fffff817a3	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-10 10:20:40 -08:00
Seth Alves	494b602d4c	Merge pull request #9850 from druiz17/toolbar-MIA-afetr-snapshot ... toolbar becomes visible after taking a snapshot	2017-03-10 10:20:01 -08:00
Seth Alves	cef4c988c4	Merge pull request #9835 from druiz17/toolbar-window-dont-close ... Close toolbar windows when reloading scripts	2017-03-10 10:19:07 -08:00
Seth Alves	d792559d9a	have edit.js resend properties of selected entity to entityProperties.js once it's ready	2017-03-10 09:59:23 -08:00
Dante Ruiz	d54005b62e	no more duplicate snapshot buttons after taking reloading scripts	2017-03-10 00:17:44 +00:00
Dante Ruiz	c6c0c6d382	toolbar becomes visible after taking a snapshot	2017-03-09 22:54:22 +00:00
Anthony J. Thibault	d8f04d90a7	Merge branch 'master' into feature/can-touch-this	2017-03-09 14:24:10 -08:00
Anthony J. Thibault	6f53aaed5c	Small simplification of building stylusTarget list.	2017-03-09 14:04:13 -08:00
druiz17	0069569e96	Merge branch 'tablet-ui' into 21197	2017-03-09 09:31:15 -08:00
Seth Alves	023b01814e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-quick-summon-1	2017-03-09 09:16:37 -08:00
druiz17	007ed9fe81	Merge pull request #9836 from druiz17/2-tablets-fix ... Fixed having more than one tablet when reloading scripts	2017-03-09 09:13:14 -08:00
Anthony J. Thibault	1acc5ea760	Finger now points when near tablet + deadspot added when touching the tablet	2017-03-08 19:03:56 -08:00
Dante Ruiz	2a275a4f4b	removed tab at the end of word	2017-03-09 00:15:02 +00:00
Seth Alves	9435c58c2c	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-ui-quick-summon-1	2017-03-08 16:10:38 -08:00
Dante Ruiz	b878f164fb	minimize diff again	2017-03-09 00:10:38 +00:00
Dante Ruiz	f6d799c048	minimize diff	2017-03-09 00:09:32 +00:00
Dante Ruiz	561bd27c38	minimize diff	2017-03-09 00:08:50 +00:00
Dante Ruiz	5f7a0ea8fc	Close tablet when switching form HMD to desktop and vice versa	2017-03-09 00:05:26 +00:00
Seth Alves	6aac2eb338	for overlay tablets, precreate them so that they show up quickly when summoned	2017-03-08 15:31:24 -08:00
Seth Alves	de2dd7383d	didn't need invis flag, after all	2017-03-08 15:30:49 -08:00
Dante Ruiz	ce105e0329	fix double tablets when reloading scripts	2017-03-08 22:21:57 +00:00
Dante Ruiz	881213259d	Merge branch 'master' of github.com:highfidelity/hifi into toolbar-window-dont-close	2017-03-08 21:44:20 +00:00
Dante Ruiz	59b4fa5fd7	Close toolbar windows when scripts are reloaded	2017-03-08 21:44:04 +00:00
Seth Alves	371c20ee25	hide tablet by making it not visible rather than destroying it	2017-03-08 10:33:59 -08:00
Seth Alves	66d44ac6f0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-08 09:26:51 -08:00
Seth Alves	a67f8ac0ed	Merge pull request #9807 from Menithal/21166-remove-limit ... #9761 Cloneable Improvement	2017-03-08 07:15:06 -08:00
David Rowe	950f91965d	Merge branch 'tablet-ui-edit-js' into 21197	2017-03-08 17:35:58 +13:00
Anthony J. Thibault	836c701cb3	More accurate and responsive stylus and finger touching. ... The algorithm used to detect when and where the stylus or finger is touching the tablet has been improved. * hovering the finger/stylus over the surface of the tablet should cause buttons to highlight. * flicking or using the stylus like a drum stick, should more accurately click buttons on the tablet. * stabbing the tablet quickly, should also more accurately trigger button presses. * moving the hand/stylus from behind the tablet should be less likely to cause press events.	2017-03-07 18:19:32 -08:00
Thijs Wenker	b21bd3afa9	Make the time and slider follow the record.js toolbar	2017-03-08 01:14:11 +01:00
Seth Alves	b938579598	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-07 11:42:44 -08:00
Andrew Meadows	1e9623e2f2	Merge pull request #9813 from druiz17/multipule-audio-fix ... removed duplicated audio devices	2017-03-07 10:00:48 -08:00
Seth Alves	f594689fa8	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-07 09:24:50 -08:00
Dante Ruiz	fc65723d68	corrected removing duplicate devices	2017-03-06 22:14:20 +00:00
Seth Alves	4886f1cbfc	don't run stylus-on-overlay code unless the overlay is a web3d overlay	2017-03-06 12:38:19 -08:00
Brad Hefta-Gaub	38668b6ce5	Merge pull request #9812 from sethalves/dont-auto-ungrab-overlays ... don't automatically unhook overlays from hands unless they were grabbable overlays	2017-03-06 12:32:18 -08:00
Thijs Wenker	6ded937b25	Merge pull request #9809 from Menithal/21201 ... WL#21201 Snap-together Magnetic blocks	2017-03-06 21:30:53 +01:00
David Rowe	09ecb12510	Merge branch 'tablet-ui-edit-js' into 21197 ... # Conflicts: # interface/src/ui/overlays/Web3DOverlay.cpp	2017-03-07 08:59:40 +13:00
Seth Alves	27066e89a6	Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-06 11:46:19 -08:00
Seth Alves	a2d2c41f02	remove debug print	2017-03-06 11:45:49 -08:00
Seth Alves	08e2e421e4	Merge branch '21199' of github.com:ctrlaltdavid/hifi into tablet-ui-edit-js	2017-03-06 11:08:27 -08:00
Seth Alves	eb47db4441	Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-06 11:07:22 -08:00
Dante Ruiz	b6671d92c8	removed duplicated audio devices	2017-03-06 18:46:57 +00:00
Seth Alves	6ac576c9e6	Merge branch 'master' of github.com:highfidelity/hifi into dont-auto-ungrab-overlays	2017-03-06 10:43:43 -08:00
Seth Alves	19a31d7630	don't automatically unhook overlays from hands unless they were grabbable overlays	2017-03-06 10:15:53 -08:00
Seth Alves	93246b24b0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-06 08:54:49 -08:00
Brad Hefta-Gaub	781e0be0e3	Merge pull request #9806 from howard-stearns/preserve-audio-data-during-pal-refresh ... preserve audio data during pal refresh	2017-03-06 08:45:46 -08:00
Seth Alves	c677326025	Merge pull request #9754 from hyperlogic/feature/fingers-on-tablet ... Touch the tablet with your finger	2017-03-04 11:58:47 -08:00
Menithal	ea3f7f0274	Initial Magnetic block	2017-03-04 18:50:30 +02:00
Menithal	d85cb645b0	Changed limit logic, default limit is now 0 ... Clones now have a named based on the original entity id Limit is now calculated from the source instance, instead of just clone name to avoid a single box being calculated as something else Default limit is now 0, which disables limit	2017-03-04 11:42:43 +02:00
howard-stearns	15d680d4f9	preserve audio data during pal refresh	2017-03-03 16:56:12 -08:00
Anthony J. Thibault	e56f02d94f	Changed default for preferFingerOverStylus to false.	2017-03-03 14:12:04 -08:00
Seth Alves	bccfa79e8b	Merge pull request #9749 from ctrlaltdavid/21176 ... If someone else is grabbing entity you want to grab show their grab beam	2017-03-03 13:43:28 -08:00
David Rowe	6403e51d20	Merge branch 'tablet-ui-edit-js' into 21199	2017-03-04 09:00:49 +13:00
David Rowe	48ee661f02	Merge branch 'tablet-ui-edit-js' into 21197	2017-03-04 08:58:48 +13:00
Anthony J. Thibault	45febe8565	Merge branch 'master' into feature/fingers-on-tablet	2017-03-03 09:04:43 -08:00
Seth Alves	40caa1ea49	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-03 09:01:57 -08:00
David Rowe	388a144af1	Tidying after merge	2017-03-03 18:44:50 +13:00
David Rowe	482c23ead5	Merge branch 'master' into 21186 ... # Conflicts: # scripts/system/controllers/handControllerGrab.js	2017-03-03 18:38:42 +13:00
David Rowe	9384dfd89c	Merge branch 'tablet-ui-edit-js' into 21197	2017-03-03 18:05:18 +13:00
David Rowe	854292b193	Merge branch 'tablet-ui-edit-js' into 21199	2017-03-03 17:51:12 +13:00
Brad Hefta-Gaub	e655e442a0	Merge pull request #9799 from sethalves/steady-hand-lasers ... Steady hand lasers	2017-03-02 18:27:39 -08:00
Seth Alves	3b581a8dfe	merge from upstream	2017-03-02 16:35:44 -08:00
Seth Alves	155a310852	Merge pull request #9761 from Menithal/21166 ... WL#21166 Cloneable Equipment	2017-03-02 16:33:13 -08:00
Seth Alves	10cb7aab06	Merge pull request #9684 from Menithal/parent-hotkey ... WL#20856 Added Parenting Hotkeys to Edit.js Among Visual tweaks	2017-03-02 16:30:43 -08:00
ZappoMan	6400bb6319	CR feedback	2017-03-02 14:34:14 -08:00
Anthony J. Thibault	644e29a43d	disable WANT_STATE_DEBUG in handControllerGrab.js	2017-03-02 14:15:05 -08:00
Seth Alves	f321ffdf91	don't clear EDIT_SETTING flag when creating new entities	2017-03-02 13:00:52 -08:00
Seth Alves	bbfd373887	Merge branch 'steady-hand-lasers' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-02 12:51:52 -08:00
Seth Alves	9b3c16d489	get handControllerGrab overlay lines working again	2017-03-02 12:48:37 -08:00
Seth Alves	2047e0194d	Merge branch 'master' of github.com:highfidelity/hifi into steady-hand-lasers	2017-03-02 12:44:10 -08:00
David Rowe	b985b348ec	Merge branch 'tablet-ui-edit-js' into 21199	2017-03-03 09:43:49 +13:00
David Rowe	4d624ad256	Merge branch 'menuFix' into 21199	2017-03-03 09:42:16 +13:00
Menithal	91fa871d55	Merge branch 'parent-hotkey' of mgit:Menithal/hifi into parent-hotkey	2017-03-02 21:40:45 +02:00
Menithal	9c31f66b75	Addressed CR of 9684	2017-03-02 21:39:56 +02:00
Seth Alves	94b5e6333c	get handControllerGrab overlay lines working again	2017-03-02 11:02:06 -08:00
Ryan Huffman	1564c76ab4	Merge pull request #9792 from huffman/feat/hand-controller-drop ... Add Hifi-Hand-Drop so scripts can cause grabbed items to be dropped	2017-03-02 10:51:35 -08:00
Seth Alves	9d4445fd61	Merge branch 'steady-hand-lasers' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-02 10:07:37 -08:00
Seth Alves	cf37845f9e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-02 10:06:38 -08:00
Seth Alves	8893c4770e	Merge branch 'master' of github.com:highfidelity/hifi into steady-hand-lasers	2017-03-02 10:02:33 -08:00
Seth Alves	93055a67a8	use new-style hand-lasers for both hands	2017-03-02 10:01:08 -08:00
ZappoMan	9e71801ae1	remove properties from RayToEntityIntersectionResult	2017-03-01 18:21:04 -08:00
Anthony J. Thibault	4f03c06a94	Added General Preference to control stylus vs finger usage ... By default the finger is preferred over the stylus.	2017-03-01 18:07:53 -08:00
Seth Alves	7f6b803652	3d-line-overlays can now have an endParentID and endParentJointIndex	2017-03-01 17:27:32 -08:00
Dante Ruiz	58c1a2fb99	Merge branch 'master' into menuFix	2017-03-02 00:55:18 +00:00
Seth Alves	7c4869eb73	fix up parenting for 3d line overlays, have handControllerGrab use a child overlay for search/far-grab so the updates are smoother	2017-03-01 16:10:07 -08:00
David Rowe	9f56d2f6f6	Make tablet general settings dialog naming more consistent with desktop	2017-03-02 12:30:36 +13:00
Menithal	231ebef117	Removed stray debugPrint	2017-03-02 01:01:57 +02:00
Menithal	fd1fded276	Fixed Clone instancing issues	2017-03-02 00:59:45 +02:00
Anthony J. Thibault	d142c3d69b	eslint fix	2017-03-01 13:29:24 -08:00
Anthony J. Thibault	f418457100	Index finger touch support for the tablet-ui.	2017-03-01 13:28:17 -08:00
David Rowe	6fafc829e1	Merge branch 'menuFix' into tablet-ui	2017-03-02 09:28:35 +13:00
David Rowe	f60c2f8ec9	Merge branch 'tablet-ui-edit-js' into tablet-ui	2017-03-02 09:27:09 +13:00
Menithal	82236bdcb9	Merge remote-tracking branch 'upstream/master' into 21166	2017-03-01 22:09:29 +02:00
Menithal	f538ac24f3	Various Properties	2017-03-01 22:07:02 +02:00
David Kelly	45293ab130	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-03-01 12:55:54 -07:00
Ryan Huffman	1c3840dc78	Add Hifi-Hand-Drop so scripts can cause grabbed items to be dropped	2017-03-01 10:25:16 -08:00
David Kelly	efe44425a6	cr feedback, plus something I missed	2017-03-01 09:26:03 -07:00
Dante Ruiz	e2479a78bd	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-03-01 16:04:12 +00:00
Seth Alves	c2085ebb6e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-28 13:33:51 -08:00
David Kelly	1fc57ce9a6	alan's feedback	2017-02-28 11:51:40 -07:00
Clément Brisset	7f9437dcc5	Merge pull request #9690 from Atlante45/feat/sit ... Add hips pinning / Sit script	2017-02-28 10:41:22 -08:00
Dante Ruiz	d5714bfa6e	Merge branch 'master' into menuFix	2017-02-28 16:55:44 +00:00
Matti Lahtinen	d0c2c26a8e	One last gotcha from the conflict resolution.	2017-02-28 16:37:08 +02:00
Matti Lahtinen	e21785d5ec	Merge branch 'master' into 21166	2017-02-28 16:34:28 +02:00
David Rowe	d8d17be0e0	Rotate about translation grab position	2017-02-28 23:22:07 +13:00
David Rowe	e3f2f3c5bc	Tidying	2017-02-28 23:04:23 +13:00
David Rowe	28768d4a78	Rotate the entity by twice the rotating controller's rotation	2017-02-28 22:22:34 +13:00
David Rowe	5b6f953ac2	Add hand controller state of distance-rotating for second grab hand	2017-02-28 17:35:13 +13:00
Seth Alves	117be16c31	pull from upstream	2017-02-27 16:48:23 -08:00
Ryan Huffman	f5f7cc5266	Fix teleport seat beam color to match model	2017-02-27 16:38:55 -08:00
Ryan Huffman	aa94106229	Update teleport to sit in invisible seats	2017-02-27 16:38:55 -08:00
Ryan Huffman	40b238c12e	Add new teleport seat model + beam	2017-02-27 16:38:53 -08:00
Ryan Huffman	c632884aac	Update teleport script to handle detecting seats	2017-02-27 16:38:53 -08:00
Ryan Huffman	9197819291	Cleanup teleport to make use of new TARGET	2017-02-27 16:38:53 -08:00
Ryan Huffman	b8c7905fa4	Cleanup some duplication of code in teleport.js	2017-02-27 16:38:53 -08:00
Matti Lahtinen	b1639ee3aa	Removed a Stray Print json that would spam logs.	2017-02-27 23:40:06 +02:00
Menithal	9fbde41dc4	Styling formating and Rebuild attempt	2017-02-27 23:27:48 +02:00
David Rowe	6fcc096bcf	Fix JavaScript error	2017-02-28 10:14:38 +13:00
David Rowe	08cae1d3f2	Make other avatar's grab beam finish at entity's centroid	2017-02-28 10:02:06 +13:00
David Rowe	f4a3627b76	Make other avatar's grab beam start at more natural position	2017-02-28 09:47:36 +13:00
Dante Ruiz	21c15927cf	Homebutton dimension and position scales with tablet	2017-02-27 19:33:52 +00:00
David Rowe	31b6d528df	Merge branch 'master' into 21176	2017-02-28 08:29:44 +13:00
Dante Ruiz	19110ecfee	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-27 16:00:08 +00:00
Seth Alves	34c5d480c4	Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-02-27 06:35:50 -08:00
Seth Alves	1864975c51	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-27 06:35:22 -08:00
Menithal	1d8be2aeaa	Added missing dynamic	2017-02-26 19:17:46 +02:00
Menithal	69949cd6b5	Finalized Grab-Clone action	2017-02-26 18:49:13 +02:00
Philip Rosedale	4925b3c47c	Merge pull request #9756 from ctrlaltdavid/21122 ... Point index finger and raise thumb if not touching controller	2017-02-25 14:59:48 -08:00
David Kelly	baa7f81d79	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-02-24 18:38:57 -08:00
David Rowe	0cc499b08b	Point index fingers and raise thumbs if not touching controls	2017-02-25 14:20:23 +13:00
Dante Ruiz	73c337efd0	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-25 00:42:22 +00:00
Dante Ruiz	835b23832f	some modal clean up	2017-02-25 00:40:38 +00:00
David Rowe	a205d2a00c	Use animation for pointing index finger instead of setting joint angles	2017-02-25 11:36:06 +13:00
Seth Alves	fcd3c09404	Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js-tablet-as-overlay	2017-02-24 14:27:30 -08:00
Seth Alves	b2a35f45db	when tablet is an overlay, use the model-fbx from the distribution (local disk copy) rather than the one on s3	2017-02-24 13:04:43 -08:00
Seth Alves	eedc5c1647	don't allow tablet to get stuck to a hand when passing it back and forth between hands	2017-02-24 12:10:52 -08:00
Seth Alves	71ab6a1a84	fix a couple of problems related to grabbing tablet while edit.js is active ... Conflicts: scripts/system/controllers/handControllerGrab.js	2017-02-24 11:38:42 -08:00
Seth Alves	70060eb464	in 2d mode, clicks on tablet don't get used for other things ... Conflicts: scripts/system/libraries/entitySelectionTool.js	2017-02-24 11:37:04 -08:00
Seth Alves	73774a6590	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-24 11:34:59 -08:00
Seth Alves	f208f5e2d1	fix a couple of problems related to grabbing tablet while edit.js is active	2017-02-24 11:34:10 -08:00
David Rowe	a98824f483	Code review	2017-02-25 08:13:15 +13:00
David Kelly	d399f648d5	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-02-24 10:32:43 -08:00
David Kelly	2458f95c42	more of a peak loudness with decay, now	2017-02-24 10:31:55 -08:00
Menithal	10151c3f5b	Added Multi-userdata field updater	2017-02-24 08:04:03 +02:00
David Rowe	d9a716bf3d	If someone else is grabbing entity you want to grab show their grab beam	2017-02-24 18:42:52 +13:00
Seth Alves	e43c4c17f5	in 2d mode, clicks on tablet don't get used for other things	2017-02-23 21:27:25 -08:00
David Kelly	4a4c914ca8	First cut at new styling	2017-02-23 18:53:22 -08:00
Seth Alves	ce717d04e9	merge in tablet-as-overlay code	2017-02-23 18:40:20 -08:00
Seth Alves	610c20e01a	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-23 17:41:38 -08:00
Seth Alves	d6428ee98c	Merge pull request #6 from fayeli/tablet-edit-layout-fix ... fix overlapping issue with the delete button	2017-02-23 17:40:15 -08:00
Seth Alves	0a2a1b1637	include visible_to_others in UserActivityLoggerScriptingInterface::openedTablet	2017-02-23 15:25:09 -08:00
Seth Alves	9c0104a060	don't use Entities.getEntityProperties on tablet when it's an overlay	2017-02-23 14:55:52 -08:00
Menithal	4d98cc436b	Finished up Edit.js	2017-02-23 23:20:21 +02:00
Howard Stearns	cddba43837	Merge branch 'master' into filter-pal-by-view-distance	2017-02-23 08:25:16 -08:00
Seth Alves	37004e4347	steps toward making mouse work on tablet	2017-02-23 08:11:31 -08:00
Menithal	5c0bf690fb	Merge branch 'master' into grab-clone	2017-02-23 10:35:24 +02:00
Menithal	e95e50ad6e	Preliminary work on edit.js to allow for new param	2017-02-23 10:34:04 +02:00
Seth Alves	4a778b9113	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-22 20:39:47 -08:00
Seth Alves	84f95e6776	oops	2017-02-22 19:18:42 -08:00
Seth Alves	b4be942348	trying to get tablet overlay to show up in the right place	2017-02-22 19:18:03 -08:00
Chris Collins	b295a146e0	Merge pull request #9715 from hyperlogic/bug-fix/tablet-ui-toolbar-highlight ... More consistent highlights/toggle for toolbar buttons	2017-02-22 18:07:38 -08:00
Seth Alves	273f0130f3	fix sphere vs box check for grabbing overlays. fix newly introduced equipping bug.	2017-02-22 17:43:09 -08:00
Seth Alves	bcf1f9ab4c	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-22 16:50:29 -08:00
Seth Alves	bfc4853947	make overlays near-grabbable. make tablet be an overlay	2017-02-22 16:50:02 -08:00
Anthony Thibault	44136e550c	Merge pull request #9729 from sethalves/tablet-ui-no-haptics-for-tablet ... don't do a haptic pulse when av's hand goes near grabbable tablet	2017-02-22 15:55:01 -08:00
Chris Collins	94517057d6	Merge pull request #9721 from hyperlogic/bug-fix/tablet-ui-tablet-placement ... More consistent tablet angle when first creating the tablet.	2017-02-22 15:00:17 -08:00
Seth Alves	aed1d69377	don't do a haptic pulse when av's hand goes near grabbable tablet	2017-02-22 14:14:10 -08:00
howard-stearns	023a32563c	work around .qml settings issues	2017-02-22 12:59:40 -08:00
Seth Alves	5bff2034c3	cleanups, attempt to get particle explorer to work right	2017-02-22 12:07:18 -08:00
Anthony J. Thibault	4866be1f52	More consistent tablet angle when first creating the tablet. ... The tablet should more constantly be placed above your hand, while facing your head. It fixes the issue where the tablet would appear almost horizontal when your hand was close to your HMD and at eye level.	2017-02-21 16:01:46 -08:00
howard-stearns	2b9c69926b	Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance	2017-02-21 15:42:00 -08:00
howard-stearns	1ddc7de581	remove debugging (and fix missing brace)	2017-02-21 15:41:17 -08:00
Seth Alves	8cf71ebc65	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-21 13:54:21 -08:00
howard-stearns	aff44d682e	Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance	2017-02-21 13:45:25 -08:00
howard-stearns	15d8041683	snapshot working, before button change	2017-02-21 13:14:45 -08:00
Anthony J. Thibault	7564b6f0f5	More consistent highlights/toggle for toolbar buttons ... When the "app" for a button is visible the button should become active. Also clicking on a highlighted/active button should close the associated "app". This should be noticeable on the following tablet apps. * audio * menu * people * market * users	2017-02-21 10:59:36 -08:00
David Kelly	76229905f2	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-02-21 09:24:22 -08:00
Menithal	3d8c389879	Merge branch 'master' into grab-clone	2017-02-21 07:45:36 +02:00
Seth Alves	92580a977b	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-20 13:54:12 -08:00
Philip Rosedale	5c782deb4d	Merge pull request #9701 from ctrlaltdavid/21175 ... Fix laser beam jumping upon grabbing entity	2017-02-20 13:37:11 -08:00
Seth Alves	43f47c1106	merge from upstream	2017-02-20 12:45:39 -08:00
Seth Alves	70c9853189	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-20 12:38:13 -08:00
Menithal	d9f86612de	Fixed view toggle, Added new Notifications ... - View Toggle now only toggles if no other modifiers are pressed - More notification, and cases for notification - Parenting to existing parent - Unparenting when there is no parent - Unparenting single entities	2017-02-19 20:18:11 +02:00
Menithal	2a4b493de5	Changed order on Menu	2017-02-19 18:24:56 +02:00
Menithal	9b8503eba5	Initial Grab Clone	2017-02-19 18:18:38 +02:00
Menithal	f3c806e910	Revert of hotkey detection, removed menu hotkeys ... - Holding hotkeys will no longer spam parent events rapidly, detects only the release	2017-02-18 18:33:00 +02:00
Menithal	0df6305f90	Revert removal of hotkey from js event	2017-02-18 18:22:01 +02:00
Menithal	dcbe3c622d	Added Hotkey Listening to the webview ... Ctrl + P and Ctrl + Shift + P are now available even if the edit window has been selected	2017-02-18 11:51:19 +02:00
David Rowe	71ba38afb0	Process controller and script updates only when finger painting is on	2017-02-18 21:28:30 +13:00
David Rowe	05c63e16ca	Send messages local only	2017-02-18 20:40:27 +13:00
David Rowe	6827a28807	Fix grab position	2017-02-18 16:36:14 +13:00
David Rowe	692fa52aca	Disable drawing pointer lasers while painting	2017-02-18 15:21:48 +13:00
David Rowe	2c02b42c96	Finger paint button icon files	2017-02-18 14:21:54 +13:00
David Rowe	0689557ba5	Draw smoother lines	2017-02-18 13:39:59 +13:00
David Rowe	777a0b51c1	Ignore spurious finger tip position values	2017-02-18 13:35:16 +13:00
David Rowe	784009a9fa	Merge branch 'master' into 21168	2017-02-18 13:20:39 +13:00
Seth Alves	def669364b	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-17 15:45:19 -08:00
Menithal	f5d266a562	Updated	2017-02-17 23:28:28 +02:00
Seth Alves	39e1edafd2	merge from upstream	2017-02-17 13:16:12 -08:00
David Rowe	2c5782e4bb	Fix laser beam jumping upon grabbing entity	2017-02-18 09:11:04 +13:00
Seth Alves	5ddcbae934	save tablet web-overlay ID in HMD interface. don't trigger edit affordances if the click was intented for the tablet	2017-02-17 11:51:23 -08:00
Seth Alves	47cdade1e9	fix home-button on tablet	2017-02-17 11:47:37 -08:00
Seth Alves	0d10667bb4	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-17 09:58:33 -08:00
David Kelly	51246a2e45	first cut, pretty ugly	2017-02-17 10:24:01 -07:00
Menithal	f211f015d7	Merge branch 'master' into parent-hotkey	2017-02-17 19:22:28 +02:00
David Rowe	3712aea861	Handle trigger values of 1.0 not repeating	2017-02-17 19:31:53 +13:00
David Rowe	bdfc9fd418	Tidying	2017-02-17 19:31:40 +13:00
David Rowe	25761adf6c	Erase closest line	2017-02-17 19:31:25 +13:00
David Rowe	9c1bb37a34	Paint lines	2017-02-17 19:31:11 +13:00
David Rowe	5236f123c1	Interpret trigger and grip values	2017-02-17 19:30:57 +13:00
David Rowe	7b36669d80	Point index finger while painting if tablet not displayed	2017-02-17 19:30:40 +13:00
David Rowe	867e24762b	Disable lasers and grabbing while painting if tablet not displayed	2017-02-17 19:30:23 +13:00
David Rowe	bad57fa03f	Controller and painting code framework	2017-02-17 19:30:04 +13:00
David Rowe	585691f71c	Add finger painting button to tablet	2017-02-17 19:29:11 +13:00
Anthony J. Thibault	47e87e1ad4	Bug fix for clara.io marketplace	2017-02-16 17:41:36 -08:00
Anthony J. Thibault	2ea88012f9	Remove toolbar from tablet-goto.js	2017-02-16 17:36:16 -08:00
Anthony J. Thibault	345f0519ef	Removed use of Toolbar API for most default scripts.	2017-02-16 17:29:35 -08:00
Seth Alves	b6b6ad780d	allow isSpotlight to be 0 or 1	2017-02-16 17:15:52 -08:00
Anthony J. Thibault	cffdecbf68	Merge branch 'master' into feature/toolbar-tablet-switcheroo	2017-02-16 16:28:43 -08:00
Anthony J. Thibault	7f95753a1e	Prevent tablet from being open while in toolbarMode	2017-02-16 16:18:51 -08:00
howard-stearns	6e3ae1fe4f	cleanup some accumulated cruft in pal code	2017-02-16 10:53:02 -08:00
Menithal	afbf4bc30f	Fixed Parenting/Unparenting Menu Removal and Binding	2017-02-16 10:52:42 +02:00
Menithal	d96f95a7e9	Updated edit.js and selection tool ... Last selected entity will now be yellow instead of orange	2017-02-16 10:05:59 +02:00
Seth Alves	12b8a77488	in edit.js, convert entity property ID to be a text-field so the data can be copied	2017-02-15 16:29:50 -08:00
Seth Alves	3d7733219c	edit's open-asset-browser button works, again	2017-02-15 16:15:18 -08:00
Seth Alves	e030a4a518	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-15 15:20:14 -08:00
Seth Alves	33c1c3ac11	when a new particle-entity is created, hook the particle explorer to it	2017-02-15 15:19:49 -08:00
Seth Alves	076b0ed3ab	get particle explorer working, again	2017-02-15 15:00:25 -08:00
Menithal	856cdcbd28	Merge remote-tracking branch 'origin' into parent-hotkey	2017-02-16 00:38:01 +02:00
Menithal	c3021ae60d	Fixing Menu Items for Parenting / Unparenting	2017-02-15 22:21:29 +02:00
Seth Alves	3ea0f6d2d2	allow lasers to scroll tablet while in edit-mode	2017-02-15 11:34:48 -08:00
David Kelly	5184cbe615	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2	2017-02-15 12:08:55 -07:00
Seth Alves	a19bc31a78	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-15 10:51:22 -08:00
Seth Alves	792c7ff51f	PointerEvent will now relay keyboard modifiers	2017-02-15 10:41:56 -08:00
Faye Li	2388ec65fe	Merge pull request #9659 from fayeli/users-fix ... Tablet Users Fixes	2017-02-15 10:25:06 -08:00
Faye Li	8aae2aa5f0	simpler filter code	2017-02-15 10:23:36 -08:00
Faye Li	5ece3f1e1a	use new users icon	2017-02-15 10:16:20 -08:00
Menithal	655c49d9c0	edit.js: started to work on Parenting via hotkey	2017-02-15 19:50:15 +02:00
Menithal	7b02d1073a	Added a generic Window Notification for Feedback ... This allows to use the existing Pop-up notifications for generic notification messages	2017-02-15 19:49:31 +02:00
Seth Alves	219e569014	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-15 07:25:39 -08:00
Philip Rosedale	01bdac49d0	Merge pull request #9672 from ctrlaltdavid/21121 ... Fix far grabbing making entity jump upon grab	2017-02-14 17:02:42 -08:00
Anthony J. Thibault	912e8aa04a	Tablet buttons now work in toolbar. ... Switching between tablet and toolbar is not as dynamic as I'd like but it's a start.	2017-02-14 15:37:24 -08:00
Anthony J. Thibault	f8055a027e	Refactor of pal.js to dynamically switch between toolbar and tablet.	2017-02-14 15:34:24 -08:00
Seth Alves	838d7f6f10	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-14 13:58:18 -08:00
Seth Alves	3a23ec86d5	handles etc work better	2017-02-14 13:57:48 -08:00
David Rowe	625f5efdf8	Merge branch 'master' into 21164 ... # Conflicts: # scripts/system/audio.js	2017-02-15 10:00:52 +13:00
Chris Collins	442e8d68ef	Merge pull request #9650 from kunalgosar/browserFix ... Added isAway (paused) property to myAvatar	2017-02-14 11:16:07 -08:00
Dante Ruiz	46cfa7cf13	saving work	2017-02-14 07:46:31 -08:00
Dante Ruiz	61912b6ff0	saving work	2017-02-14 07:46:31 -08:00
Seth Alves	d40402faae	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-14 06:53:34 -08:00
Seth Alves	4393bc3c2e	Merge pull request #9656 from humbletim/21114-part1 ... CR-1 21114 -- ScriptCache/ScriptEngine cleanup, loader states, accessible load errors	2017-02-14 06:49:05 -08:00
Seth Alves	30c46b89a0	Merge pull request #9668 from hyperlogic/feature/remove-tablet-color-effect ... Removed ColorOverlay from TabletButton, added more icon & text states	2017-02-14 06:16:59 -08:00
David Rowe	2672b8d10a	Fix tabs	2017-02-14 17:30:56 +13:00
David Rowe	61f8631a2b	Fix far grabbing making entity jump upon grab	2017-02-14 17:30:20 +13:00
Faye Li	a57a0435c1	fix overlapping issue with the delete button	2017-02-13 15:13:10 -08:00
Anthony J. Thibault	1c783031b1	Removed ColorOverlay from TabletButton, added more icon & text states ... Now uses separate images for each state. Now tabletButtonProxy has 4 state properties, one for icon and images. * icon * hoverIcon * activeIcon * activeHoverIcon * text * hoverText * activeText * activeHoverText Updated scripts to set new button states, if necessary.	2017-02-13 15:09:46 -08:00
Faye Li	f981f21aa4	fix for ozan's domain	2017-02-13 11:47:58 -08:00
Atlante45	512bb4765f	Add entity clicks capture capabilities	2017-02-13 11:34:30 -08:00
Faye Li	27057190ce	display users even if they dont have a domain name	2017-02-13 11:01:37 -08:00
Faye Li	8cc8f2c7fd	highlight current visibility option	2017-02-13 10:51:01 -08:00
Faye Li	6e0d7bb3cf	make visibility settings into a modal for better readability	2017-02-13 10:42:07 -08:00
humbletim	831bf93500	* refactor ScriptCache per FIXMEs ... * include error details in BatchLoader results * update EntityServerScript properties in edtior to reflect more granular statuses * ScriptEngine plumbing in prep for require/module integration	2017-02-11 04:47:31 -05:00
David Rowe	77f0fb1491	Change the "Mute" tablet button to "Audio"	2017-02-11 22:40:19 +13:00
kunalgosar	a8f223518c	modified away script to use MyAvatar.isAway property	2017-02-10 17:28:12 -08:00
Faye Li	65ca0c7e4a	sticky header bar	2017-02-10 17:27:02 -08:00
Seth Alves	44aa3e044b	make it so near grabbing while edit is active doesn't select a new entity	2017-02-10 16:56:53 -08:00
Faye Li	e28e16ea5e	make drop down text a little bit bigger	2017-02-10 16:56:13 -08:00
Faye Li	0ba934f543	sort online users array alphabetically	2017-02-10 16:39:14 -08:00
Faye Li	8f43ceed9d	filter out yourself from users online list	2017-02-10 16:22:30 -08:00
Seth Alves	fead52f626	put new-entity buttons in a tab of the edit app	2017-02-10 15:18:01 -08:00
Seth Alves	0b358a2ac7	finish hooking up new-model dialog	2017-02-10 13:29:06 -08:00
David Rowe	b5b92c1508	Make the tablet's mic icon reflect the current mute state	2017-02-11 09:53:02 +13:00
Seth Alves	3171ce1602	hook up more of new-model dialog	2017-02-10 12:03:26 -08:00
David Rowe	8a995cc1d2	Display list of audio input devices before list of audio output devices	2017-02-10 20:14:52 +13:00
David Rowe	9e3d8b0b6d	Move the audio devices list into the root audio dialog	2017-02-10 20:11:20 +13:00
David Kelly	5ca80803c0	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2	2017-02-09 20:01:43 -07:00
Seth Alves	7a63b07462	attempting to handle new-model dialog	2017-02-09 17:14:10 -08:00
Seth Alves	24fc9bbe67	honor HUDUIEnabled setting	2017-02-09 15:12:01 -08:00
Seth Alves	e12c77e576	move the edit tabs into tablet	2017-02-09 14:43:44 -08:00
Seth Alves	c4ac719d2c	merge from upstream + cleanups	2017-02-09 14:26:29 -08:00
Seth Alves	4c3a6842a5	start on moving edit.js to tablet	2017-02-09 14:03:01 -08:00
Dante Ruiz	0e83e5da06	minimize diff	2017-02-09 07:13:30 -08:00
Dante Ruiz	580216c3d2	adding tablet-goto.js	2017-02-09 07:13:30 -08:00
Dante Ruiz	5c5ace7c7b	goto in tablet	2017-02-09 07:13:29 -08:00
Philip Rosedale	c9c04a9afc	Merge pull request #9638 from PhilipRosedale/fixRescale ... Fix rescale avatar bug	2017-02-08 22:09:41 -08:00
Seth Alves	2ec4f118fd	Merge pull request #9639 from hyperlogic/feature/tablet-pal ... Ported PAL to tablet	2017-02-08 21:17:38 -08:00
Anthony J. Thibault	c2b832fb9c	removed debug prints from pal.js	2017-02-08 18:55:22 -08:00
Philip Rosedale	e94e41698e	remove debug	2017-02-08 18:04:55 -08:00
Anthony J. Thibault	a209d0372a	First cut of pal on tablet.	2017-02-08 17:34:03 -08:00
Philip Rosedale	dc957d09d8	remove comment	2017-02-08 15:45:29 -08:00
Philip Rosedale	fe92d38b60	Fixed scaling of self	2017-02-08 15:42:10 -08:00
Clément Brisset	91bfa65fe2	Merge pull request #9586 from Triplelexx/21146 ... 21146	2017-02-08 11:07:27 -08:00
David Kelly	61e558e568	Entity Edit Filters for zones ... Part 1 - just put them in the zones entities. Next I'll hook them up and actually filter...	2017-02-08 09:53:25 -07:00
Seth Alves	47976406fc	Merge pull request #9607 from hyperlogic/bug-fix/better-haptics ... More consistent haptics on web overlays and entities	2017-02-08 05:47:05 -08:00
Anthony J. Thibault	244437d971	set WANT_DEBUG_STATE back to false	2017-02-07 23:50:06 -08:00
Seth Alves	e1a3b0c551	Merge pull request #9629 from hyperlogic/feature/tablet-2d-window-pos ... In desktop mode create tablet near mouse click location.	2017-02-07 19:51:05 -08:00
Anthony J. Thibault	cb58c567b8	In desktop mode create tablet near mouse click location. ... But prevent the tablet from being displayed off screen.	2017-02-07 18:18:34 -08:00
howard-stearns	2e88f1ab1f	conserving audio interval	2017-02-07 16:21:14 -08:00
howard-stearns	23fc9b6fb3	Merge branch 'master' of https://github.com/highfidelity/hifi into pal-performance	2017-02-07 16:00:08 -08:00
howard-stearns	3bd11978aa	low-hanging fruit on pal performance	2017-02-07 15:59:38 -08:00
Seth Alves	90fa8bf572	Merge pull request #9612 from druiz17/users ... some tweaks to users and menus got tablet	2017-02-07 15:38:43 -08:00
Triplelexx	e7244b47a9	increase LETTER_OFFSET value ... allow more room for characters, could be improved by detecting each one	2017-02-07 21:55:55 +00:00
Chris Collins	d2feb4202b	Merge pull request #9621 from sethalves/tablet-ui-track-opens-and-closes ... send UserActivityLogger events when tablet is opened or closed	2017-02-07 08:23:09 -08:00
Anthony Thibault	2f09be5ead	Merge pull request #9605 from druiz17/tabletClicking ... enforce more button clicking logic	2017-02-06 20:23:16 -08:00
Seth Alves	e3af5032c0	send UserActivityLogger events when tablet is opened or closed	2017-02-06 16:49:26 -08:00
Seth Alves	68de18a3bb	Merge pull request #9610 from sethalves/tablet-ui-use-models-from-s3-again ... use tablet models from s3 until relative model urls work	2017-02-03 18:34:28 -08:00
Dante Ruiz	0c28776ea2	some tweaks to users and menus got tablet	2017-02-04 00:13:39 +00:00
Seth Alves	9f04a72a38	Merge pull request #9599 from hyperlogic/feature/tablet-ui-button-sort-order ... tablet-ui: Added sortOrder property to buttons	2017-02-03 15:20:53 -08:00
Seth Alves	f635cd8a07	use tablet models from s3 until relative model urls work	2017-02-03 15:17:33 -08:00
Anthony J. Thibault	6738c0eade	More consistent haptics on web overlays and entities	2017-02-03 12:05:30 -08:00
Dante Ruiz	2a3d0b6b17	enforce more button clicking logic	2017-02-03 19:13:57 +00:00
Chris Collins	bac5bd5c0e	Merge pull request #9595 from hyperlogic/bug-fix/tablet-ui-bugfixes ... tablet-ui: Bug fixes	2017-02-02 17:53:47 -08:00
Anthony J. Thibault	6bef9e888b	Merge branch 'master' into bug-fix/tablet-ui-no-domain	2017-02-02 17:21:20 -08:00
Anthony J. Thibault	85e01e3922	tablet-ui: Added sortOrder property to buttons ... By default user created buttons will appear after system buttons.	2017-02-02 17:18:22 -08:00
Seth Alves	f40285c688	Merge pull request #9597 from druiz17/tabletStylus ... better scrolling and fixed button touching	2017-02-02 16:56:13 -08:00
Anthony Thibault	be4fbb63cf	Merge pull request #9583 from sethalves/fix-post-tablet-edit-buttons ... fix the edit.js toolbar buttons so they don't vanish when moused-over or clicked	2017-02-02 16:01:56 -08:00
Anthony Thibault	59b33bbc53	Merge pull request #9585 from sethalves/use-local-tablet-model ... use tablet model from distribution rather than from s3	2017-02-02 16:01:15 -08:00
Dante Ruiz	0ec8071288	better scrolling and fixed button touching	2017-02-02 23:16:39 +00:00
Anthony J. Thibault	b44e5b5a1f	tablet-ui: preferences for tablet ui scaling ... One for the tablet in HMD mode, one for desktop mode. The default desktop mode scaling factor is now 75%, which should reduce the size of the for users with low resolution monitors, while still being somewhat readable.	2017-02-02 14:05:07 -08:00
Anthony J. Thibault	5890503ec0	Can now grab tablet in 2d mode even when it embedded in geometry	2017-02-02 10:56:56 -08:00
Anthony J. Thibault	9df887de2a	You can no longer scale the tablet with double-grab	2017-02-02 10:16:02 -08:00
Dante Ruiz	2af72f1a50	fixed tablet buliding up when flying fast	2017-02-02 17:03:53 +00:00
Seth Alves	4ae163ac60	hook pal audio meter up again	2017-02-01 19:01:55 -08:00
Triplelexx	05e3acf1a3	Merge remote-tracking branch 'upstream/master' into 21146	2017-02-02 01:16:51 +00:00
Triplelexx	1a58dad3ad	change age check ... check for equal to -1 instead of < 1, think this would be more suitable if undefined is returned.	2017-02-02 01:12:55 +00:00
Seth Alves	d9bdbb92ef	use tablet model from distribution rather than from s3	2017-02-01 16:55:29 -08:00
Seth Alves	6671324a33	fix the edit.js toolbar buttons so they don't vanish when moused-over or clicked	2017-02-01 16:29:12 -08:00
Faye Li	80c8748046	Revert "replace old user.js" ... This reverts commit 2340f56b53.	2017-02-01 15:37:01 -08:00
Faye Li	2340f56b53	replace old user.js	2017-02-01 15:26:40 -08:00
Faye Li	c24b6e5e5e	missing words	2017-02-01 15:13:52 -08:00
Faye Li	c16a9a955e	display correct username	2017-02-01 14:53:03 -08:00
Faye Li	9a22055c27	initialise the toggle button with correct info	2017-02-01 14:30:16 -08:00
Faye Li	3c3ff908b4	handling the visibility toggle event	2017-02-01 14:22:13 -08:00
Faye Li	6d55b3c82d	visibility toggle drop down	2017-02-01 13:45:17 -08:00
Faye Li	378fdaec8b	the missing commit - fix typo and added user info	2017-02-01 11:27:48 -08:00
Faye Li	d78c274472	Merge branch 'master' into users-jump-to	2017-02-01 10:59:32 -08:00
Faye Li	4e209399da	fix conflict	2017-02-01 10:58:03 -08:00
Faye Li	5946339782	move my changes to a different file	2017-02-01 10:52:37 -08:00
Faye Li	3f84e5778c	jump to the selected user	2017-02-01 10:45:18 -08:00
Faye Li	fc1e588588	sending and recieving jump to event	2017-02-01 10:34:54 -08:00
Seth Alves	ab8be15ce0	Merge pull request #9570 from highfidelity/tablet-ui ... Tablet ui	2017-02-01 09:38:13 -08:00
Triplelexx	5bf29f4657	improve dimensionsFromName implementation	2017-02-01 12:59:40 +00:00
Triplelexx	b5d2926605	make text entity smaller and allow dynamic resizing based on name length	2017-02-01 12:49:41 +00:00
Anthony J. Thibault	3c04f54e75	more fixes to third person tablet usage.	2017-01-31 18:22:38 -08:00
Anthony J. Thibault	008a58f9d7	Only reposition the tablet when camera mode changes, in HMD mode.	2017-01-31 18:03:48 -08:00
Anthony J. Thibault	c147b9bec0	Fix for tablets in third-person HMD mode.	2017-01-31 18:00:18 -08:00
Faye Li	59aea60be0	fill confirmation modal with data of the selected user	2017-01-31 16:16:40 -08:00
Faye Li	fda20694b3	jump to user confimation modal	2017-01-31 15:47:51 -08:00
Seth Alves	3a6a7bcc8a	put tablet version of users.js into a different file	2017-01-31 14:44:09 -08:00
Faye Li	06d797bb3b	load bootstrao	2017-01-31 14:27:17 -08:00
Triplelexx	be68f84100	update nameTag.js comments	2017-01-31 22:14:39 +00:00
Anthony J. Thibault	e2e19884bb	Tablet should work even when not connected to any domain. ... handControllerGrab.js and WebTablet.js now parents objects to the AVATAR_SELF_ID parentID, instead of using MyAvatar.sessionUUID, which is unavailable when not connected to any domain. I removed several early returns handControllerGrab.js that prevented grabbing from working if MyAvatar.sessionUUID was invalid. There were places in the EntityItem.cpp and EntityScriptingInterface.cpp C++ that would log an error if parentID was set to AVATAR_SELF_ID. This was to prevent AVATAR_SELF_ID from ever going over the network. Instead, we now prevent this by replacing all outgoing references of AVATAR_SELF_ID with the sessionID of the current node.	2017-01-31 13:52:12 -08:00
Seth Alves	d835de2fec	Merge pull request #9547 from druiz17/tabletBug ... Grabbing tablet while in edit mode	2017-01-31 13:37:11 -08:00
Seth Alves	ec67cabaf5	Merge pull request #9540 from fayeli/new-users-js ... Rework Users.js for Tablet	2017-01-31 13:36:53 -08:00
Triplelexx	f159d4c91d	create nameTag.js script ... Running the script creates a text entity that will hover over the users head showing their display name.	2017-01-31 20:45:35 +00:00
Dante Ruiz	7a4a769015	fix more editing bugs	2017-01-31 16:53:57 +00:00
Dante Ruiz	b264d84385	minimize git diff	2017-01-30 13:27:25 -08:00
Dante Ruiz	57a9d34cda	minimize git diff	2017-01-30 13:27:25 -08:00
Dante Ruiz	8879727d88	ability to grab tablet in edit mode	2017-01-30 13:27:25 -08:00
Anthony J. Thibault	98b53d1d29	Don't allow mouse dragging the tablet in HMD mode.	2017-01-30 12:07:18 -08:00
Faye Li	8e64de26a9	Merge branch 'tablet-ui' into new-users-js	2017-01-30 11:25:58 -08:00
Anthony J. Thibault	39d68828ab	Disable FXAA on tablet overlay in desktop mode. ... This introduces the "isAA" property to 3d overlays. When false, the overlay is rendered after the "Antialiasing" render pass. Ironically, disabling FXAA makes the text more readable, which is essential in 2D desktop mode. Two new shaders were introduced. simple_opaque_web_browser_overlay.slf simple_transparent_web_browser_overlay.slf These are tailored to write into the main framebuffer instead of the g-buffer.	2017-01-30 11:24:59 -08:00
Faye Li	ff1c4995af	removed unused code	2017-01-27 15:44:07 -08:00
Faye Li	8091b0ced4	button style	2017-01-27 13:33:07 -08:00
Dante Ruiz	2c7cbb1bd9	close tablet with mouse in HMD	2017-01-27 20:58:36 +00:00
Faye Li	bf51ba7195	button brings up add/remove friends page	2017-01-27 11:34:38 -08:00
Faye Li	bfbee20f43	display friends	2017-01-27 10:19:20 -08:00
Seth Alves	95d5c64e83	put a schmitt trigger in place to de-bounce tablet clicks	2017-01-26 15:09:35 -08:00
Seth Alves	c0f169e242	allow tablet-stabbers to more easily click buttons	2017-01-26 14:54:32 -08:00
Seth Alves	e3d4cae515	avoid having the snapshot script be multi-activated by a single button-click	2017-01-26 14:29:49 -08:00
Seth Alves	d85d892057	Merge pull request #9522 from fayeli/PAL-to-PEOPLE ... Tablet Button name from PAL to PEOPLE	2017-01-26 12:58:16 -08:00
Faye Li	44fc8a5fbf	update button name	2017-01-26 11:23:06 -08:00
Seth Alves	0b51b1d566	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-26 11:00:02 -08:00
Brad Hefta-Gaub	5ada689ab7	Merge pull request #9497 from ctrlaltdavid/fix-clara-download ... Fix intermittent Clara.io download crashes	2017-01-26 10:58:27 -08:00
Seth Alves	68de5c9757	Users to USERS in button	2017-01-26 10:23:38 -08:00
Seth Alves	e2b1f4b2ab	include tablet fbx with interface distribution rather than get it from s3	2017-01-26 10:20:46 -08:00
Faye Li	6a4a9bcb32	end of day commit	2017-01-25 17:53:32 -08:00
Faye Li	0a3a0e817e	polling users and displaying user count	2017-01-25 17:36:50 -08:00
Seth Alves	9497b2b7c5	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui	2017-01-25 17:16:12 -08:00
Seth Alves	129fe6ea49	dammit, emacs	2017-01-25 17:15:54 -08:00
Faye Li	b5b781f4a5	tab content switching	2017-01-25 16:59:16 -08:00
Anthony J. Thibault	2af59630fb	Better legibility of tablet in 2D with small window sizes.	2017-01-25 16:43:36 -08:00
Seth Alves	204652514e	fix some fallout from toolbar changes	2017-01-25 16:29:36 -08:00
Faye Li	5ad522668a	tabs header for everyone and friends	2017-01-25 16:29:25 -08:00
Seth Alves	c317ba8054	merge from upstream	2017-01-25 15:57:53 -08:00
Seth Alves	f382b541c7	merge from upstream	2017-01-25 15:42:33 -08:00
Seth Alves	ff8d13ecc7	get button-states for toolbar buttons working again	2017-01-25 15:38:54 -08:00
Faye Li	49a8964c4e	reference new users icon art	2017-01-25 14:43:39 -08:00
Faye Li	ce0ee610ea	a test on polling friends	2017-01-25 14:32:36 -08:00
Seth Alves	98f1664a46	use a setting to decide which UI is enabled	2017-01-25 14:17:45 -08:00
Atlante45	f540c94113	Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr	2017-01-25 13:06:49 -08:00
Seth Alves	f18094f565	make use of tablet or HUD depend on a single variable. avoid some duplicated code	2017-01-25 12:00:34 -08:00
Faye Li	f02b2ef40a	auto poll users when page loads	2017-01-25 11:59:31 -08:00
Faye Li	c7a0e609fc	created a friends button for metaverse friends page	2017-01-25 11:41:07 -08:00
Seth Alves	11d01a0c00	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-HUD-ui	2017-01-25 09:42:59 -08:00
Ryan Huffman	2bb7a7a4a6	Remove entity server script status log spam from edit.js	2017-01-25 09:32:25 -08:00
Seth Alves	7d370fb791	Merge pull request #9507 from cozza13/tablet-ui ... Changes to tablet formatting	2017-01-25 09:29:16 -08:00
Dante Ruiz	c811839163	tablet is not selectable in edit mode	2017-01-25 16:46:17 +00:00
Dante Ruiz	bc75cf5bed	removed tabs	2017-01-25 16:11:37 +00:00
Dante Ruiz	bda8b65e79	fixing spaceing	2017-01-25 16:06:40 +00:00
Dante Ruiz	a147ce3f5f	fixed load script issue	2017-01-25 08:00:41 -08:00
Chris Collins	df9bfa6eff	Changes to tablet formating ... Changes to QML and .js formating to match style of mockup.	2017-01-25 07:41:04 -08:00
David Rowe	dcd632013f	Better variable name	2017-01-25 16:37:35 +13:00
David Rowe	7e56d0fae6	Fix up Clara.io error handling	2017-01-25 16:36:06 +13:00
Seth Alves	4335bbe4fe	provide a way to switch mostly back to HUD-based ui	2017-01-24 18:48:11 -08:00
Seth Alves	ced1b61b70	close rather than attempt to repair the tablet after a domain change	2017-01-24 16:03:22 -08:00
Seth Alves	827ae7ad4d	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-close-tablet-upon-goto	2017-01-24 15:50:12 -08:00
Seth Alves	601a35a9b6	try a different way of repairing tablet after a domain change	2017-01-24 15:49:49 -08:00
Faye Li	71b6096644	toggle menu item	2017-01-24 15:12:46 -08:00
Faye Li	5bed68ac4c	button toggle	2017-01-24 14:56:58 -08:00
Faye Li	95a92fc5eb	added tablet button	2017-01-24 14:42:28 -08:00
David Rowe	1b05ae8a82	Make handling of Clara.io download-ready state transition more robust	2017-01-25 11:00:07 +13:00
Anthony J. Thibault	432bb27119	The tablet Help button should be active if window is visible	2017-01-23 18:37:08 -08:00
Anthony J. Thibault	e30d77eba1	Tablet goto button now properly tracks address bar shown state	2017-01-23 18:37:07 -08:00
Seth Alves	353b38286a	Merge pull request #9490 from hyperlogic/tablet-ui ... For for Tablet Tilt and Oculus Touch A B buttons sending UINav events	2017-01-23 18:14:53 -08:00
Seth Alves	3496e4cc7a	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-23 16:50:41 -08:00
Anthony J. Thibault	3db8c5b4a7	Fix tilt on tablet for HMD users without hand controllers	2017-01-23 16:36:04 -08:00
Seth Alves	f2ff6fd9e7	allow stylus to work when edit.js is running	2017-01-23 15:52:40 -08:00
Ryan Downe Karpf	3f151cb3d7	Merge pull request #9483 from Atlante45/fix/rescale ... Fix Edit.js rescale for decimal values	2017-01-23 15:44:10 -08:00