4306 commits

Author	SHA1	Message	Date
SamGondelman	7686948daf	resolve conflicts and cleanup	2017-10-20 15:23:17 -07:00
SamGondelman	fb969964f3	generalized scripting interfaces	2017-10-20 14:37:10 -07:00
Brad Hefta-Gaub	26ea8bea6a	Merge pull request #11612 from highfidelity/pointers ... Fix tablet intersection bug and start of Pointer migration work (WIP)	2017-10-20 13:53:52 -07:00
Zach Fox	ae1b2bd931	'Tis a silly hack	2017-10-20 11:11:23 -07:00
vladest	ea6c2e1bb5	Merge branch 'master' into tablet_extended_sounds	2017-10-20 14:46:02 +02:00
Zach Fox	0dc6211a7d	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-19 14:43:33 -07:00
Ryan Huffman	894e91ea23	Merge pull request #10702 from CraftsmanMG/master ... Fingerpaint PR	2017-10-19 13:13:59 -07:00
Zach Fox	24d109cfe7	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-19 12:13:38 -07:00
Daniela	832e30ad1c	Edited Packet headers.	2017-10-19 19:53:47 +01:00
Zach Fox	9537e19ad4	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-19 10:58:55 -07:00
Zach Fox	aa48215933	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_OctoberFixes2	2017-10-19 10:54:31 -07:00
Daniela	b28a99c2af	Merge branch 'master' of https://github.com/highfidelity/hifi into Gizmos	2017-10-19 18:06:23 +01:00
Daniela	a02ee5b7d5	Grabber Tool Move up, remove billboard on grabbermoveupoverlay	2017-10-19 18:05:51 +01:00
Brad Hefta-Gaub	e2ccfb84f9	Merge pull request #11626 from Delanir/BubbleScaleMaster ... 7429 IPD Secondary Task List: bubble.js Scale	2017-10-19 09:31:15 -07:00
Melissa Brown	1a3821e984	Merge pull request #11591 from ctrlaltdavid/21568 ... Add some Quat and Uuid JavaScript helper properties	2017-10-18 22:07:06 -07:00
Seth Alves	28d0da51b9	Merge pull request #11628 from luiscuenca/case8269 ... 8269 controllerDispatcher is creating log spam with web entities	2017-10-18 18:11:13 -07:00
Sam Gateau	4d7accabdf	Merge pull request #11439 from NissimHadar/hazeZone ... Adding haze component to the zone entity.	2017-10-18 16:14:28 -07:00
luiscuenca	6e8756e8af	Debug mode has been turned off	2017-10-18 15:40:03 -07:00
Zach Fox	6c7096b0d7	Fix login button injection on individual item page	2017-10-18 14:53:39 -07:00
Daniela	e9f3dd6e44	Merge BubbleScale for IPD with hifi master.	2017-10-18 22:29:12 +01:00
Zach Fox	de50eef9c7	Fix rez certified...	2017-10-18 13:54:46 -07:00
Zach Fox	949da17046	Wear It button for items with category 'Wearables'	2017-10-18 13:51:58 -07:00
Zach Fox	a669aff453	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171018	2017-10-18 10:45:30 -07:00
Zach Fox	3f0b08aea8	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-18 10:37:47 -07:00
David Rowe	f31e014e8b	Quat.ZERO --> Quat.IDENTITY	2017-10-18 20:34:55 +13:00
David Rowe	5b6d33bcb2	Missing semicolon	2017-10-18 20:29:34 +13:00
David Rowe	f74c33f597	Fix importing entities from URL	2017-10-18 17:44:36 +13:00
SamGondelman	58172cfbd4	merge from master	2017-10-17 18:05:59 -07:00
Nissim	935180bf09	Fixed my bloody stupid mistake...	2017-10-17 15:02:05 -07:00
Zach Fox	f3b641a833	Edit.js caused a testing fail :(	2017-10-17 11:30:15 -07:00
Nissim	a641d6de66	Variable rename.	2017-10-17 09:18:29 -07:00
David Rowe	8d4e979dc8	Replace usages of AVATAR_SELF_ID previously missed	2017-10-17 16:38:05 +13:00
David Rowe	ed1c974f75	Use MyAvatar.SELF_ID instead of Uuid.SELF	2017-10-17 15:58:51 +13:00
David Rowe	1e3a2b3e4e	Merge branch 'master' into 21568	2017-10-17 15:15:49 +13:00
SamGondelman	429905de51	update scripts to use ignoreItems, fix caching bug	2017-10-16 15:52:17 -07:00
Nissim	1b42572f99	Merge branch 'hazeZone' of https://github.com/NissimHadar/hifi into hazeZone ... # Conflicts: # scripts/system/html/js/entityProperties.js	2017-10-16 14:29:56 -07:00
SamGondelman	aee817fbbc	scale end sphere in c++ for controller modules	2017-10-16 13:31:25 -07:00
Nissim	fd2b0da76d	First version.	2017-10-16 12:20:31 -07:00
Zach Fox	1cf816a261	Fix Wallet notification appearing when taking screenshots	2017-10-16 11:15:09 -07:00
Nissim Hadar	afb8b2d8e7	Merge branch 'master' into hazeZone	2017-10-13 13:40:06 -07:00
Nissim Hadar	9c9dfc7211	Replace light blend with glare.	2017-10-13 13:36:46 -07:00
Zach Fox	17a0dd2a76	Elide long usernames in injected code	2017-10-13 13:32:55 -07:00
Seth Alves	fe9f142bf6	Merge pull request #11562 from druiz17/fix-release-grab ... include release message to controller modules	2017-10-13 13:06:18 -07:00
Brad Hefta-Gaub	9f3331ec19	Merge pull request #11587 from druiz17/stylus-fix ... Fix Stylus in Tablet + Grab with Hand Results in the other Stylus being Dysfunctional	2017-10-13 12:42:26 -07:00
David Rowe	fc4e440dc4	Update system scripts to use new properties	2017-10-14 08:32:14 +13:00
Nissim Hadar	c76229934c	Changed blend-in colour and blend-out colour to colour and glare colour	2017-10-13 12:21:00 -07:00
Dante Ruiz	d14e6b6e5a	Merge pull request #11450 from ElderOrb/case7722 ... 7722 Add onHover Outline to Tablet "X" Button	2017-10-13 11:38:38 -07:00
druiz17	6799b9ca13	fix stylus	2017-10-13 09:34:08 -07:00
Nissim Hadar	b1174ce40c	Merge branch 'master' into hazeZone	2017-10-12 17:04:42 -07:00
Brad Hefta-Gaub	1bba5ff812	Merge pull request #11554 from sethalves/import-av-entities ... Import av entities	2017-10-12 13:30:53 -07:00
beholder	8c7462f012	fine-tuning based on discussion with Anshuman	2017-10-12 22:21:40 +03:00
Nissim Hadar	dc45c7af75	Implemented radio-buttons.	2017-10-12 11:18:18 -07:00
vladest	2d010980b0	Removed special sound for Mute and replace it with hover and click sounds	2017-10-12 19:15:09 +02:00
vladest	da734b628c	Remove sound on stylus show and hide	2017-10-12 18:54:40 +02:00
vladest	145149fedd	Merge branch 'master' into tablet_extended_sounds	2017-10-12 18:01:23 +02:00
Nissim Hadar	d0deaa631c	Trying to pretty-up.	2017-10-12 07:54:03 -07:00
Nissim Hadar	00609c9547	Name correction.	2017-10-12 07:37:44 -07:00
beholder	9c15af9fbe	raise highlight above button overlay to reduce flickering	2017-10-12 14:46:01 +03:00
Nissim Hadar	30fdf9d08e	Merge branch 'master' into hazeZone	2017-10-11 22:12:52 -07:00
Nissim Hadar	a21995db24	Added checkbox for altitude effect.	2017-10-11 22:10:58 -07:00
Nissim Hadar	3ec8faa1b9	Added checkbox for altitude effect of haze.	2017-10-11 20:47:39 -07:00
Nissim Hadar	96fd3123e8	Changed haze altitude to ceiling.	2017-10-11 20:36:24 -07:00
Nissim Hadar	2f4ddd84f8	Renamed haze colours and moved checkbox for glare.	2017-10-11 19:32:09 -07:00
Nissim Hadar	748f97364b	Moved Bakground Blend to end of Haze fields.	2017-10-11 19:20:46 -07:00
Nissim Hadar	832f9fb6e3	Renamed HAZE_MODE_RANGE_ONLY to HAZE_MODE_ENABLED.	2017-10-11 19:10:51 -07:00
Nissim Hadar	ea6b9ed28e	Removed ...ALTITUDE_MODE from combo.	2017-10-11 18:58:59 -07:00
Zach Fox	99109fe8e5	Merge pull request #11567 from zfox23/commerce_daveIntegration3 ... 2017-10-10 Commerce Frontend Updates	2017-10-11 11:07:03 -07:00
Zach Fox	c2733a4186	Fix notification bug	2017-10-11 09:47:16 -07:00
druiz17	67944c40a1	Merge branch 'master' of github.com:highfidelity/hifi into fix-release-grab	2017-10-11 09:13:01 -07:00
Atlante45	6dd49f5c32	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2017-10-10 16:53:34 -07:00
Sam Gateau	f143c28625	Merge pull request #11542 from SamGondelman/bubbleBoy ... Move HUD and HUD overlay rendering out of display plugin	2017-10-10 14:26:20 -07:00
druiz17	e77ac9fd10	include release message	2017-10-10 13:47:33 -07:00
Zach Fox	1c0a564155	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_daveIntegration3	2017-10-10 12:36:06 -07:00
Zach Fox	b105248dd7	Merge pull request #11555 from zfox23/commerce_daveIntegration2 ... 2017-10-09 Commerce Frontend Updates	2017-10-10 12:34:30 -07:00
Seth Alves	4a3b59ea61	Merge pull request #11560 from druiz17/far-grab-nondynamic ... Far grab non-dynamic entities	2017-10-10 12:29:38 -07:00
Zach Fox	be2b241629	Lots of progress; don't yet have some things	2017-10-10 12:20:48 -07:00
druiz17	013e15c9a2	made requested changes	2017-10-10 10:54:56 -07:00
Zach Fox	8d0d9a159f	Bugfixes	2017-10-10 10:38:19 -07:00
Melissa Brown	662bb6c103	Merge pull request #11338 from 1P-Cusack/FogBugz/Case_6491_Part7 ... [Case 6491] Remainder of entitySelectionTool clean up (details below).	2017-10-10 10:36:14 -07:00
druiz17	a179df29fb	mouse grab non-dynamic entities	2017-10-10 10:31:40 -07:00
druiz17	d0eb6a3ad0	remove comments	2017-10-10 09:45:41 -07:00
druiz17	003395b256	removing whitespace	2017-10-10 09:43:02 -07:00
Daniela	a46ef56af9	Merge with hifi:master. Packet Headers version were increased.	2017-10-10 17:26:33 +01:00
druiz17	fc41155ce1	saving work	2017-10-10 09:17:01 -07:00
Nissim Hadar	1a932fbaf0	Corrected error in html.	2017-10-09 19:10:30 -07:00
Nissim Hadar	71f567f15a	Merge branch 'master' into hazeZone	2017-10-09 17:28:10 -07:00
Nissim Hadar	7d5a887f43	Refactoring.	2017-10-09 17:25:19 -07:00
Zach Fox	733df8391f	Round 2	2017-10-09 12:27:56 -07:00
Seth Alves	23f41457be	Revert "Revert "fix importing of avatar entities"" ... This reverts commit 28a8b18060.	2017-10-09 11:52:43 -07:00
Seth Alves	28a8b18060	Revert "fix importing of avatar entities"	2017-10-07 16:54:05 -07:00
Brad Hefta-Gaub	62fc193bff	Merge pull request #11532 from sethalves/import-av-entities ... fix importing of avatar entities	2017-10-06 17:59:54 -07:00
Thijs Wenker	77a36bf788	Merge pull request #10892 from ctrlaltdavid/vr-edit-a ... VR edit app	2017-10-07 02:19:00 +02:00
SamGondelman	7e6d5d9d98	merge with master	2017-10-06 14:57:08 -07:00
Nissim Hadar	bfdd489682	Fixed color selector bug.	2017-10-06 13:18:12 -07:00
Seth Alves	8d00731620	Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities	2017-10-06 07:20:34 -07:00
LaShonda Hopper	2f082d9e86	[Case 6491] Fixes issue in normalizeDegrees from last commit (details below). ... The range of the function is targeting (-180, 180] such that the statement: if (degrees < -180) should be: if (degrees <= -180) to account for degrees being -180. Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-10-06 10:11:26 -04:00
LaShonda Hopper	707569b230	[Case 6491] More efficient version of normalizeDegrees function (details below). ... Refactoring the original normalizeDegrees function to be more efficient as suggested via: https://github.com/highfidelity/hifi/pull/11338#pullrequestreview-67520585 Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-10-06 09:50:24 -04:00
Nissim Hadar	76aace980a	Merge branch 'master' into hazeZone	2017-10-05 20:32:43 -07:00
Nissim Hadar	320c888ce4	Added checkbox to allow separate control of keylight attenuation.	2017-10-05 20:31:45 -07:00
Nissim Hadar	3afab3c1d3	Keylight attenuation implemented.	2017-10-05 18:25:02 -07:00
Nissim Hadar	f261477aa2	Adding sun attenuation.	2017-10-05 17:55:24 -07:00
David Rowe	105457b388	Don't unbusubscribe from possibly shared channel	2017-10-06 13:27:08 +13:00
druiz17	3139f5ef2a	improve mouseHMD exit logic	2017-10-05 15:12:58 -07:00
druiz17	ba50fcc509	fix mouse dissapearing in desktop mode	2017-10-05 15:07:49 -07:00
Nissim Hadar	e15699192d	Added blend angle and altitude reference base.	2017-10-05 14:18:03 -07:00
Nissim Hadar	2e2364e03f	WIP - adding haze blend out colour	2017-10-05 13:20:21 -07:00
Nissim Hadar	cbaae2c79b	WIP - haze colour.	2017-10-05 12:59:56 -07:00
Nissim Hadar	395d9cbd6b	WIP - haze colour.	2017-10-05 12:13:37 -07:00
Seth Alves	b96fac2f00	Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities	2017-10-05 11:43:25 -07:00
Seth Alves	53a49272dc	fix importing of avatar-entities	2017-10-05 11:43:19 -07:00
Nissim Hadar	512b469dc6	Added haze colour selector.	2017-10-05 11:31:49 -07:00
Nissim Hadar	595530161a	WIP - adding background blend. ... Haze altitude works.	2017-10-05 09:28:55 -07:00
Nissim Hadar	b7af6a58a6	WIP - adding background blend	2017-10-05 09:16:14 -07:00
druiz17	347645329e	fixing laser staying on in edit mode	2017-10-05 09:11:02 -07:00
Nissim Hadar	794cb961d5	Merge branch 'master' into hazeZone	2017-10-04 23:03:59 -07:00
Nissim Hadar	8b72e3044a	WIP - implementing range+altitude mode.	2017-10-04 22:26:53 -07:00
David Rowe	b526ec0d93	Code review	2017-10-05 18:21:04 +13:00
LaShonda Hopper	18d884f6c4	[Case 6491] eslint pass: Fixes no-multiple-empty-lines issues. ... * eslint pass using .eslintrc.js Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-10-04 20:51:06 -04:00
LaShonda Hopper	e9ae2099f3	[Case 6491] eslint pass: Fixes indent issues. ... * eslint pass using .eslintrc.js Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-10-04 20:37:57 -04:00
LaShonda Hopper	ac81b22cc9	[Case 6491] eslint pass: Fixes references to SelectionManager (details below). ... SelectionManager was being referred to as selectionManager. * eslint pass used .eslintrc.js Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-10-04 20:24:20 -04:00
David Rowe	63e7521711	Merge branch 'master' into vr-edit-a	2017-10-05 11:29:49 +13:00
Clément Brisset	74fd69ac2d	Merge pull request #11523 from Atlante45/new-master ... RC56 into Master	2017-10-04 15:17:52 -07:00
druiz17	9de1ca4e1a	allow farGrab module to run when stylus is visible	2017-10-04 15:04:27 -07:00
LaShonda Hopper	a5b913a8b9	[Case 6491] Fixes minor spacing issue, on while loop missed previous eslint pass. ... Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-10-04 17:36:28 -04:00
Nissim Hadar	71b49e5001	Merge branch 'master' into hazeZone	2017-10-04 10:25:06 -07:00
Brad Hefta-Gaub	a1979a2600	Merge branch 'master' into RC-56	2017-10-03 18:16:21 -07:00
Nissim Hadar	d4acb00aa5	Merge branch 'master' into hazeZone	2017-10-03 17:44:31 -07:00
druiz17	13feec89c2	remove update stylus	2017-10-03 16:12:37 -07:00
druiz17	ad9677f63e	fixing grabbing and tablet bugs	2017-10-03 16:11:51 -07:00
SamGondelman	fa838e4715	merge from master	2017-10-03 15:53:33 -07:00
druiz17	6b3d89d18f	fix hudlaser module	2017-10-03 14:13:37 -07:00
druiz17	33e9a71000	grab attachments	2017-10-03 12:51:51 -07:00
Zach Fox	ea3da6c9dd	Merge pull request #11495 from zfox23/pop_interfaceChanges2 ... Commerce: One step closer!	2017-10-03 11:56:00 -07:00
Nissim Hadar	86c497a12f	Merge branch 'master' into hazeZone ... # Conflicts: # libraries/networking/src/udt/PacketHeaders.cpp # libraries/networking/src/udt/PacketHeaders.h	2017-10-03 10:34:33 -07:00
Howard Stearns	22f0ef33ed	Merge pull request #11496 from howard-stearns/certificate-properties ... Certificate properties	2017-10-03 10:06:48 -07:00
Daniela	b55e416ccf	Remove fingerpaint app from scripts/system.	2017-10-03 15:28:05 +01:00
Daniela	2b18296cfd	Merge remote-tracking branch 'upstream/master' ... # the commit.	2017-10-03 15:26:22 +01:00
David Rowe	5145107f8c	2D overlays can no longer be lasered	2017-10-03 21:36:40 +13:00
David Rowe	a59d590111	ESLint	2017-10-03 13:33:20 +13:00
David Rowe	46ce68a893	Fix lasers	2017-10-03 13:33:11 +13:00
Zach Fox	11d0062104	Progress on buy endpoint	2017-10-02 16:57:41 -07:00
druiz17	8a0ecf4e6f	propertly determine is laser intersects with HUD UI	2017-10-02 16:46:43 -07:00
druiz17	68780f56b7	Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module	2017-10-02 14:06:26 -07:00
Zach Fox	1050d2851d	Modify injected code to add to dropdown menu	2017-10-02 12:37:49 -07:00
Zach Fox	15c0a21e0e	Varied commit - styling changes, beginnings of new Wallet endpoint, etc	2017-10-02 12:19:24 -07:00
LaShonda Hopper	cb264b5552	[Case 6491] eslint pass: Addresses curly bracket, keyword spacing issues. ... * eslint pass using .eslintrc.js Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-10-02 13:28:43 -04:00
LaShonda Hopper	97ecf84f3d	[Case 6491] eslint pass: Cleaning up comma-dangle noise. ... * eslint pass using .eslintrc.js Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-10-02 13:21:10 -04:00
LaShonda Hopper	c131686f1b	[Case 6491] eslint pass: Addressing some comment issues. ... * This should reduces the noise for the eslint passes on this script. * eslint pass using .eslintrc.js Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-10-02 12:55:51 -04:00
Howard Stearns	930832bb19	Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties	2017-10-02 09:44:29 -07:00
LaShonda Hopper	a610946af1	[Case 6491] eslint pass: fixes undefined center var in that.updateHandles. ... * eslint pass using .eslintrc.js Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-10-02 12:31:10 -04:00
Zach Fox	1ec0f5d9a0	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2	2017-10-02 09:26:59 -07:00
LaShonda Hopper	dbf8d19095	[Case 6491] eslint pass: fixes issues with equality checks. ... * Also adds some paren grouping to help with readability of some statements. * eslint pass on script using .eslintrc.js Changes to be committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-10-02 12:26:00 -04:00
vladest	e360c1363e	Merge branch 'master' into tablet_extended_sounds	2017-10-02 18:03:49 +02:00
David Rowe	829cc8e5e6	Merge branch 'master' into vr-edit-a	2017-10-02 17:08:27 +13:00
Nissim Hadar	449d7ae988	Merge branch 'master' into hazeZone	2017-10-01 19:18:16 -07:00
Anthony J. Thibault	7dfa80f666	Bug fix for offset of animated parts of oculus touch controller display ... Ensure position/rotations are updated with a consistent scale and are animated correctly as the controller values change.	2017-10-01 17:52:59 -07:00
druiz17	20918641f4	saving work	2017-09-29 16:48:25 -07:00
Howard Stearns	73c8da99dc	Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties	2017-09-29 16:46:43 -07:00
Zach Fox	1e52e7824b	Fix injection	2017-09-29 16:39:07 -07:00
Zach Fox	255cede808	Correctly determine if we're on a marketplace screen	2017-09-29 16:05:26 -07:00
LaShonda Hopper	6571aef997	[Case 6491] makeStretchTool: Fix z undefined issue (details below). ... z:z appears to have been a typo, as there's no var z. Should likely be z:1. Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-09-29 18:52:39 -04:00
Nissim Hadar	2e1919eba5	Merge branch 'master' into hazeZone	2017-09-29 15:16:46 -07:00
Anthony J. Thibault	9273e02497	Bug fix for offset of animated parts of oculus touch controller display ... Ensure position/rotations are updated with a consistent scale and are animated correctly as the controller values change.	2017-09-29 14:01:50 -07:00
Zach Fox	63396a2fc3	WalletScriptingInterface; wallet status refactor	2017-09-29 13:42:04 -07:00
David Rowe	75365847a1	Merge branch 'master' into vr-edit-a	2017-09-30 09:30:38 +13:00
SamGondelman	b59ec07171	move hud rendering to render thread, still need to separate out hud overlays	2017-09-29 09:49:08 -07:00
Seth Alves	7645808694	Merge pull request #11479 from druiz17/more-bugs ... fixing grabbing and tablet bugs	2017-09-28 20:02:47 -07:00
Seth Alves	3d05a0c07c	Merge pull request #11484 from druiz17/grab-js ... disable grab.js in HMD	2017-09-28 17:27:26 -07:00
Howard Stearns	d1350a03c2	working checkpoint, but with a lot of debug/development stuff	2017-09-28 17:06:07 -07:00
druiz17	45b8bfdb1f	disbale grab.js in HMD	2017-09-28 16:17:39 -07:00
Thijs Wenker	cabd68a63a	Every time a dialog opened in edit.js a new callback is created, which wasn't disconnected after the event happened, this caused lots of entities to be created after each next import.	2017-09-28 16:03:09 -07:00
Zach Fox	2cff5c1fa6	First time Purchases tutorial	2017-09-28 15:12:55 -07:00
Zach Fox	66be558a04	My Items Interface	2017-09-28 14:04:57 -07:00
druiz17	1947f2ba99	remove update stylus	2017-09-28 13:23:28 -07:00
Zach Fox	68c08969ae	Update Purchases	2017-09-28 12:49:38 -07:00
LaShonda Hopper	ff051db79a	[Case 6491] Minor: Fixes some paren spacing. ... Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-09-28 15:06:09 -04:00
LaShonda Hopper	0deabf54ef	[Case 6491] Minor: fixes some coding standard spacing with wantDebug statements.	2017-09-28 15:04:28 -04:00
LaShonda Hopper	2bb76a357a	[Case 6491] Some adjustments to isActiveTool (details below). ... * isActiveTool now respects null and undefined args. * If null or undefined toolHandle is passed, activeTool is directly tested against those values. Rather than explicitly returning false. * Added some clarification to unknown tool warning message. Reviewed-by: Leander Hasty <leander@1stplayable.com> Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-09-28 15:04:28 -04:00
LaShonda Hopper	bed50dda2f	[Case 6491] Fixes consistency issue with lights (details below). ... Fixes issue with light selection actions having inconsistent ui in comparison to other selections from an earlier commit change. As of this commit: * When translating point lights, the edge grabbers are no longer be visible. * When rotating or translating spot lights, the edge grabbers are no longer visible. Note: * For both point & spot lights, when translating and/or rotating, their circle and/or radial guides should remain visible. This commit shouldn't have any influence on that behavior. Tested: * Rotating and translating spot lights. * Translating point lights. Didn't test rotation as only spot lights support rotation. Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-09-28 15:04:28 -04:00
LaShonda Hopper	9fb76340c7	[Case 6491] removes SelectionDisplay.mode (details below). ... This var isn't needed as the var essentially piggy backed off of activeTool and activeTool.mode. This also helps guard against the _majority_ of situations where mode check fails due to typo inserted when composing the check. Most instances of manual string checks have been replaced by querying activeTool via new isActiveTool function. For instances that still require a direct mode check getMode will return the mode string associated with the current activeTool. TODO: Get this code reviewed.	2017-09-28 15:04:28 -04:00
LaShonda Hopper	3a174780c2	[Case 6491] Minor: Move that.updateHandleSizes up (details below). ... It was down below the amidst the mouse event handlers. This just moves it up with the other that.update handle functions definitions. Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-09-28 15:04:28 -04:00
LaShonda Hopper	9279290b2e	[Case 6491] Remove dupe pickRay var (details below). ... Ran lint pass and found the dupe define. As noted in a previous commit, the only remaining lint issues are as follows: * scripts/system/libraries/entitySelectionTool.js: line 17, col 1, Read only. * HIFI_PUBLIC_BUCKET assignment * scripts/system/libraries/entitySelectionTool.js: line 19, col 1, Read only. * SPACE_WORLD assignment * scripts/system/libraries/entitySelectionTool.js: line 30, col 1, Read only. * SelectionManager assignment Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-09-28 15:04:28 -04:00
LaShonda Hopper	c286ee95a4	[Case 6491] Zero state improvements (details below). ... Fixes issue where when translating the selected object(s), user view was obstructed by grabber handles. This also brings more consistency to the selection ui state between rotation and translation user interactions. Both types of interactions feel nicer with the selection ui as concise as possible during the action, limited only to that useful for the current interaction. Expected Behavior: Note the following presumes you're in creation mode. * When the selection is clicked, the rotation, stretch, clone, and translateY handles should turn invisible. * When moving a selection along either the x or z axis, the rotation, stretch, clone, and translateY handles should be invisible and remain that way until the user releases the selection. * When the selection is released, the rotation, stretch, clone, and translateY handles should become visible. * When the translateY handle is clicked, the rotation, stretch, and clone handles should turn invisible. The translateY handle should remain visible. * When moving the selection along the y axis, the rotation, stretch, and clone handles should be invisible and remain that way until the user releases the selection. The translateY handle should be visible during the entire interaction. * When the selection is released, the rotation, stretch, clone should become visible. The translateY handle, visible the entire time, should already be visible. * When the user click somewhere other than a selection, entity object, creation menu or tools, then any current selection should be unselected and all creation ui local to it should turn invisible. * When the user exits creation mode, any current selection should be unselected and all creation ui local to it should turn invisible. TODO: * We may want to visit the scaling interaction ui as well; however, that could be a later task as it's tangential. The changes here are a good first step. * The idea with that interaction is perhaps only showing the handle for the current scaling operation. Currently when scaling all of the other handles remain visible, though their appearance does update. Reviewed-by: Leander Hasty <leander@1stplayable.com> Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-09-28 15:04:27 -04:00
LaShonda Hopper	45c4a1081b	[Case 6491] entityToolSelection logging/print review (details below). ... * Added some wantDebug guards to print sections without them. * Normalized error logging statements to have script name and/or specific script function where reasonable. * All error statements contain at least the script name and a descriptive snippet of the error or clue to resolve it. * Removed some stale todos. Reviewed-by: Leander Hasty <leander@1stplayable.com> Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-09-28 15:04:27 -04:00
Leander Hasty	0b86169500	[Case 6491] remove rotateOverlayTarget. ... It is no longer used. Reviewed-by: LaShonda Hopper <lashonda@1stplayable.com>	2017-09-28 15:04:27 -04:00
Leander Hasty	74734f35e9	[Case 6491] more uniform grabber tools; more distrust of rotateOverlayTarget. ... Rotation tools' onMove methods now use rayPlaneIntersection rather than using the giant invisible rotateOverlayTarget. It can likely be entirely removed in the next commit. tool.onBegin's signature is now (event, pickRay, pickResult, ...) -- this allows us to avoid recomputing the ray or intersection when unnecessary. translateXZTool is now a part of the grabberTools array; addGrabberTool and addStretchTool have been modified to return the tool reference (and not disassemble and reassemble the tools, so they can keep their own local functions and state). This does make the array potentially less type-uniform, which may (?) undo some javascript optimizations, but allows us to eventually remove some state -- and they're only 1x/frame methods. We now compute rotationNormal in rotation tool onBegin, rather than having many different normals lying around. Merged the final branches in mousePressEvent. Also fixed issue with mode TRANSLATE_XZ test within updateRotationHandles. Reviewed-by: LaShonda Hopper <lashonda@1stplayable.com>	2017-09-28 15:04:27 -04:00
Leander Hasty	fa74fbc986	[Case 6491] fixes rotation skip near 0 and 180. ... Previously, when rotating, it would be easy to achieve 1 degree granularity, except near the 0 degree and 180 degree "poles", where it would often e.g. jump from 10 to -10, or 174 to -175, or similar. yawZero/pitchZero/rollZero were all based on the yawHandle/pitchHandle/rollHandle ray intersection, and were not necessarily coplanar with rotateOverlayTarget. As a result, centerToZero didn't lie on the expected plane, while centerToIntersect did. This had the effect of distorting the rotation range. We also have a possible issue in here with editOverlay(rotationOverlayTarget,{rotation:...}) not taking effect immediately. Better to take the existing ray and cast against a known plane, as e.g. translateXZTool and such do. No risk of stale rotation in that case. This also cleans up rotationHelper args a bit to avoid some string switches and keep flow a little more readable. TODO: propagate ray-plane test to helperRotationHandleOnMove rather than relying on ray hit location; normalize onBegin/onMove/etc across all tools to take queryRay and results args to avoid recreating the ray. Reviewed-by: LaShonda Hopper <lashonda@1stplayable.com>	2017-09-28 15:04:27 -04:00
LaShonda Hopper	fe171af31b	[Case 6491] entitySelectionTool mousePressEvent refactor/cleanup (details below). ... Fixes situations where attempting to click on a rotate, grab, or scale handle that was in front of others might unexpectedly activate the obscured handle. As of this commit the flow of mousePressEvent such that the first item whether it be a tool or selection is what reacts and absorbs the click/touch. This is counter to the prior behavior where whichever item or tool last passed the check would determine what was hit and handled the touch _even_ when it wasn't the first thing to be touched. * Got rid of some unused/stale vars * Added some convenience functions * setRotationHandlesVisible function * setStretchHandlesVisible function * setGrabberMoveUpVisible function * Removed checkIntersectWith helper functions as they're no longer used. * Normalized onBegin signatures for all GrabberTools to support the new flow within mousePressEvent. * These are tools registered via addGrabberTool/makeStretchTool. * The onBegin signature changes from onBegin( event ) to onBegin( event, intersectResult ). * This allows for a simpler tool triggering where tools which utilized the additional information provided will have it, those which may need it the future shall have it with little issue, and those that don't care may ignore it. NOTE(s): * Tested normal movement within opening creation menu: Passed * With Creation Menu Open: * Tested clicking around the world in empty space: Passed * Tested single selection: Passed * Tested single selection rotation (pitch, yaw, roll): Passed * Tested single selection translation (xz, y): Passed * Tested multiple selection: Passed * Tested multiple selection rotation (pitch, yaw, roll): Passed * Tested multiple selection translation (xz, y): Passed Reviewed-by: Leander Hasty <leander@1stplayable.com> Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-09-28 15:04:27 -04:00
LaShonda Hopper	96afbeca23	[Case 6491] Dedupe rotation handle tool code (details below). ... Pulled the common code shared between the rotation handle tools out into helper funcs: * helperRotationHandleOnBegin * helperRotationHandleOnMove * helperRotationHandleOnEnd These functions either take in or derive the necessary info needed to handle a specific rotation axis. NOTE(s): * Tested yaw, pitch, & roll handles using a box. The behavior remained consistent with that prior to this commit. Reviewed-by: Leander Hasty <leander@1stplayable.com> Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-09-28 15:04:26 -04:00
LaShonda Hopper	926789437c	[Case 6491] Propagates rotation reposition fix from YawHandle (details below). ... This wraps the selections rotation update handling into common helper function utilized by all rotation handle tools (yaw,pitch,roll). This function is the generalized fix previously exclusive to yawHandle. This functions is now called within onMove for yaw, pitch, & rollHandle tools. NOTE(s): * Tested yaw, pitch, & roll rotation didn't see any aberrant behavior. ** Tested overlapping shapes and selecting the overlapping portions followed by a rotation handle. Only one took hold as a selection. ** Tested multiple selection and objects rotated & repositioned about the encapsulating bounding box's center point as expected. * Tested translation with multiple items selected and it behaved as expected. Reviewed-by: Leander Hasty <leander@1stplayable.com> Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-09-28 15:04:26 -04:00
LaShonda Hopper	18cc632df5	[Case 6491] Minor: Switching off wantDebug flags that were left on. ... Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-09-28 15:04:26 -04:00
LaShonda Hopper	196b665e22	[Case 6491] Cleanup of mousePressEvent/tool(s) onBegin (details below). ... * Removes unregister tools switch which was never reached. * Rolls all code rotation handle related code within mousePressEvent to the respective rotation handler onBegin functions. * onBegin call site updated accordingly to provide intersection data that code depends upon. * Moves all translateXZTool code explicitly within mousePressEvent to the tool's onBegin function. * onBegin signature updated accordingly to provide intersect results that the tool relies upon. * Found and fixed a bug with translateXZTool where its startingElevation and startingDistance properties were _only_ set when local _debug_ var was set. * This appears to have been responsible for being able to move the object farther than was visible. Re-tested with fix and wasn't able to get that behavior any longer. * Wrap intersect tests within more reader friendly functions. NOTE(s): * Tested GrabberMoveUp and Rotation Handles. They work as they did previously as expected. * Tested selection behavior and it currently maintains as expected. * Tested translationXZTool and it maintains its prior behavior with the improvement noted above. Reviewed-by: Leander Hasty <leander@1stplayable.com> Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-09-28 15:04:20 -04:00
LaShonda Hopper	ae8ae6f6cc	[Case 6491] Grabbers stay invisible while rotating (details below). ... This fixes the issue where grabbers would re-appear when rotating the selected object rather than staying hidden. updateHandles will now take the mode into account when deciding if the non-light grabber handles should be visible. This can be subverted by the user selecting a light source as in line with the previous behavior. Adds some debug prints in event handlers guarded by local wantDebug checks. Has some minor cleanup changes: * Remove unused var within updateRotationHandles * Readability improvement for light check within updateHandles * Pulled up rotate mode check within updateHandles * Added grabberCloner visibility flag within updateHandles Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-09-28 14:58:30 -04:00
LaShonda Hopper	15ff4ebecb	[Case 6491] Adds some debugging prints. ... Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-09-28 14:58:30 -04:00
druiz17	3b05317db6	fixing grabbing and tablet bugs	2017-09-28 11:18:40 -07:00
Zach Fox	f0d668c5c3	Fix marketplace injection problems - yay!	2017-09-28 11:14:44 -07:00
Daniela	4a1dd975a9	Fix bubble scale issue for IPD Secondary Task List: bubble.js Scale.	2017-09-28 17:05:06 +01:00
Daniela	13eb7db462	Change teleport.js to update render state more frequently.	2017-09-28 16:12:20 +01:00
David Rowe	30c4a22441	Merge branch 'master' into vr-edit-a	2017-09-28 16:10:26 +13:00
Nissim Hadar	4d8a1db895	Merge branch 'master' into hazeZone ... # Conflicts: # libraries/entities-renderer/src/RenderableModelEntityItem.cpp	2017-09-27 17:50:51 -07:00
Seth Alves	3016ce0a2b	Merge pull request #11470 from sethalves/fix-grab-vs-trigger ... set grabbable and other checkboxes correctly if userData is blank	2017-09-27 15:24:37 -07:00
Zach Fox	7ad3a5a1e3	Commerce: Tons of Interface changes (#11463) ... * canRez(Tmp)Certified() * CertifiedItem beginnings * Skeleton of verifyOwnerChallenge() * Controlled failure; updateLocation() skeletion * Controlled failure on checkout page with ctrl+f * Skeleton Purchases first-use tutorial * Initial progress on new setup * Security pic tip * Skeleton Certificate page * Updates to Certificate * General progress; setup is nearly complete * Better buttons; last step almost done * Initial progress on wallet home * Completed recent transactions * Security page * Scrollbar * Fix auth error text * PassphraseSelection * Change security pic * Minor layout changes; beginnings of emulated header * Various layout changes; wallet nav bar * Help screen * Quick onaccepted change * First pass at new purchases * Small style updates * Some error progress * Lightbox in purchases * Collapse other help answers when clicking on another * REZZED notif * Commerce Lightbox * Lots of new interactions in Purchases * Hook up 'view certificate' * Fix errors, fix close button on cert * Purchases timer; much faster filter * Add debugCheckout * Purchase updates * GlyphButton; separator; Checkout Success; Ledger fix; debug modes * Lock glyph below security pic should be white * Various fixes, round 1 * Circular mask * Passphrase change button fix; TextField error edge highlighting * Recent Activity fixes * Various changes * Standard Security Pic location * Color changes * Filter bar changes * Styling for multiple owned items * Minor language change * Header dropdown (harder than expected) * Small fixes * View backup instructions * marketplaces.js onCommerceScreen * Beginnign of new injection * Marketplace injection changes * Purchase button style changes * More button styling * MY PURCHASES button * marketplace onUsernameChanged * New help QA * Help text changes etc * Downscale security image, reducing filesize * Lots of bugfixes * Cleanup before PR * Only open cert during inspection if commerce switch is on * Help text changes * Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey * Quick glyph change * New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet	2017-09-27 14:43:51 -07:00
druiz17	58a00a89d7	remove debug print	2017-09-27 12:58:11 -07:00
druiz17	cea3c002dd	improving far rotate	2017-09-27 11:47:26 -07:00
druiz17	38096b48d9	fixing entitySelectionTool	2017-09-27 10:52:56 -07:00
Seth Alves	eb6c99456d	Merge branch 'master' of github.com:highfidelity/hifi into fix-grab-vs-trigger	2017-09-27 10:01:24 -07:00
Daniela	c22d2add17	Resolve conflict with hifi/master.	2017-09-27 17:06:12 +01:00
Brad Hefta-Gaub	3500705d0c	Merge pull request #11427 from ElderOrb/case7723 ... 7723 Tablet Should Rotate Faster when using Create app	2017-09-26 22:05:45 -07:00
David Rowe	6b3b2beae0	Merge branch 'master' into vr-edit-a	2017-09-27 15:34:52 +13:00
Seth Alves	ae42d56cd6	Merge pull request #11465 from hyperlogic/bug-fix/teleporter-near-scale ... Teleport.js: can now teleport small distances with small avatar scale	2017-09-26 19:05:14 -07:00
Seth Alves	ce3e5eb1a3	set grabbable and other checkboxes correctly if userData is blank or malformed. near-trigger blocks near-grab	2017-09-26 18:56:27 -07:00
Seth Alves	f384cde471	Merge pull request #11467 from sethalves/fix-near-trigger ... Fix near trigger	2017-09-26 17:27:05 -07:00
Dante Ruiz	410baaf7bc	Merge pull request #11464 from druiz17/controller-dispatacher-bugs ... fix auto dropping and re-grabbing loop	2017-09-26 16:46:34 -07:00
Seth Alves	8180acbffc	use same trigger test as in isReady	2017-09-26 16:29:22 -07:00
Andrew Meadows	dafadf82bb	Merge pull request #11458 from jherico/fix/tablet_latency ... Fix long tablet lag on first load	2017-09-26 16:18:31 -07:00
Seth Alves	a478506da3	Merge branch 'master' of github.com:highfidelity/hifi into fix-near-trigger	2017-09-26 15:52:22 -07:00
Seth Alves	644532dd59	only send startNearTrigger once	2017-09-26 15:17:23 -07:00
beholder	ef732fb547	enable 'close' button overlay on hover/leave with stylys/lasers	2017-09-27 01:07:32 +03:00
beholder	6409580b03	ignore intersection for 'close' button highlight overlay	2017-09-27 01:06:47 +03:00
druiz17	5a1242a1ac	fix spelling error	2017-09-26 15:06:31 -07:00
druiz17	76c1fe688c	fix auto dropping	2017-09-26 14:52:01 -07:00
Anthony J. Thibault	a7cfb5d635	teleport.js: fix for TELEPORT_CANCEL_RANGE with large/small avatar scale	2017-09-26 14:21:25 -07:00
Anthony J. Thibault	c26d04dca1	Teleport.js: Fix message bugs, and made eslint clean ... * 'Hifi-Teleport-Ignore-Add' and 'Hifi-Teleport-Ignore-Remove' messages should now should work * 'Hifi-Teleport-Disabler' message should now work	2017-09-26 13:58:00 -07:00
Seth Alves	a871a6db1d	Merge pull request #11430 from sethalves/fix-parent-grab ... Fix parent grab	2017-09-26 13:00:16 -07:00
beholder	24a12a2f8f	7722 Add onHover Outline to Tablet "X" Button	2017-09-26 22:31:56 +03:00
Seth Alves	81f74f9297	Merge pull request #11444 from druiz17/module-handcontrollerPointer ... Made handControllerPointer into modules in hope of preventing mouse cursor interference with tablet	2017-09-26 12:21:03 -07:00
Seth Alves	91f5f61ea3	Merge pull request #11456 from druiz17/bugs-handControllerGrab ... Correctly grab tablet in 3rd person	2017-09-26 12:19:20 -07:00
Seth Alves	913d3c4d12	Merge pull request #11422 from hyperlogic/feature/ant-man2 ... Secondary IPD fixes	2017-09-26 11:53:45 -07:00
Seth Alves	216888aa03	Merge branch 'fix-parent-grab' of github.com:sethalves/hifi into fix-parent-grab	2017-09-26 11:08:40 -07:00
Seth Alves	737b583745	avoid unequipping things during a HMD snap-turn	2017-09-26 11:08:33 -07:00
Dante Ruiz	e397d49564	Merge pull request #11159 from vladest/modal_dialogs_async ... Modal dialogs async	2017-09-26 11:07:42 -07:00
druiz17	2cc8a55151	fix cloning equiping	2017-09-26 10:37:36 -07:00
Daniela	e264503b9f	Merge remote-tracking branch 'upstream/master'	2017-09-26 17:49:15 +01:00
Daniela	179a426389	Address QA comments.	2017-09-26 17:44:46 +01:00
Seth Alves	0b60928dd3	fix rollup-to-parent code to only roll up to entity parents	2017-09-25 19:07:40 -07:00
Brad Davis	40c42d35a5	Fix long tablet lag on first load	2017-09-25 17:50:04 -07:00
druiz17	6332a53ee2	able to grab tablet in 3rd person	2017-09-25 16:36:29 -07:00
Seth Alves	5da5b24894	unmangle merge	2017-09-25 15:18:22 -07:00
David Rowe	428efa571e	Merge branch 'master' into vr-edit-a	2017-09-26 10:40:07 +13:00
druiz17	ec40df711d	fix tablet grabbing and eslint changes	2017-09-25 14:31:13 -07:00
druiz17	b1b31444f0	fix mouse visiblity	2017-09-25 11:34:18 -07:00
druiz17	dda20c1ef5	fixing merge conflict	2017-09-25 09:45:29 -07:00
Nissim Hadar	27af4685e7	Added range and altitude to UI.	2017-09-25 09:32:52 -07:00
Seth Alves	5741782f45	merge from upstream	2017-09-25 09:16:43 -07:00
Brad Hefta-Gaub	030da7d850	Merge pull request #11401 from druiz17/module-scale-entities ... ScaleEntity Module	2017-09-25 09:10:32 -07:00
Seth Alves	90954a4e4f	Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab	2017-09-25 09:09:58 -07:00
vladest	1a2d38e31f	Removed sounds for tablet in and out, added sounds for stylus instead. Added logging for testing semi-pressed laser and keyboard sounds	2017-09-25 17:11:44 +02:00
Nissim Hadar	1a9625d272	Merge branch 'master' into hazeZone	2017-09-24 18:27:36 -07:00
Nissim Hadar	6cbf087708	First version with combo for Haze Mode.	2017-09-24 15:08:22 -07:00
Zach Fox	921ebc221e	Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled ... Enable Inspection Mode for all; change Commerce setting name	2017-09-22 17:52:27 -07:00
druiz17	b8ee60a394	fix scripting error	2017-09-22 17:13:48 -07:00
druiz17	2c7b8cdb4f	fixing script issues	2017-09-22 16:26:41 -07:00
druiz17	ee9ac3e7f9	undo unnessary changes	2017-09-22 15:38:39 -07:00
druiz17	28d8af0b44	Merge branch 'master' of github.com:highfidelity/hifi into module-handcontrollerPointer	2017-09-22 15:33:17 -07:00
druiz17	e965b7fff1	hand controller pointer	2017-09-22 15:32:40 -07:00
Zach Fox	0eafdeab14	Fix hover -> unhover overlay behavior	2017-09-22 13:32:11 -07:00
Zach Fox	bb9db3ef6d	Updates to behavior and shader appearance	2017-09-22 11:24:30 -07:00
Nissim Hadar	5e1d470553	WIP	2017-09-22 09:48:22 -07:00
David Rowe	e0658c7a2f	Merge branch 'master' into vr-edit-a	2017-09-22 15:18:14 +12:00
druiz17	53efe6bfb2	working on fix	2017-09-21 18:17:05 -07:00
Anthony J. Thibault	54e627e2c5	Merge branch 'master' into feature/ant-man2	2017-09-21 13:59:47 -07:00
Seth Alves	fc3e259f6f	remove debug prints	2017-09-21 11:42:30 -07:00
Seth Alves	3c22c9ea3a	back out bad change	2017-09-21 11:39:14 -07:00
Zach Fox	57b5a23373	Enable Inspection Mode for all; change Commerce setting name	2017-09-21 11:18:21 -07:00
Seth Alves	24bfb3f3b9	oops	2017-09-21 11:16:00 -07:00
Seth Alves	363a2a3a7a	merge from upstream	2017-09-21 11:08:29 -07:00
Seth Alves	473db92a8e	fix some parent-grab bugs, re-enable adjusting equipped entities, don't trigger guns right when they are equipped	2017-09-21 11:07:47 -07:00
Daniela	d054c6dc36	Merge branch 'master' of https://github.com/highfidelity/hifi	2017-09-21 18:29:45 +01:00
Daniela	adde847798	Fix code standard.	2017-09-21 17:57:02 +01:00
Seth Alves	61efaf7fc2	Merge pull request #11420 from druiz17/fix-parenting-overlay-module ... nearParentGrab module now sets the correct previous parent id when switching grabbed overlays from one hand to another	2017-09-21 09:44:07 -07:00
Daniela	9787c31d70	Fix protect color pick from wrong user input.	2017-09-21 17:17:36 +01:00
druiz17	65e0c99618	small change	2017-09-21 09:07:49 -07:00
druiz17	2d7d6f85ba	fixing merge conflicts	2017-09-21 09:04:13 -07:00
Daniela	d960a7c42e	Merge branch 'master' of https://github.com/highfidelity/hifi	2017-09-21 16:20:51 +01:00
Daniela	7ccfac0b3b	Protect stroke width from wrong user input. Protect color pick from wrong user input.	2017-09-21 15:54:53 +01:00
beholder	8085d0292d	7723 Tablet Should Rotate Faster when using Create app	2017-09-21 16:26:54 +03:00
David Rowe	c05ccd2ed5	Merge branch 'master' into vr-edit-a	2017-09-21 14:08:16 +12:00
Anthony Thibault	03e278c5ae	Merge pull request #11416 from druiz17/stylus-pos ... Pull back the stylus position in hand.	2017-09-20 17:40:22 -07:00
druiz17	2c55419c60	change tablet forward offset	2017-09-20 16:49:45 -07:00
Seth Alves	90c97319ea	Merge pull request #11408 from druiz17/fix-tablet-input ... fixing/improving and cleanup tablet inputs	2017-09-20 16:36:07 -07:00
druiz17	949c343604	fixing nearGrabParentModule switching grabbed overlays	2017-09-20 15:34:01 -07:00
Thijs Wenker	7ea1968b33	Tip, Code Writer which comes standard with Windows 10, does enter tabs by default when using the tab key. >=)	2017-09-20 14:59:15 -07:00
Thijs Wenker	60a566768a	removed debug spam from makeUserConnection, to reactivate it set Settings.setValue('MAKE_USER_CONNECTION_DEBUG', true); and reload the script	2017-09-20 14:39:13 -07:00
druiz17	92f3dfe2ab	move the stylus back a bit	2017-09-20 14:23:43 -07:00
druiz17	c20c5ee2b5	fixed tablet grabbing issue	2017-09-20 14:10:10 -07:00
druiz17	2ce6dcf89d	fixing spelling error	2017-09-20 11:45:42 -07:00
druiz17	5d87036f32	make changes requests and slight fixes	2017-09-20 11:41:31 -07:00
vladest	c17ca955db	Listener disconnects in C++ now	2017-09-20 20:03:53 +02:00
Daniela	8144841258	Add Edit.js Entities spawn up according to the orientation of the avatar.	2017-09-20 09:21:16 -07:00
Anthony J. Thibault	0873b88347	code review feedback	2017-09-20 09:21:15 -07:00
druiz17	e78d8bc132	tablet on wiki planet	2017-09-20 09:11:06 -07:00
druiz17	9c66a25d83	fixing and cleanup tablet inputs	2017-09-19 17:03:53 -07:00
vladest	67771bc297	Merge branch 'master' into modal_dialogs_async	2017-09-19 21:51:02 +02:00
Daniela	1426e10024	Fix texture loading issue with upstream master. Tune amount of points.	2017-09-19 17:47:00 +01:00
druiz17	e2921661e9	scaling entities	2017-09-19 09:35:22 -07:00
David Rowe	c56fda88fa	Merge branch 'master' into vr-edit-a	2017-09-19 16:17:04 +12:00
druiz17	9df3b6c211	change tablet spawn position	2017-09-18 13:29:05 -07:00
Anthony J. Thibault	0757f513af	Merge branch 'master' into feature/ant-man	2017-09-18 11:36:39 -07:00
vladest	5585265349	Merge branch 'master' into modal_dialogs_async	2017-09-16 22:06:49 +02:00
Seth Alves	765031bf89	Merge pull request #11377 from vladest/create_resize ... Add resizable flag. Use the flag for Create only	2017-09-16 11:14:40 -07:00
Seth Alves	095cd03ee2	Merge pull request #11380 from ctrlaltdavid/fix-controller-typos ... Fix typos in controller modules disabler	2017-09-16 11:13:15 -07:00
vladest	5b033e021a	Merge branch 'master' into modal_dialogs_async	2017-09-16 12:30:07 +02:00
David Rowe	e788f691c4	Merge branch 'master' into vr-edit-a	2017-09-16 15:59:08 +12:00
David Rowe	6c5a1c0460	Address laser and controller interactions with HUD overlays and tablet	2017-09-16 15:45:44 +12:00
David Rowe	18b71f0c0f	Fix typos in controller modules disabler	2017-09-16 15:34:53 +12:00
vladest	de4f34aacb	Add resizable flag. Use the flag for Create only	2017-09-15 21:49:38 +02:00
Seth Alves	0816a8af27	fix grab entity methods	2017-09-15 12:07:50 -07:00
Seth Alves	b67c571aaa	fix grab entity methods	2017-09-15 12:05:49 -07:00
Artur Gomes	e37b98e0f5	Fix polyline optimization. ... Add more points to the polyline to check if the optimizations are working.	2017-09-15 19:20:33 +01:00
Seth Alves	df80b7ecfa	stopNearTrigger, not end	2017-09-15 11:16:54 -07:00
Seth Alves	39e6605f6f	fix grab entity methods + jshint cleanups	2017-09-15 10:50:46 -07:00
Anthony J. Thibault	f534ee5ad9	laser offset fix	2017-09-14 16:37:45 -07:00
David Rowe	b0c951a2c4	Merge branch 'master' into vr-edit-a	2017-09-15 11:09:39 +12:00
Thijs Wenker	af4bc59307	clone local avatar entities	2017-09-14 23:31:51 +02:00
vladest	0bfa29d0d4	Merge branch 'master' into modal_dialogs_async	2017-09-14 20:21:29 +02:00
Anthony J. Thibault	7959988622	Merge branch 'master' into feature/ant-man	2017-09-14 10:37:45 -07:00
Anthony J. Thibault	7c725756f1	IPD Fixes for controllerDispatcher and controllerModules	2017-09-14 10:36:05 -07:00
David Rowe	299a8078e3	Revert handControllerGrab.js related changes	2017-09-14 17:08:26 +12:00
Anthony J. Thibault	9a9f4a0d24	Fix controllerModules with appropriate IPD scale changes	2017-09-13 18:23:54 -07:00
Anthony J. Thibault	8fb69a9867	Merge branch 'master' into feature/ant-man	2017-09-13 18:23:11 -07:00
Anthony J. Thibault	745d2ff395	Remove handControllerGrab.js, see controllerDispatcher.js instead.	2017-09-13 17:36:56 -07:00
David Rowe	a4ecb69ea6	Merge branch 'master' into vr-edit-a	2017-09-14 12:26:20 +12:00
druiz17	1b288ef860	make garbbing radius the same as master	2017-09-13 16:15:36 -07:00
Anthony J. Thibault	a505a16232	Don't rescale tablet, in desktop mode, when sensorToWorldScale changes.	2017-09-13 14:22:49 -07:00
Anthony J. Thibault	ae2d0e89b4	Fixes for desktop tablet	2017-09-13 14:18:00 -07:00
Anthony J. Thibault	de5f0ad987	WebTablet.js: calcSpawnInfo works more consistently.	2017-09-13 12:01:41 -07:00
Anthony J. Thibault	9a1fa9b2f2	Fix for stylus intersection with tablet and home button for scaled tablets	2017-09-13 09:52:20 -07:00
Artur Gomes	b65520e788	Merge remote-tracking branch 'upstream/master'	2017-09-13 12:32:17 +01:00
druiz17	b3ff5c86f7	fixed secondary triggers and chest lid	2017-09-12 14:43:06 -07:00
Artur Gomes	6e5eb1d918	Made the number of points per line 70 again for test purposes.	2017-09-12 20:03:32 +01:00
Dante Ruiz	d90f6320a9	Merge pull request #8 from sethalves/controller-dispatcher-1 ... Controller dispatcher 1	2017-09-12 10:54:10 -07:00
druiz17	b634292261	fixing some small issues	2017-09-12 10:53:04 -07:00
Seth Alves	e9918ca599	add profiling to controller-dispatcher	2017-09-12 10:52:52 -07:00
Seth Alves	a9aa6df93e	Merge branch 'controller-dispatcher-1' of github.com:sethalves/hifi into controller-dispatcher-1	2017-09-12 10:44:29 -07:00
Seth Alves	315f874824	add profiling to controller-dispatcher	2017-09-12 10:44:09 -07:00
Seth Alves	2850029f26	add profiling to controller-dispatcher	2017-09-12 10:00:32 -07:00
Anthony J. Thibault	bb5e808051	Fix for some of tablet size issues, on switching domains.	2017-09-11 18:59:52 -07:00
druiz17	684aef23dc	Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1	2017-09-11 15:08:37 -07:00
druiz17	a46e41607c	fixed teleport, added avatar scaling, allow laser to be used on tablet when stylus is shown	2017-09-11 15:07:14 -07:00
Seth Alves	9c098f1a0c	Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1	2017-09-08 17:10:02 -07:00
druiz17	405d8c3afc	fixing cloning and laser	2017-09-08 17:07:27 -07:00
Seth Alves	a1ffc7abd0	distance from controller to object is sometimes decided by pickray	2017-09-08 17:04:09 -07:00
druiz17	42ef397b5e	fixed include path	2017-09-08 15:13:19 -07:00
Anthony J. Thibault	72e0c844e4	Merge branch 'master' into feature/ant-man	2017-09-08 14:08:26 -07:00
druiz17	e33012e522	laser on tablet update	2017-09-08 13:30:30 -07:00
druiz17	dbb91e5953	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-09-08 11:50:43 -07:00
druiz17	f0c12e50dd	some small bug fixes	2017-09-08 11:50:19 -07:00
Daniela	e453bf8d55	Refactoring.	2017-09-08 17:58:16 +01:00
Daniela	08688dc9ed	Refactoring.	2017-09-08 17:56:11 +01:00
Daniela	758f049f30	Correct offset for teleport pad.	2017-09-08 14:02:26 +01:00
Daniela	10e29d1cf0	Decrease offset for teleport pad. Add Bubble orientation and scale correction.	2017-09-08 12:45:29 +01:00
David Rowe	03ddf04140	Merge branch 'master' into vr-edit-a	2017-09-08 16:51:12 +12:00
Anthony J. Thibault	d0f9a20a01	Fix for tablet grabbing at small scales	2017-09-07 15:10:15 -07:00
druiz17	ef050a09f9	made requested changes and also allow entities/overlays to be grabbed by the grip button	2017-09-07 14:42:46 -07:00
Brad Hefta-Gaub	b316f366fc	Merge pull request #11198 from druiz17/oculus-tablet-position ... fixed tablet spawn position for oculus menu button	2017-09-07 12:30:33 -07:00
Brad Hefta-Gaub	fce8715457	Merge pull request #11306 from ElderOrb/case7385 ... 7385 - Collect Stats on "Exit VR" button	2017-09-07 10:18:58 -07:00
druiz17	636e906191	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-09-06 17:15:18 -07:00
druiz17	cc7a222374	fixing Hifi-Hand-Drop for equipEntity	2017-09-06 17:15:05 -07:00
David Rowe	83a8cb5fe0	Merge branch 'master' into vr-edit-a	2017-09-07 10:53:41 +12:00
druiz17	0d66bfca05	added far trigger	2017-09-06 14:58:04 -07:00
Daniela	0ac7e00612	Add Avatar resize compatible teleport.js pad scale	2017-09-06 19:45:03 +01:00
Dante Ruiz	a5553d5e1c	fixed text scale for notifications	2017-09-06 09:26:48 -07:00
Dante Ruiz	b4f7cb961a	Merge branch 'feature/ant-man' of github.com:hyperlogic/hifi into feature/ant-man	2017-09-06 08:38:08 -07:00
Dante Ruiz	15c853567d	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-09-06 08:34:28 -07:00
David Rowe	52bf8ac9a1	Merge branch 'master' into vr-edit-a	2017-09-06 13:33:33 +12:00
David Rowe	6838461b07	Display notification message when don't have rez permissions	2017-09-06 12:44:57 +12:00
Anthony J. Thibault	af8b147321	away.js - works better with sensor scale.	2017-09-05 17:34:35 -07:00
Dante Ruiz	a34dae4aad	adding scale to notifications	2017-09-05 17:12:40 -07:00
David Kelly	1fd30b1e0f	fix passphrase reset	2017-09-05 17:03:11 -07:00
Anthony J. Thibault	74f974c68f	Merge branch 'master' into feature/ant-man	2017-09-05 16:27:41 -07:00
Dante Ruiz	fec8482b69	Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man	2017-09-05 16:26:51 -07:00
Anthony J. Thibault	3d3bb2853a	Updated naturalDimensiosn for touch controller config ... Totally untested! I don't have an oculus. I'm sure it will work tho. ;)	2017-09-05 15:39:35 -07:00
Anthony J. Thibault	23ff1b9ead	Fixes for scaling controller display ... Adds MyAvatar.sensorToWorldScaleChanged signal.	2017-09-05 15:03:41 -07:00
David Kelly	4bdfe092cf	Regression in injection script	2017-09-05 12:28:31 -07:00
Dante Ruiz	cefa65de5e	some more small changes	2017-09-05 12:06:32 -07:00
Dante Ruiz	28694dcf8a	small change to contextOVerlays in farActionGrab	2017-09-05 11:46:06 -07:00
beholder	c0e7e5a8b2	7385 - Collect Stats on "Exit VR" button	2017-09-05 21:26:35 +03:00
David Rowe	44b365df6d	Merge branch 'master' into vr-edit-a	2017-09-03 10:57:32 +12:00
David Kelly	8723ff2df2	Merge pull request #11294 from zfox23/commerce_walletPassphraseModal ... Commerce: Wallet Passphrase Input Modal	2017-09-01 17:46:09 -07:00
Dante Ruiz	3b357ad61e	finshed handControllerGrab refactoring	2017-09-01 17:07:26 -07:00
Seth Alves	8ccacf34f4	Merge pull request #11290 from Menithal/21484 ... WL21484 - Add an additional parameter for entity animations to "allow translation"	2017-09-01 15:34:07 -07:00
Zach Fox	3cf0df518f	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal	2017-09-01 11:53:47 -07:00
Anthony J. Thibault	26e9e6e580	Fixes for stylus ranges and grab radii	2017-09-01 11:19:51 -07:00
Dante Ruiz	9bd368c0a9	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-09-01 08:27:09 -07:00
vladest	681fc529dc	Merge branch 'master' into modal_dialogs_async	2017-09-01 13:31:15 +02:00
druiz17	2948061904	code cleanup	2017-08-31 22:30:30 -07:00
David Rowe	269f1769be	Merge branch 'master' into vr-edit-a	2017-09-01 14:45:59 +12:00
Anthony J. Thibault	6618ba12e9	Merge branch 'master' into feature/ant-man	2017-08-31 18:10:39 -07:00
Dante Ruiz	7cf27c18d3	code cleanup and fix broken features	2017-08-31 18:06:55 -07:00
Anthony J. Thibault	a1b94fd9d2	Bug fixes for laser offset and avatar hold action	2017-08-31 17:26:00 -07:00
Zach Fox	fa25c434ca	Messages to marketplaces.js	2017-08-31 15:50:42 -07:00
Brad Davis	65b49a958f	Merge branch 'master' into 21484	2017-08-31 14:59:30 -07:00
Anthony J. Thibault	98c89cbe78	Fixes for stylus size and offset	2017-08-31 14:45:59 -07:00
Zach Fox	ce32d2d420	Checkout and Purchases	2017-08-31 14:12:05 -07:00
David Kelly	de2ce1cd5f	warning	2017-08-31 13:23:38 -07:00
Anthony J. Thibault	a0eb8152a6	fix for tablet spawn position	2017-08-31 13:15:46 -07:00
Anthony J. Thibault	1a01209020	Fixes for scaling tablet at high frame rates	2017-08-31 13:02:31 -07:00
druiz17	98b1fe6138	Merge pull request #11266 from ElderOrb/case6819 ... 6819 - Create button not disabled	2017-08-31 12:36:08 -07:00
David Kelly	396f108182	forgot this the first time	2017-08-31 12:18:46 -07:00
Zach Fox	914a6bae00	Commerce: Wallet Passphrase Modal	2017-08-31 12:18:38 -07:00
vladest	1b5e6fd5f8	Merge branch 'master' into modal_dialogs_async	2017-08-31 20:39:48 +02:00
Anthony J. Thibault	9c6b8a6826	Fixes for scaling tablet	2017-08-31 11:28:05 -07:00
Zach Fox	164eeaae64	Fix the duplicated buy buttons for admins on Marketplace	2017-08-31 10:41:44 -07:00
Daniela	42be6434af	Merge branch 'master' of https://github.com/highfidelity/hifi	2017-08-31 18:03:39 +01:00
David Rowe	8205b0d9d2	Merge branch 'master' into vr-edit-a	2017-08-31 15:45:15 +12:00
Anthony J. Thibault	6e6687c3a6	Change tablet dimensions as sensorToWorldScale changes	2017-08-30 18:21:25 -07:00
Dante Ruiz	47699d4439	fixed edit.js	2017-08-30 16:52:59 -07:00
David Kelly	988ee8c8d1	fix image provider, couple other things	2017-08-30 15:23:54 -07:00
Dante Ruiz	3960ec7d5a	finish main handControllerGrab refactoring	2017-08-30 15:20:03 -07:00
Zach Fox	f366743be7	Login; punctuationMode; new images	2017-08-30 11:07:03 -07:00
Zach Fox	1b48319a3f	Merge pull request #11267 from zfox23/commerce_zachsPunchlist1 ... Commerce: Zachs Punchlist 01	2017-08-30 10:10:56 -07:00
Anthony J. Thibault	9cd8b6991e	Merge branch 'master' into feature/ant-man	2017-08-30 08:58:55 -07:00
Dante Ruiz	ff134b338b	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-08-30 08:25:53 -07:00
howard-stearns	5b264a867a	fix wallet login (and share code with snapshot login)	2017-08-29 16:05:01 -07:00
Zach Fox	a9c99854f9	Haven't purchased anything yet UI	2017-08-29 15:39:07 -07:00
Dante Ruiz	49608f1253	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-08-29 15:19:16 -07:00
Dante Ruiz	ed52136fc5	finished equiping locked clone-able entities	2017-08-29 15:18:28 -07:00
Zach Fox	50241078ae	Buncha punchlist items checked off	2017-08-29 14:30:00 -07:00
beholder	180acbc188	6819 - Create button not disabled	2017-08-29 23:49:44 +03:00
Zach Fox	91f4e59f61	Misc fixes. Get started.	2017-08-29 12:33:44 -07:00
Dante Ruiz	4b592687b7	finished webEntityLaserInput, now working on cloning	2017-08-28 17:35:34 -07:00
Zach Fox	22d3857501	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory	2017-08-28 15:10:17 -07:00
Anthony J. Thibault	573985c7c9	Merge branch 'master' into feature/ant-man	2017-08-28 09:27:04 -07:00
Sam Gateau	a98d861600	Merge pull request #11242 from SamGondelman/tabletLayer2 ... Web overlays and entities are always non anti-aliased	2017-08-28 09:10:14 -07:00
vladest	38295ab73f	Merge conflicts	2017-08-28 16:58:30 +02:00
Dante Ruiz	0eceb7b382	unviersial web3d vs laser	2017-08-25 17:40:30 -07:00
Zach Fox	a03f9592c1	Inventory to Purchases	2017-08-25 16:34:48 -07:00
Zach Fox	d19377d2d4	Saving	2017-08-25 15:56:30 -07:00
Dante Ruiz	a5508c9f75	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-08-25 14:21:01 -07:00
Dante Ruiz	b3ffa7b6b4	Working laser vs tablet	2017-08-25 14:20:31 -07:00
Zach Fox	e606e3dfb3	Squashed commit of the following: ... commit 453897b9e2 Author: Zach Fox <fox@highfidelity.io> Date: Fri Aug 25 10:56:53 2017 -0700 Huge cleanup!	2017-08-25 11:45:37 -07:00
Zach Fox	453897b9e2	Huge cleanup!	2017-08-25 10:56:53 -07:00
Dante Ruiz	fa676aaadf	lasers on tablet working	2017-08-24 17:42:27 -07:00
Zach Fox	3980a478d9	Only show 'buy' on costed items'	2017-08-24 16:38:44 -07:00
Zach Fox	e2c74d8b88	Initial progress	2017-08-24 15:22:30 -07:00
SamGondelman	4a49801217	web overlays and entities are always nonAA	2017-08-24 14:23:21 -07:00
Dante Ruiz	eb6248400c	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-08-24 13:41:54 -07:00
David Rowe	2159d309e2	Merge branch 'master' into vr-edit-a	2017-08-25 08:36:22 +12:00
David Kelly	eb9436ba96	Merge pull request #11235 from davidkelly/dk/encryptFile ... Initial wallet app plus some encryption of security image	2017-08-24 13:17:14 -07:00
Menithal	e47dfeaeab	Merge remote-tracking branch 'upstream/stable' into 21484	2017-08-24 21:37:20 +03:00
Brad Hefta-Gaub	5c832eae9c	Merge pull request #11226 from SamGondelman/miceWithLasers ... EntityTreeRender uses RayPick API with precision picking	2017-08-24 08:10:21 -07:00
Dante Ruiz	dbe8aa77d7	working on laser v tablet	2017-08-23 17:32:41 -07:00
Zach Fox	e815946744	Merge pull request #11231 from ElderOrb/Case5830 ... 5830: Go-To menu shows up blank except for address bar	2017-08-23 14:33:04 -07:00
beholder	9cd784990c	5830: Go-To menu shows up blank except for address bar	2017-08-23 23:27:02 +03:00
Zach Fox	a489267cec	Hide behind switch and remove dead code	2017-08-23 10:48:47 -07:00
SamGondelman	d7b3686364	include noncollidable entities	2017-08-22 17:37:51 -07:00
Dante Ruiz	dc8d0c9604	disable far grab when on hud	2017-08-22 16:51:13 -07:00
Zach Fox	4d8980b538	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp	2017-08-22 12:30:24 -07:00
Zach Fox	f1da7a6381	Checkpoint	2017-08-22 11:53:37 -07:00
Anthony J. Thibault	d62a0ea8ff	Correct controller offsets with sensor scaling	2017-08-22 11:43:39 -07:00
vladest	b7a048c6ea	Adopt clonable settings to new styling	2017-08-22 11:23:55 -07:00
Dante Ruiz	cdd184e32d	intergradted teleport	2017-08-22 11:06:11 -07:00
Dante Ruiz	f6151fae85	slowly intergrating teleport.js	2017-08-21 16:53:28 -07:00
Dante Ruiz	94dc942d79	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-08-21 16:34:10 -07:00
Chris Collins	a85022bb93	Merge pull request #11216 from MidnightRift/emitterShouldTrail ... Change emitShouldTrail to emitterShouldTrail.	2017-08-21 15:29:05 -07:00
David Rowe	cddb054066	Merge branch 'master' into vr-edit-h ... # Conflicts: # libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp # scripts/system/controllers/handControllerGrab.js	2017-08-20 18:41:29 +12:00
Zach Fox	512a08f67f	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp	2017-08-18 17:05:56 -07:00
Howard Stearns	188cbee781	Merge pull request #11212 from howard-stearns/asynchronous-commerce-2 ... Asynchronous Ledger Interactions with Server	2017-08-18 15:40:24 -07:00
anshuman64	a7090c7e07	Merge pull request #11211 from vladest/edit_clonable_lost ... Adopt cloneable settings to new styling	2017-08-18 15:37:37 -07:00
Midnight	5f162c0352	Change emitShouldTrail to emitterShouldTrail.	2017-08-18 15:10:58 -07:00
Elisa Lupin-Jimenez	44f1f340e1	Merge pull request #11147 from elisa-lj11/blocks ... Adding Blocks Tablet App to Marketplace	2017-08-18 15:06:18 -07:00
Zach Fox	9636fad679	Updates from wireframes	2017-08-18 13:45:30 -07:00
Dante Ruiz	8d04047d8a	starting to integrate teleport.js	2017-08-18 13:23:44 -07:00
Sam Gondelman	cbf2bb3a61	Merge pull request #10980 from SamGondelman/sharks ... Reduce laser pointer lag	2017-08-18 13:14:38 -07:00
vladest	d29d4b5016	Adopt clonable settings to new styling	2017-08-18 21:44:44 +02:00
SamGondelman	c9f4958925	handControllerGrab fix, maybe, hopefully	2017-08-18 10:39:40 -07:00
howard-stearns	6e34ab45d6	Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce-2	2017-08-18 10:03:33 -07:00
howard-stearns	3d401129fb	checkpoint	2017-08-18 10:03:00 -07:00
Zach Fox	d052b49a54	Login and picture selection done	2017-08-17 16:34:33 -07:00
Zach Fox	5f69f30551	MOAR PROGRESS	2017-08-17 16:20:50 -07:00
Zach Fox	9135e37078	Go go go go gog o	2017-08-17 15:20:17 -07:00
Zach Fox	eab16fc28c	Initial progress	2017-08-17 15:01:25 -07:00
Menithal	dc5e374485	Merge remote-tracking branch 'upstream/master' into 21484	2017-08-17 22:28:43 +03:00
Elisa Lupin-Jimenez	2b44608ece	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-17 10:18:40 -07:00
Elisa Lupin-Jimenez	4b1498f727	moved blocksApp.js to unpublished scripts, added icon	2017-08-17 10:18:29 -07:00
Artur Gomes	e8fea16449	Fix for line points disappearing on second client (trying new value to ... see if the line replicates correctly)	2017-08-17 17:19:13 +01:00
Artur Gomes	e59ff51cdd	Fixed two icons showing up when picking a color from the color table or ... from the custom colors.	2017-08-17 16:25:33 +01:00
Artur Gomes	321742a865	Fix for points disappearing on second client (the one that's not ... drawing) (trying to limit it a bit more to see if it results in no loss at all)	2017-08-17 16:01:53 +01:00
Artur Gomes	2835130515	Fix dynamic hue not cycling through all the 360 hue values when drawing ... the line due to the change in the max size of the line.	2017-08-17 15:53:13 +01:00
Artur Gomes	4f5bfcbc2b	Merge remote-tracking branch 'upstream/master'	2017-08-17 14:57:31 +01:00
Artur Gomes	be35734074	Fix tablet not reopening after removing headset and putting it back on.	2017-08-17 14:56:29 +01:00
Artur Gomes	5e6e675f62	Replace stars brush.	2017-08-17 09:45:54 +01:00
Chris Collins	9c9bcd80b8	Merge pull request #11191 from SamGondelman/logging ... Miscellaneous logging fixes	2017-08-16 15:46:32 -07:00
vladest	15f8bc0141	Keep old function names for compatibility	2017-08-16 22:17:34 +02:00
druiz17	8eabf46a30	Merge pull request #11165 from 1P-Cusack/FogBugz/Case_6491_Part1 ... [Case 6491] Part 1 of entitySelectionTool clean up	2017-08-16 13:05:27 -07:00
Artur Gomes	8ef8e974b6	Merge remote-tracking branch 'upstream/master'	2017-08-16 21:00:29 +01:00
Artur Gomes	030877457b	Fix tablet not opening. ... Fix headers not showing correctly since changes in editProperties page.	2017-08-16 20:59:09 +01:00
vladest	4e5c650621	Modified some usecases for async dialogs	2017-08-16 21:41:18 +02:00
LaShonda Hopper	cc2ff565ac	[Case 6491] Ran lint on entitySelectionTool.js (details below). ... Prior Issue Count: 35 Current Issue Count: 3 Resolved: * 17 used out of scope issues. * 11 already defined issues. * 2 missing semicolon issues. * 1 implicit comparison against null issue. * 1 readability warning. Remaining Issues as of this commit: * scripts/system/libraries/entitySelectionTool.js: line 17, col 1, Read only. ** HIFI_PUBLIC_BUCKET assignment * scripts/system/libraries/entitySelectionTool.js: line 19, col 1, Read only. ** SPACE_WORLD assignment * scripts/system/libraries/entitySelectionTool.js: line 30, col 1, Read only. ** SelectionManager assignment One notable item was a chunk of code from makeStretchTool's onMove function which wasn't in scope of the vars being utilized. Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-08-16 15:21:30 -04:00
Artur Gomes	d4255928c7	Add sections to brushes tab. ... Add preview of special effects. Fix polyline poinst disappearing (using 48 points for now as a quick fix) Fix dynamic saturation and brightness effect being to strong.	2017-08-16 18:35:23 +01:00
Artur Gomes	3ddddf4ad6	Fix animated hue not working even though the checkbox was checked after ... restarting the interface.	2017-08-16 18:35:23 +01:00
Artur Gomes	270d41fabf	Fix animation flickering caused on multiplayer because both users ... where using the script to update the color and the color was also being replicated.	2017-08-16 18:35:23 +01:00
Artur Gomes	ca37c5ee94	Fix desktop drawing mode creating more than one entity in an unusual way.	2017-08-16 18:35:22 +01:00
Artur Gomes	fb696bcbac	Fix settings not being correctly restored when reloading tablet (when ... using desktop mode and right clicking over the tablet + refresh) Remove postMessage in favour of emitWebEvent to communicate between the tabs and the main script.	2017-08-16 18:35:22 +01:00
Artur Gomes	b41ef08428	Fix tablet loosing focus (from the drawing hand) when switching hands.	2017-08-16 18:35:22 +01:00
Artur Gomes	482924266c	Fix brush texture stretching at start. ... Add some code refactoring.	2017-08-16 18:35:21 +01:00
Artur Gomes	07416951e5	Did clean up of the code and unused files.	2017-08-16 18:35:21 +01:00
Artur Gomes	83cdd1739d	Add hue, saturation and brightness dynamic brushes. ... Add continuous drawing mode. Add new brushes. Remove some brushes. Fix animation play distance for when painting in Desktop mode. Fix Hue animation not starting from the chosen color (would always start from red). Fix multiple color polyline.	2017-08-16 18:35:15 +01:00
Artur Gomes	03b70ed492	Do not test! ... Add color qvector to polyline entity to allow for multiple colors through the line. Add some new icons to the tabs of the app.	2017-08-16 18:32:17 +01:00
Artur Gomes	108c02d05e	Fix Desktop painting weird behaviour when painting (painting surface not ... always facing the user, this happened because of the change of the paint surface direction on the last commit) Fix brush tint (was just changing color in the last commit, now is blending with the brush, using a kind of luminance blend effect) Remove unecessary files.	2017-08-16 18:28:59 +01:00
Artur Gomes	2d2efab5ed	Fix paint surface always facing the HMD instead of rotating with the ... brush/hand;	2017-08-16 18:28:58 +01:00
Artur Gomes	6e4ad996af	Make savedSettings variable null after it is used, since it is probably ... a cause for a big memory leak.	2017-08-16 18:28:58 +01:00
Artur Gomes	130ed238a5	Add restore tablet state after removing and putting back the headset. ... Update max line width; Remove erase tab in favor of a single undo button in the tabs bar; Add background color to brushes (using the same as the stroke color so the user can preview the stroke with the color); Add padding between custom color picker and preset colors table.	2017-08-16 18:28:58 +01:00
Artur Gomes	c477b50272	Fix brush weird behaviour when starting with clean settings (brush would ... be black and filled instead of appliying the correct texture with color)	2017-08-16 18:28:57 +01:00
Artur Gomes	ae078f4689	Add Avatar dominant hand as default hand the first time the user starts ... fingerpaint app or when the settings for the app are deleted. Add some checks to fix an non critical error (when trying to reset the left/right hands and they were not yet initialized)	2017-08-16 18:28:57 +01:00
Artur Gomes	c65010669b	Move line width widget from the palette tab to the brushes tab.	2017-08-16 18:28:57 +01:00
Artur Gomes	91a6f2c8d9	Add undo for created Entities in order to be able to remove entities ... when drawing in desktop mode. Fix keyboard not showing. Fix app button not being deactivated when switching to another app.	2017-08-16 18:28:56 +01:00
Artur Gomes	c94774ec18	Add Keyboard when input fields get focus in the palette tab. ... Add feedback when user picks a color from the table or from the set custom colors. Fix hand hovering tablet when entering the app (stopped working after restoring brush values).	2017-08-16 18:28:56 +01:00
Artur Gomes	5c40a6810e	Add drawing in Desktop mode. ... Remove dynamic rotation and translation brushes since the movement would be unsynced after a while, resulting in a poor user experience. Fix restoring last used settings taking to long, which caused the user to see the values to change after the tablet application was open. Fix using a different brush after restarting the app, if drawing before the brush was reset.	2017-08-16 18:28:55 +01:00
Artur Gomes	dffbc442be	Add new Interface (more similar to the ui used on other apps) ... Fix brush on repeat mode (keeps the the aspect ratio of the texture)	2017-08-16 18:28:55 +01:00
Artur Gomes	9d35cdcda3	Add save and restore last user settings; ... Fix multiple dynamic brushes not working in some cases (mixing axis would not work neither for rotation nor for translation); Fix tablet hovering detection only working for right hand;	2017-08-16 18:28:55 +01:00
Artur Gomes	c8d475dff1	Add new dynamic and colored brushes. ... - Add dynamic hue brush; - Add dynamic (animated) rotation and translation brush; - Add colored brushes that already have the colors set (user can't change it);	2017-08-16 18:25:03 +01:00
Artur Gomes	b6ccce3904	Add new brushes (In progress)	2017-08-16 18:25:03 +01:00
Artur Gomes	69a532ea45	Fix application button not resetting state after exiting the app. ... Fix hovering tablet detection not working before unhovering the tablet. Fix finger closing and opening while hovering the tablet and drawing.	2017-08-16 18:25:02 +01:00
Artur Gomes	b6beb2033f	Switch between stylus and fingerpaint mode when not painting and hand ... hovers the tablet. Replace OK button in color picker with Add button (allows user to add custom colors, and enables user to pick color just by pressing on top of the color picker);	2017-08-16 18:25:02 +01:00
Artur Gomes	9309f5137a	Add tablet application to replicate the existing overlay interface that ... uses qml. Add last user picked colors using the custom color picker so that users can easily reuse that color.	2017-08-16 18:25:02 +01:00
Delanir	3d8951a5e0	Replace Paint Source Entity by Overlay	2017-08-16 18:25:01 +01:00
Delanir	066598fe3f	Add Support to different UV modes in the finger paint script and deactivate "paint hand"	2017-08-16 18:25:01 +01:00
Delanir	faf57f068c	Override hand animation for finger paint. ... Paint hand stays in a pointing position while in paint mode.	2017-08-16 18:25:00 +01:00
Delanir	59719a13b6	Move fingerPaint folder into "scripts/system" and add fingerPaint script to DEFAULT_SCRIPTS_SEPARATE	2017-08-16 18:23:04 +01:00
SamGondelman	86cc938a47	Merge remote-tracking branch 'upstream/master' into sharks	2017-08-16 09:54:12 -07:00
Dante Ruiz	e48c14ec23	fixed tablet spawn position for oculus menu button	2017-08-16 09:08:55 -07:00
David Rowe	f1fe3be1f4	Merge branch 'master' into vr-edit-a	2017-08-17 00:13:08 +12:00
Seth Alves	3082c357f9	cloning sort-of works... cloning an equipable doesn't	2017-08-15 17:54:04 -07:00
Seth Alves	4bfbab294d	near-trigger works?	2017-08-15 14:53:58 -07:00
Seth Alves	03977334a0	near-trigger works?	2017-08-15 14:50:39 -07:00
Seth Alves	3b61e8518f	near-trigger works? equip calls its entity methods now	2017-08-15 14:46:48 -07:00
Seth Alves	ddca25672f	trying to get near-triggering working	2017-08-15 14:14:28 -07:00
vladest	273261ee57	Reworked WindowScriptingInterface browse method for async methods	2017-08-15 23:12:35 +02:00
vladest	8afdb27c1b	Reworked WindowScriptingInterface save method for async methods	2017-08-15 22:55:44 +02:00
Zach Fox	b7282cc776	Lots of fixes	2017-08-15 13:46:20 -07:00
Seth Alves	1d24523be9	equip drop gesture works	2017-08-15 13:09:17 -07:00
Seth Alves	e6ac07d43d	equipping mostly works	2017-08-15 11:45:45 -07:00
Zach Fox	bddce9328b	V1	2017-08-15 11:08:03 -07:00
Seth Alves	b2d7eefc97	equip highlight works now	2017-08-15 10:30:47 -07:00
Elisa Lupin-Jimenez	3d7995da34	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-15 10:01:24 -07:00
Seth Alves	774cb33303	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-08-15 09:17:52 -07:00
vladest	e9ed05c3ba	Reimplement snapshot dir browser for async	2017-08-15 15:55:36 +02:00
Seth Alves	b52a406ff1	trying to get equipping working	2017-08-14 18:25:57 -07:00
SamGondelman	1c27335193	a couple logging fixes	2017-08-14 17:34:32 -07:00
Seth Alves	13424eb792	kinematic-grab defaults to true	2017-08-13 17:42:08 -07:00
Seth Alves	9015d69c71	fix pop at start of far-grab	2017-08-13 17:21:55 -07:00
Seth Alves	f10dc7cbd5	allow far to near-grab transition	2017-08-13 16:54:37 -07:00
Seth Alves	58b199e9f9	far-grab sort-of works	2017-08-13 15:54:03 -07:00
Seth Alves	c2861d29d2	trying to get highlighting to work	2017-08-13 13:49:17 -07:00
Seth Alves	327bc23b5c	get ready for highlighting	2017-08-13 11:41:12 -07:00
Seth Alves	e7437d66ef	if a raypick hits something that's very close, put it into the nearby-entities list	2017-08-12 17:49:02 -07:00
Seth Alves	ec93172676	far-search rays work, but nothing else about far-grab.	2017-08-12 17:27:48 -07:00
Seth Alves	505b564c62	sort plugins isReady calls by plugin priority. hook up pickrays in data-gathering phase	2017-08-12 13:14:00 -07:00
Seth Alves	92cb1c9bf2	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-08-12 12:40:18 -07:00
Seth Alves	9fb1835a26	grabbing overlays works, again	2017-08-12 12:38:36 -07:00
Seth Alves	7ae41064db	tablet stylus works again	2017-08-12 11:19:39 -07:00
Zach Fox	c38837c200	Remove fixmes	2017-08-11 16:21:39 -07:00
Zach Fox	a21ff75a49	Big progress!	2017-08-11 12:54:55 -07:00
Seth Alves	b4a54b017a	plugins occupy activity-slots and more than one plugin may run at a time, as long as their slots aren't in conflict	2017-08-11 12:15:41 -07:00
Zach Fox	080c6da71a	Get HFC balance from QmlCommerce API	2017-08-11 10:49:11 -07:00
Zach Fox	d2362e6329	addInventoryButton() under setting	2017-08-11 10:31:32 -07:00
Zach Fox	e1064938cd	Add inventory; also fix some bugs	2017-08-11 10:31:32 -07:00
Seth Alves	128be5c2c1	Merge branch 'sharks' of github.com:SamGondelman/hifi into controller-dispatcher-1	2017-08-11 08:52:47 -07:00
David Rowe	401a00441a	Merge branch 'master' into vr-edit-a	2017-08-11 15:26:20 +12:00
Elisa Lupin-Jimenez	da5bb03187	Trying to add in a back button	2017-08-10 16:34:37 -07:00
SamGondelman	4c55849290	merge from master	2017-08-10 15:43:23 -07:00
Elisa Lupin-Jimenez	28476960bb	Moved Blocks to tablet app	2017-08-10 14:23:45 -07:00
howard-stearns	ca13d58b0b	blance and inventory stubs	2017-08-10 12:44:50 -07:00
Seth Alves	0d0f147056	port action-near-grab to dispatcher	2017-08-09 17:48:35 -07:00
Elisa Lupin-Jimenez	d3c76c99c2	See all markets button working again	2017-08-09 17:28:05 -07:00
Elisa Lupin-Jimenez	69a13052ab	commented out blocks injection	2017-08-09 17:23:08 -07:00
Zach Fox	2d256a62a9	Fix marketplaces message passing	2017-08-09 17:04:36 -07:00
Elisa Lupin-Jimenez	74c90d6323	minor typo	2017-08-09 16:08:47 -07:00
Elisa Lupin-Jimenez	a2e407f786	fixed merge conflicts in marketplacesInject.js	2017-08-09 15:59:20 -07:00
Seth Alves	5e3b573d19	Merge branch 'sharks' of github.com:SamGondelman/hifi into controller-dispatcher	2017-08-09 14:08:07 -07:00
Seth Alves	2c8aac53cd	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher	2017-08-09 14:05:49 -07:00
Zach Fox	65f9b0052f	Working buy button	2017-08-09 13:59:21 -07:00
Sam Gondelman	85c3f94976	Merge branch 'master' into sharks	2017-08-09 13:36:18 -07:00
Howard Stearns	cc634a2d1b	Merge pull request #11148 from zfox23/commerce_singleSetting ... New commerce mode now depends on 1 setting; bugfixes; Tablet -> TAB key	2017-08-09 13:25:10 -07:00
SamGondelman	6157f4fa55	script fixes	2017-08-09 11:56:25 -07:00
howard-stearns	1cf81495ab	basic commerce infrastructure	2017-08-09 11:50:52 -07:00
Zach Fox	33fa8c4f86	Fix bugs and also change to single setting	2017-08-09 11:44:09 -07:00
Zach Fox	61526256bc	Remove personalized comment	2017-08-09 09:30:18 -07:00
LaShonda Hopper	48e327815d	[Case 6491] Resolves arg order to centerToZero and centerToIntersection vectors. ... Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-08-09 11:38:44 -04:00
Elisa Lupin-Jimenez	d599753771	Started blocks download catch, fixed a debug typo	2017-08-08 18:43:35 -07:00
Zach Fox	9d60d5153f	Clarifying comment and turn setting off first	2017-08-08 18:00:17 -07:00
Zach Fox	4f85923517	Tons of fixes and improvements!	2017-08-08 17:58:41 -07:00
Zach Fox	b2c5a1f899	Fancy MutationObserver!	2017-08-08 17:12:06 -07:00
Elisa Lupin-Jimenez	efd25a5e70	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-08 16:55:10 -07:00
Zach Fox	871a5ff1ab	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_CheckoutQMLInvestigation	2017-08-08 15:53:22 -07:00
Zach Fox	69fc69cffb	Comment fix and overlay click fix	2017-08-08 15:52:59 -07:00
Andrew Meadows	71ba6ba10a	Merge pull request #10807 from jmo7/21356 ... 21356 - Reorder Edit.js	2017-08-08 15:15:37 -07:00
Zach Fox	7d26d2d88b	Switch and fix overlay clicks	2017-08-08 14:29:44 -07:00
Menithal	982d4a451f	Updated Protocol to add allowTranslation ... There still is a bug for the value no actually updating	2017-08-08 23:47:37 +03:00
Elisa Lupin-Jimenez	1102b27ba1	Fixed merge conflicts with master	2017-08-08 11:47:08 -07:00
SamGondelman	684001a756	workaround deadlock in editRenderState	2017-08-08 11:11:19 -07:00
David Rowe	f88191b7b3	Merge branch 'master' into vr-edit-a	2017-08-08 16:43:20 +12:00
Zach Fox	1493a310af	Beginning of stack stuff	2017-08-07 17:02:24 -07:00
Zach Fox	7e922cb2c2	Layout	2017-08-07 16:16:17 -07:00
Zach Fox	517128a939	More steps	2017-08-07 16:03:42 -07:00
Zach Fox	d7dd331685	Bugfixes	2017-08-07 14:39:31 -07:00
Zach Fox	7d4fd995f2	First steps	2017-08-07 14:29:47 -07:00
SamGondelman	489e08aef0	Merge branch 'master' of https://github.com/highfidelity/hifi into sharks	2017-08-07 13:29:00 -07:00
Dante Ruiz	38db4a6f47	fixed create spinner not appearing	2017-08-07 20:03:55 +01:00
Chris Collins	4acccb6ace	Merge pull request #11118 from cain-kilgore/chat-char-limit ... WL 21493 - Update the Chat.js to indicate when a message is too long	2017-08-07 09:52:57 -07:00
Seth Alves	c570d483d8	Merge pull request #11113 from elisa-lj11/zip_drag ... Zip drag (needs review)	2017-08-07 03:17:31 -07:00
Seth Alves	f898a05014	Merge pull request #11122 from ElderOrb/case6760 ... fix for 6760: Create Mode turns to Portrait when Reopening tablet	2017-08-06 19:02:47 -07:00
David Rowe	5d1732c5aa	Merge branch 'master' into vr-edit-a	2017-08-05 20:45:12 +12:00
SamGondelman	8b1c24e636	added setLockEndUUID, update handControllerGrab and grab	2017-08-04 18:26:11 -07:00
beholder	06c9378b03	fix for 6760: Create Mode turns to Portrait when Reopening tablet	2017-08-05 04:07:04 +03:00
anshuman64	22afb25d44	Capitalize "ENTER VR"	2017-08-04 17:19:26 -07:00
Elisa Lupin-Jimenez	c2cb7573c5	Removed commented out blocks code	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	06ff766952	Drag zip cleaned up, marketplaces stylized, back button fixed	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	9d2be28a8a	troubleshooting Blocks injection	2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez	ca6a323d54	Can drag blocks zip folder into hifi and upload the .obj	2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez	4570814145	Added Blocks to marketplace window	2017-08-04 16:56:30 -07:00
Elisa Lupin-Jimenez	a7dd6a5a41	Changed marketplaces message to be more discoverable	2017-08-04 16:56:30 -07:00
Cain Kilgore	f79a8b3cb5	Merge branch 'master' of https://github.com/highfidelity/hifi into chat-char-limit	2017-08-04 23:34:44 +01:00
Cain Kilgore	c8ebc299f5	Limited Max Length of the Chat Box to 256 - as this exceeds Message. max.	2017-08-04 23:25:26 +01:00
Brad Hefta-Gaub	8f98d0b7c8	Merge pull request #11114 from ElderOrb/case6677 ... 6677: Change "Desktop" App to Say "Exit VR"	2017-08-04 13:09:47 -07:00
beholder	d05e1677c3	6677: Change "Desktop" App to Say "Exit VR"	2017-08-04 23:04:15 +03:00
SamGondelman	bd942ec406	merge from master	2017-08-04 12:17:54 -07:00
Howard Stearns	71ce5a6494	Merge pull request #11016 from highfidelity/context-overlays ... Context Overlays	2017-08-03 16:28:14 -07:00
David Rowe	e2dccc1420	Merge branch 'master' into vr-edit-a	2017-08-04 07:33:18 +12:00
David Kelly	4b7779f0f5	add flag to outline render flags, fix pal.js/edit.js interaction	2017-08-03 07:57:21 -07:00
Brad Hefta-Gaub	0f73496a44	Merge pull request #11055 from misslivirose/fix-chat-bubble-length ... Fix chat bubble length	2017-08-02 23:29:09 -07:00
VRCat\VRKitten	e4e4ead4af	'Untabified' files	2017-08-02 16:56:02 -06:00
vladest	638eeede43	Merge conflict	2017-08-02 20:07:06 +02:00
Elisa Lupin-Jimenez	c03c1c80e1	Drag zip cleaned up, marketplaces stylized, back button fixed	2017-08-02 10:51:40 -07:00
Elisa Lupin-Jimenez	eb1fb1a1e1	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-02 08:28:55 -07:00
vladest	2d4396ac8e	Merge branch 'master' into fix_toolbar_apps_switch	2017-08-02 16:34:49 +02:00
vladest	4330e31212	Toolbar mode: 1. Fixed switching between different apps. 2. Fixed switching from Create	2017-08-02 16:32:09 +02:00
Anthony J. Thibault	1b6feb63c8	Fix for crash when attempting to teleport while avatar was loading ... The fix had two parts. * Make Avatar::getAbsoluteDefaultJointXXXInObjectFrame thread safe * Make teleport.js handle a zero foot offset more gracefully, to prevent the avatar from teleporting into the floor.	2017-08-01 18:40:43 -07:00
David Kelly	6ae516c46a	Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde	2017-08-01 15:45:34 -07:00
Seth Alves	b9456ab7b6	Merge pull request #11081 from Menithal/21464 ... Fixed Particle Editor Update event	2017-08-01 15:11:33 -07:00
Seth Alves	184c3d855d	Merge pull request #11061 from TurnMeUp-OG/21470 ... Fix tablet focus issue when property menu is open and field is selected	2017-08-01 15:10:26 -07:00
humbletim	3a9b8c02a6	* disable Avatar "follow" / recentering behavior when using HMD + "View > Mirror" ... * restore access to "View > Mirror" from HMD mode	2017-08-01 13:41:28 -04:00
David Kelly	bd7c4b3b26	Merge remote-tracking branch 'upstream/master' into context-overlays	2017-07-31 13:14:53 -07:00
Menithal	6020154867	Removed some whitespaces to trigger new build	2017-07-31 22:49:11 +03:00
Liv Erickson	ed9ea17917	remove semi-colon	2017-07-31 08:02:18 -07:00
Matti Lahtinen	5fab6c37a3	Removed stray variable test	2017-07-31 08:56:04 +03:00
Menithal	734330dc06	Fixed Particle Editor Update event ... Particle Editor was agressively refreshing when ever a particle was be ing up dated Added a flag check to make sure the particle was always using the latest version	2017-07-29 15:48:31 +03:00
Elisa Lupin-Jimenez	fcaebda04c	troubleshooting Blocks injection	2017-07-28 10:21:03 -07:00
Seth Alves	cfe3981bc2	cleanups	2017-07-27 18:22:17 -07:00
Seth Alves	fcf1dc839a	parenting near grab works	2017-07-27 17:52:23 -07:00
Seth Alves	f0c9f1d120	starting on controller-dispatcher experiment	2017-07-27 15:32:13 -07:00
jmo	003c483ec6	stray tabs changed to spaces, and long comment split to multiple lines	2017-07-27 15:21:58 -06:00
SamGondelman	e3288a9004	fix flicker, scissor warning, and handControllerGrab sphere size	2017-07-27 11:17:30 -07:00
Elisa Lupin-Jimenez	1c640cf37b	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-07-27 10:00:17 -07:00
David Rowe	52bb4a0f77	Merge branch 'master' into vr-edit-a	2017-07-27 20:37:46 +12:00
Chris Collins	ef67029837	Merge pull request #10912 from amvmoody/21374 ... WL 21374: Allow lights/particles to be dragged by icon	2017-07-26 22:07:36 -07:00
Sam Gondelman	fcaa39b245	Merge branch 'master' into sharks	2017-07-26 18:18:09 -07:00
SamGondelman	5e4a83dad9	defaultRenderStates, handControllerGrab.js, fix teleport.js a little	2017-07-26 17:58:39 -07:00
Zach Fox	8a7561d61b	IT'S WORKING SOB SOB SOB	2017-07-26 16:35:55 -07:00
Zach Fox	39cb0bc357	WHYYYY DOESN'T THIS WORK	2017-07-26 16:14:35 -07:00
Elisa Lupin-Jimenez	9cfc4dc91b	Can drag blocks zip folder into hifi and upload the .obj	2017-07-26 15:21:39 -07:00
Zach Fox	1336a59b6c	Stupid bracket	2017-07-26 15:14:58 -07:00
Zach Fox	17c7e38fce	Bugfixes?	2017-07-26 15:02:52 -07:00
Zach Fox	3a05219c59	Closer still	2017-07-26 14:10:41 -07:00
Liv	256853f79b	syntax and clarification on magic number 2 as half height	2017-07-26 13:28:52 -07:00
Liv	5bd6dac66c	wrap text if longer than 1m text entity	2017-07-26 13:24:56 -07:00
Zach Fox	65c28ca821	Bugfixes	2017-07-26 13:17:51 -07:00
Zach Fox	9147bc21d0	Getting there.	2017-07-26 11:41:27 -07:00
utkarshgautamnyu	71ddf1e7c1	Removed Compound Collision type	2017-07-26 10:20:17 -07:00
scromie@turnmeupgames.com	33ff5917be	fix	2017-07-26 19:34:20 +03:00
Elisa Lupin-Jimenez	adda4f0598	Added Blocks to marketplace window	2017-07-25 18:36:39 -07:00
Zach Fox	9020607ccf	First pass	2017-07-25 17:54:46 -07:00
utkarshgautamnyu	65192aa620	added additional collision types to asset browser and new model dialog	2017-07-25 17:12:13 -07:00
Elisa Lupin-Jimenez	f128dce185	Changed marketplaces message to be more discoverable	2017-07-25 10:16:05 -07:00
Zach Fox	40038ce54b	Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays	2017-07-25 09:33:07 -07:00
SamGondelman	3c8b964cc9	replace setHandLasers with drawHUDLayer overlay property	2017-07-24 18:16:40 -07:00
David Rowe	450badf023	Merge branch 'master' into vr-edit-a	2017-07-25 12:21:49 +12:00
Mike Moody	036a16c0b3	readded line that caused colflict.	2017-07-24 16:51:23 -07:00
Mike Moody	697830b80b	Merge branch 'master' of git://github.com/highfidelity/hifi into 21374	2017-07-24 16:50:38 -07:00
Mike Moody	4c78fba2cc	Removed line that caused colflict.	2017-07-24 16:50:33 -07:00
Chris Collins	8b978beb31	Merge pull request #11022 from 1P-Cusack/21463 ... WL21463 - entitySelectionTool: use multiarg findRayIntersection inste…	2017-07-24 15:13:21 -07:00
Mike Moody	7de164f1ab	moved below a check that returns.	2017-07-24 15:06:45 -07:00
Zach Fox	223ed5b59a	Hack to mod tablet orientation when clicking context overlay	2017-07-24 14:29:06 -07:00
Mike Moody	a4585b9400	Merge branch 'master' of git://github.com/highfidelity/hifi into 21374	2017-07-24 13:31:27 -07:00
milad	1ce1204a64	WORKLIST ISSUE # 21471 : FIX PARENT JOINT IN EDIT JS ... In entityPropeties.js line #1079 says: elParentJointIndex.addEventListener('change', createEmitNumberPropertyUpdateFunction('parentJointIndex')); The problem should be fixed by changing it to: elParentJointIndex.addEventListener('change', createEmitNumberPropertyUpdateFunction('parentJointIndex', 0)); createEmitNumberPropertyUpdateFunction() is parsing the value as a float to a default decimal position of 4. Looks like it only accepts integers. By adding in that 0 as a second argument, it should coerce the value to one that will be recognized by the UI/backend.	2017-07-24 10:06:44 -05:00
David Kelly	9c0026bf69	make sure context overlays are on after pal is dismissed	2017-07-21 08:40:12 -07:00
Leander Hasty	26cc8134eb	WL21463 - entitySelectionTool: use multiarg findRayIntersection instead of editOverlay. ... We're seeing the ignoreRayIntersection flag not take effect before findRayIntersection calls. This may be due to editOverlay and editOverlays becoming non-blocking in 1f7d2b2 . This altered the flow in mousePressEvent significantly; the first block, intended to handle scale/clone only, started handling rotation (should have been second block) and sometimes selection (should have been third block). Similarly, in the various rotate grabbers' onMove methods, the pickRay will no longer intersect anything other than rotateOverlayTarget; this avoids some awful behavior when scrubbing over the size and clone grabbers. This also reverts unnecessary parts of the prior commits to keep the diff for this WL cleaner, and adds a few TODO comments to revisit about redundant statements and incorrect names. In addition, we've noticed but not fixed herein: * There is a minor edgecase near 0 and 180, where it's difficult to get within a degree or two of the poles occasionally. * The scale/clone grabbers don't stay disappeared for rotation in some cases. This doesn't impact usability anymore, but it'd be nice to determine why they come back when they hide briefly. * The addGrabbers for yaw/pitch/roll could be deduplicated, and yaw has some multiselect "reposition" enable/disable logic that pitch and roll lack. Reviewed-by: LaShonda Hopper <lashonda@1stplayable.com>	2017-07-21 10:56:24 -04:00
David Kelly	5cd05da31e	strict comparisons	2017-07-20 15:16:40 -07:00
SamGondelman	5de0970365	put back ignoredEntities functionality in teleport	2017-07-20 14:17:52 -07:00
SamGondelman	c7f0f03fce	expanded RayPick JS API	2017-07-20 13:53:39 -07:00
Zach Fox	46d09a12fe	Fix bug where overlay would get stuck	2017-07-20 13:26:43 -07:00
Zach Fox	e18fec140a	Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into contextOverlays_improvements2	2017-07-20 13:03:34 -07:00
David Kelly	f365ce8abd	typo	2017-07-20 12:58:06 -07:00
SamGondelman	d156680bc8	ignore/include by ID, simplified caching logic	2017-07-20 12:15:06 -07:00
Zach Fox	f515a24568	UX improvements	2017-07-20 12:00:13 -07:00
David Kelly	b7be727b4c	turn off ContextOverlay for pal, edit. Improve clicks too	2017-07-20 11:30:55 -07:00
Dante Ruiz	3805228b70	fixed grab the tablet in third person	2017-07-20 16:26:51 +01:00
SamGondelman	bf243d6025	lockEnd, editRenderState, and updated grab.js	2017-07-19 17:45:21 -07:00
Zach Fox	2dc3844116	Improve reliability of hand lasers; increase size of target	2017-07-19 17:07:57 -07:00
Zach Fox	c866bd814d	Make clicks work right	2017-07-19 12:24:20 -07:00
SamGondelman	c6b3f69db0	teleport third eye laser on invalid hand pose	2017-07-19 11:51:31 -07:00
Zach Fox	1d26a268c1	Merge branch 'master' of https://github.com/highfidelity/hifi into HoverOverlay_CubeOverlay	2017-07-19 09:53:51 -07:00
Mike Moody	c56450b986	Moved function to a differnt location that handles both mouse and controller inputs.	2017-07-19 01:49:39 -07:00
David Rowe	c57b51235e	Merge branch 'master' into vr-edit-a ... # Conflicts: # scripts/system/controllers/handControllerGrab.js	2017-07-19 18:56:04 +12:00
Zach Fox	761d35d633	Getting there!	2017-07-18 17:10:23 -07:00
Zach Fox	82111a8f6a	Timer for hand controller lasers	2017-07-18 16:40:18 -07:00
Zach Fox	8f6af3a1ab	ContextOverlay	2017-07-18 16:28:24 -07:00
Zach Fox	265f978a06	It's working!	2017-07-18 15:57:26 -07:00
Dante Ruiz	b3ec306063	better version	2017-07-18 23:48:21 +01:00
Dante Ruiz	8cbe63f296	removed search laser in edit mode for 2d mode	2017-07-18 22:45:54 +01:00
Zach Fox	2b1a0921da	Initial work on clickable overlays	2017-07-18 14:01:16 -07:00
Brad Hefta-Gaub	d94365cc44	Merge pull request #10979 from zfox23/hoverOverlay_lasers ... Create/Destroy Hover Overlays using hand controller lasers	2017-07-18 08:44:48 -07:00
David Rowe	787815e939	Merge branch 'master' into vr-edit-a	2017-07-18 20:53:48 +12:00
Zach Fox	67c8ddfd57	Merge in changes from laser PR	2017-07-17 17:09:40 -07:00
Dante Ruiz	f5abb4a090	trying new tablet position spwan	2017-07-17 23:18:16 +01:00
Zach Fox	a37f0137e7	Destroy overlays when trigger released	2017-07-17 14:29:43 -07:00
SamGondelman	197ba83b10	remove old_teleport	2017-07-17 13:46:23 -07:00
Zach Fox	974dff36b0	Make hover overlays work for hand controller lasers	2017-07-17 13:16:53 -07:00
SamGondelman	ae99be0350	added faceAvatar and centerEndY, working on updating teleport.js, style fixes	2017-07-17 13:07:42 -07:00
Andrew Meadows	9584035aa4	Merge pull request #10886 from 1P-Cusack/21420 ... [Worklist #21420] Implement Create button disabled state (details below).	2017-07-14 10:06:45 -07:00
Liv	62be0af32d	string pass on Chat.js	2017-07-11 14:57:11 -07:00
David Rowe	283976fd87	Merge branch 'master' into vr-edit-a	2017-07-11 14:51:25 +12:00
jmo	a2b1b2e0f9	21356 - Reorder Edit.js ... Made changes to the 3 sub files for the properties tabs. Although visually the exiting menu looked like it was in different sections, structurally it was all just one run of item after item, with a fair amount of div-itis. I added in fieldsets to provide true groups and replaced much of the div-ities with aditional feidlsets as they are the smeantic element to use here.	2017-07-10 15:49:26 -06:00
Brad Hefta-Gaub	121cf76ee3	Merge pull request #10914 from sethalves/dont-think-during-mouse-move ... Dont think during mouse move	2017-07-10 10:36:03 -07:00
LaShonda Hopper	3ee9d8b766	[Worklist #21420] Ran lint on edit script (details below). ... Prior to and after addressing Worklist Item #21420, it was observed that the tool bar buttons popping in and out during load. Taking a while to become visible. Ran JSHint on the edit.js script to see if something stood out. Testing with the various lint fixes the odd loading behavior wasn't observed locally any longer. Pushing this up for testing. This may be what @CainFoool was seeing regarding the create button not appearing when testing a different PR as at times it took quite some time for the buttons to load properly. JSHint Issues Addressed: * Resolved instance of \"Use the function form of \"use strict\"\" ** Moved use strict declaration to the file function level. ** This fixed various unknown or not defined errors. * Resolved instances of \"\'const\' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).\" ** Switched const to var to avoid using keywords respected by only a subset of browsers. * Resolved various multiply defined vars. ** Notable callouts being position var and properties var. ** This should fix issues where the same var was being used though the intent of use may have varied. * Resolved instances of missing semi-colons PreFix: 51 JSHint issues detected PostFix: 0 JSHint issues detected. Changes to be committed: modified: scripts/system/edit.js	2017-07-10 12:23:28 -04:00
Mike Moody	53f581c3d4	Fixed Icons not being selectable while not highlighted.	2017-07-08 02:52:27 -07:00
David Rowe	a447e07ba5	Merge branch 'master' into vr-edit-a	2017-07-08 12:33:55 +12:00
Andrew Meadows	57842ce5a5	Merge pull request #10878 from mnafees/21355 ... CR for Job #21355 - Clean up and remove menu hotkeys	2017-07-07 14:01:21 -07:00
Zach Fox	e222753aac	Merge pull request #10911 from zfox23/PAL_adminFix2 ... Set admin status even if QML can't find user in PAL	2017-07-07 10:24:53 -07:00
Seth Alves	e4aa4823f9	Merge branch 'master' of github.com:highfidelity/hifi into dont-think-during-mouse-move	2017-07-07 08:51:38 -07:00
Zach Fox	ea77557e38	Correctly close PAL when switching domains	2017-07-07 08:09:19 -07:00
Mike Moody	d9706452ac	added ability to drag ParticleEffects and Light Entities around via Overlay Icon.	2017-07-06 23:32:22 -07:00
Mike Moody	be68d99bed	added ability to drag ParticleEffects and Light Entities around via Overlay Icon.	2017-07-06 23:17:23 -07:00
Zach Fox	8945b75cda	Merge pull request #10903 from zfox23/PAL_fixAdminColumn ... Ensure admins see PAL admin column	2017-07-06 13:38:10 -07:00
LaShonda Hopper	85111131da	[Worklist #21420] Resolves issue where domain changes didn't refresh the icon (details below). ... * Adds a local message/event: "Toolbar-DomainChanged" ** This message is sent by the application via its registered domain handlers: *** hostnameChanged *** connectedToDomain *** disconnectedFromDomain * edit.js subscribes to the "Toolbar-DomainChanged" event and updates the Create button icon as long as there's a valid known valid create button. Item Ticket Link: https://worklist.net/21420 Changes to be committed: modified: interface/src/Application.cpp modified: scripts/system/edit.js	2017-07-06 15:27:15 -04:00
Zach Fox	a5c7324ec5	Ensure admins see PAL admin column	2017-07-06 12:15:44 -07:00
ZappoMan	c3c9df0cd0	restore old camera state	2017-07-06 10:41:46 -07:00
ZappoMan	10341af819	Merge branch 'master' of https://github.com/highfidelity/hifi into godview	2017-07-06 09:39:33 -07:00
LaShonda Hopper	9cae868492	[Worklist #21420] Implement Create button disabled state (details below). ... * The create button icon is set to its disabled resource when the user enters a domain where they have _neither_ Rez or TempRez permissions. ** If the user has either of the Rez permission levels then the normal edit-i.svg icon is used and the user is able to create items as before. * When the user clicks the button in this state, the INSUFFICIENT_PERMISSIONS_ERROR_MSG is shown and creation menu is not shown. * The disabled icon, edit-disabled.svg, is based on the edit-i.svg and is set to 33% opacity. Item Ticket Link: https://worklist.net/21420 Changes to be committed: new file: interface/resources/icons/tablet-icons/edit-disabled.svg modified: scripts/system/edit.js	2017-07-06 10:53:46 -04:00
David Rowe	732e3d224a	Merge branch 'master' into vr-edit-a	2017-07-06 15:46:31 +12:00
Seth Alves	55b7c2d767	avoid doing a lot of work during mouse-move event-handlers	2017-07-05 15:50:05 -07:00
Zach Fox	6f2e7f5b83	Tweak the Snapshot 'Share' button to make its purpose more clear	2017-07-05 12:39:15 -07:00
Seth Alves	d917878638	fix whitespace	2017-07-05 11:29:09 -07:00
Seth Alves	ab340530b8	don't do a lot of processing during the mouse-move event handler	2017-07-05 11:27:13 -07:00
Mohammed Nafees	eb354a4333	Cleanup menu shortcut keys	2017-07-05 14:50:48 +05:30
David Rowe	cadd4685ee	No haptic pulse in edit modes when hand enters near-grab distance	2017-07-04 15:59:04 +12:00
David Rowe	83a78aa407	No handControllerGrab.js lasers while in VR edit mode	2017-07-04 15:54:33 +12:00
ZappoMan	d5acc8a6f9	Merge branch 'master' of https://github.com/highfidelity/hifi into godview	2017-07-03 12:21:29 -07:00
Brad Davis	31d2c9980e	Merge pull request #10797 from ctrlaltdavid/21396 ... Make Leap Motion a plugin	2017-06-30 14:37:23 -07:00
Brad Davis	3f48c7aef5	Merge pull request #10855 from jherico/snapshot ... Fix snapshot connection errors	2017-06-30 12:58:48 -07:00
utkarshgautamnyu	82597ac424	Update snapshot.js	2017-06-30 10:22:05 -07:00
David Rowe	a863e37eb5	Communicate VR edit enabled state to hand controller script	2017-06-30 12:11:06 +12:00
Brad Davis	6e5eff9407	Fix snapshot connection errors	2017-06-29 10:01:48 -07:00
utkarshgautamnyu	e6be838e79	Update snapshot.js	2017-06-28 15:30:49 -07:00
Brad Davis	de88a34e97	Fix toolbar button activation states	2017-06-26 23:33:32 -07:00
Ryan Huffman	209a4f33b5	Merge pull request #10784 from huffman/feat/pal-replicated ... Disable silence + ban buttons for replicated users	2017-06-26 12:50:23 -07:00
Brad Hefta-Gaub	a32f7b2395	Merge pull request #10743 from humbletim/21383 ... CR 21383: Integrate attachments into doppleganger mirror	2017-06-26 09:54:04 -07:00
David Rowe	bed0e8ef87	Merge branch 'master' into 21396 ... # Conflicts: # interface/src/avatar/MySkeletonModel.cpp	2017-06-26 12:07:25 +12:00
David Rowe	6543b74b52	Add beeps	2017-06-24 14:26:01 +12:00
Ryan Huffman	b56cfa56c7	Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated	2017-06-23 14:23:20 -07:00
David Rowe	9d0407cbdf	Merge branch 'master' into 21396	2017-06-23 16:52:04 +12:00
Brad Hefta-Gaub	7668fbb7a0	Merge pull request #10755 from seefo/fb5278 ... Fixed an issue where toolbar buttons duplicated themselves when reloading scripts	2017-06-22 13:35:05 -07:00
David Rowe	6ff8aed5e3	Merge branch 'master' into 21396	2017-06-22 23:54:15 +12:00
Ryan Huffman	0e7ddfd29f	Disable silence/ban buttons in PAL if avatar is replicated	2017-06-21 09:49:16 -07:00
Zach Pomerantz	8e1cf763e3	Merge pull request #10756 from zzmp/audio/input-level ... Update chrome for the audio input level meter	2017-06-20 15:33:17 -07:00
Zach Pomerantz	c826858458	revamp tablet MicBar	2017-06-20 11:43:02 -07:00
seefo	00a3fc77a1	Fixed an issue where toolbar buttons duplicated themselves when reloading scripts	2017-06-20 11:18:22 -07:00
David Rowe	513e0cd232	Fix import of JSON with parent-child relationships	2017-06-20 16:44:25 +12:00
humbletim	89ebf4998f	relocate/archive original doppleganger mirror into unpublishedScripts/marketplace/doppleganger-mirror	2017-06-19 10:28:56 -04:00
Stephen Birarda	39e8510ccb	Merge pull request #10720 from seefo/fb5386 ... Fixed a bug where you could not print polaroids if you took a gif	2017-06-16 15:03:45 -07:00
seefo	a4d008eec9	Fixed a bug where you could not print polaroids if you took a gif	2017-06-16 08:57:27 -07:00
David Rowe	a8501a7ac6	Remove old Leap Motion code	2017-06-15 14:45:40 +12:00
Zach Pomerantz	a8f69bb2e0	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-13 17:41:52 -04:00
Zach Pomerantz	e7da007acd	only show Audio menu title when appropriate	2017-06-13 17:13:39 -04:00
Zach Pomerantz	20c0dac8e8	update QML with Audio.muted	2017-06-13 16:10:16 -04:00
Zach Pomerantz	337b6bca14	update JS with Audio.muted	2017-06-13 16:02:58 -04:00
Anthony Thibault	0d46b78bff	Merge pull request #10541 from Menithal/21324 ... Reworked Particle Editor UI	2017-06-13 13:00:54 -07:00
Matti Lahtinen	35f83afd09	Removed unneccessary print	2017-06-13 20:43:14 +03:00
Menithal	c2c1e607c0	Formating	2017-06-13 20:31:41 +03:00
Menithal	395cc55fb2	Fixed formatting	2017-06-13 20:20:54 +03:00
Menithal	020760cc97	21324: Fixed accidental inccorect bracket	2017-06-13 20:16:56 +03:00
Menithal	00701eb5c7	Merge remote-tracking branch 'origin/master' into 21324	2017-06-13 19:08:37 +03:00
Menithal	0edb763dac	21324: Formatting and PR Feedback Changes	2017-06-13 19:06:47 +03:00
Zach Pomerantz	b37a0239b0	up to reverb (needs cherry-picking)	2017-06-12 18:00:52 -04:00
Bradley Austin Davis	1968ecbc8f	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
Seth Alves	92fe8145be	Merge pull request #10616 from vladest/create_button_sticked ... Set active button property isActive before Home menu redraw. Makes su…	2017-06-11 13:43:41 -07:00
Seth Alves	eb049c8c6e	Merge pull request #10624 from misslivirose/feat/add-primitive-shapes ... Add additional primitive shapes	2017-06-09 19:02:54 -07:00
Clément Brisset	8e62bdea40	Merge pull request #10538 from ctrlaltdavid/21345 ... Position tablet relative to hand	2017-06-09 17:01:37 -07:00
David Rowe	fff8876b21	Code review	2017-06-10 09:33:45 +12:00
Seth Alves	759a87c27e	Merge pull request #10647 from misslivirose/feat/move-chat-defaultscripts ... Move chat app to run with default scripts	2017-06-08 20:26:34 -07:00
Liv Erickson	6657c4d997	Update chat.js ... remove stray semicolon	2017-06-08 17:22:18 -07:00
Seth Alves	d87b858c0a	Merge pull request #10619 from NeetBhagat/4869-Entity-resize-issue ... 4869 entity resize issue	2017-06-08 16:34:07 -07:00
Seth Alves	9fa74029c7	Merge pull request #10633 from mnafees/21299 ... CR for Job #21299 - Save category on Marketplace when using back button	2017-06-08 16:10:56 -07:00
Vladyslav Stelmakhovskyi	b7f8cc7f0b	Fix intendantion	2017-06-08 22:58:40 +02:00
Liv	0e27ad767c	Move chat app to be included as part of the default scripts	2017-06-08 13:07:01 -07:00
Vladyslav Stelmakhovskyi	dc2c79baab	Merge with master	2017-06-08 21:10:30 +02:00
seefo	8d5b90afe7	Merge pull request #10600 from seefo/snapshot ... Added Polaroid Feature to Snapshot	2017-06-07 17:05:29 -07:00
seefo	26bd6b67ae	Final touches to polaroid feature	2017-06-07 16:52:16 -07:00
Mohammed Nafees	608becef7d	Make the back button work again, uses the browser history directly now.	2017-06-07 15:52:06 +05:30
Andrew Meadows	f1dd5fbb14	Merge pull request #10613 from hyperlogic/bugfix/teleport-with-no-feet ... teleport.js should still function on avatars with no feet.	2017-06-06 09:33:00 -07:00
Liv Erickson	6e5cb63d4f	Add z-index fix for dropped down list	2017-06-06 09:15:41 -07:00
Anthony J. Thibault	90d241ca3c	Account for avatar scale	2017-06-06 09:10:46 -07:00
seefo	b729707ce7	Removed old comments in SnapshotReview.js	2017-06-06 09:10:25 -07:00
Liv	e4963e076a	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes	2017-06-05 17:38:28 -07:00
Liv	9248715b21	Fixing z-index for Shape drop down	2017-06-05 17:37:32 -07:00
Seth Alves	dcbd279bd8	Merge pull request #10589 from vladest/create_in_landscape ... Implements landscape mode for tablet as rotation instead of stretching [DO NOT MERGE]	2017-06-05 12:46:03 -07:00
Liv	6cecac36d5	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes	2017-06-05 12:23:23 -07:00
Andrew Meadows	85a1e1d691	Merge pull request #10608 from ctrlaltdavid/21379 ... Fix icon for polylines in entities editor properties page	2017-06-05 11:06:23 -07:00
NeetBhagat	2ce72d554b	Resolve 2 issues: ... 1) Entity can grow/shrink if it is grabbed by first right hand then left hand. 2) Stop unwanted grow/shrink of an entity.	2017-06-05 14:13:51 +05:30
NeetBhagat	967c50ab93	Merge branch 'master' into 4869-Entity-resize-issue	2017-06-05 11:08:51 +05:30
Menithal	4842de8f07	Fixed issue with orientation	2017-06-04 00:03:14 +03:00
Vladyslav Stelmakhovskyi	4dbe646c17	Set ective button property isActive before Home menu redraw. Makes sure redraw will read proper value of isActive property	2017-06-03 15:40:25 +02:00
Anthony J. Thibault	7da73d0ff1	teleport.js should still function on avatars with no feet.	2017-06-02 18:01:40 -07:00
Clément Brisset	0a864a7ce9	Merge pull request #10570 from ctrlaltdavid/21376 ... Move record script files to unpublishedScripts directory	2017-06-02 16:25:56 -07:00
manapa01	8e1577d3d3	Merge pull request #10596 from manapa01/Snapshot-Sound ... Snapshot sound	2017-06-02 16:07:05 -07:00
Patrick Manalich	0b2de18e8e	Volume Change	2017-06-02 16:04:03 -07:00
Clément Brisset	5f91d2dcb7	Merge pull request #10569 from ctrlaltdavid/21312 ... Improve positioning of assets when added / imported	2017-06-02 15:45:18 -07:00
seefo	fa726f43a6	Fixed a bug in Polaroid canRez listener	2017-06-02 13:47:58 -07:00
seefo	7ade5b07a6	Final touches to Polaroids	2017-06-02 11:35:56 -07:00
David Rowe	58c4a2f12a	Fix icon for polylines in entities editor properties page	2017-06-03 06:26:13 +12:00
seefo	655a411865	Cleaned up Polaroid code	2017-06-02 11:02:01 -07:00
Patrick Manalich	a705e722f1	Ctrl-S sound feature added	2017-06-02 10:35:57 -07:00
NeetBhagat	580c2548e9	Initial Commit : ... 1) Resolve a bug when 2 different entity is grabbed in 2 hands. And move your left hand and entity of left hand grow/shrink when you move right/left hand. 2) Resolve right hand-left hand grow-shrink functionality	2017-06-02 23:04:58 +05:30
ZappoMan	60048a231f	god view controller	2017-06-02 10:26:54 -07:00
Patrick Manalich	0c71cf4bda	Edit: Snapshot will make sound when initially clicked	2017-06-02 10:24:27 -07:00
Patrick Manalich	4e61db8263	Snapshot will make sound when initially clicked	2017-06-02 10:24:27 -07:00
Vladyslav Stelmakhovskyi	8068e7201d	Fix position after rotation. May be fix rotation in HMD mode	2017-06-02 18:58:18 +02:00
David Kelly	70b6236890	Merge pull request #10605 from davidkelly/dk/analyticsForBubble ... Add UserActivity calls for bubble usage	2017-06-02 09:48:15 -07:00
David Kelly	2feea16063	added comment	2017-06-02 09:47:03 -07:00
David Kelly	4dae77cd9d	make sure we dont log the initial call to onBubbleToggled	2017-06-02 08:45:02 -07:00
Menithal	e76dfe4182	21324: Implementation of last feedback ... - If properties are expanded, the animation wrapper should now use the values - Decimal Values from filled in data now automatically get reduced the 1000th. The fields however will allow one to set smaller values and show it, until the entity is selected again - If particle is locked, keep fields locked.	2017-06-02 06:59:23 +03:00
Brad Davis	9a80a81321	Merge pull request #10565 from vladest/fix_claraio_download_clones ... Make sure that there is only one connection created for web events, s…	2017-06-01 20:42:50 -07:00
Menithal	bdcf9a0070	Merge remote-tracking branch 'upstream/master' into 21324	2017-06-02 06:39:55 +03:00
seefo	4e190434d1	Added polaroids to snapshots	2017-06-01 16:53:48 -07:00
David Kelly	37b738ff8b	initial cut at some UserActivities for the bubble	2017-06-01 16:46:31 -07:00
Zach Fox	4e929f6d92	Merge pull request #10581 from zfox23/snapshot_fixForUrlShare ... Snapshots: Fix incorrect "for_url" share; ensure old snapshots don't get shared when they shouldn't	2017-06-01 11:51:14 -07:00
Vladyslav Stelmakhovskyi	b0e4b752d5	Implements landscape mode for tablet as rotation instead of stretching	2017-06-01 19:07:17 +02:00
Vladyslav Stelmakhovskyi	30ab9771ef	Merge branch 'master' into create_in_landscape	2017-06-01 16:06:15 +02:00
Zach Fox	53701371ab	Fix some bugs :(	2017-05-31 16:43:21 -07:00
Liv	27d4edd2d0	Add circle and cone to entity shape list	2017-05-31 16:25:11 -07:00
Liv	f594fd6aa5	Merge branch 'feat/add-primitive-shapes' of https://github.com/misslivirose/hifi into feat/add-primitive-shapes	2017-05-31 15:14:04 -07:00
Zach Fox	70fdb4a168	Fix incorrectly sharing old snapshots	2017-05-31 14:47:07 -07:00
Zach Fox	fd92afff8c	Ensure old snaps don't accidentally get shared for_url	2017-05-31 14:47:07 -07:00
David Rowe	f0c56dac3f	Further files required for record script	2017-06-01 09:09:17 +12:00
David Kelly	e1700915f7	remove extra activity logger call	2017-05-31 13:28:57 -07:00
Seth Alves	e80704f3c9	Merge pull request #10578 from thoys/fix/grabableDynamic ... Edit.js: Fix hidden dynamic property while clone-able is active	2017-05-31 12:54:36 -07:00
Thijs Wenker	5c5aaf3254	Fix hidden dynamic property whenever the item is clone-able / DRYing propertyUpdates	2017-05-31 20:18:42 +02:00
Zach Fox	0441d8c703	Add placeholder image when previous snapshot can't be loaded	2017-05-31 10:27:17 -07:00
David Rowe	d891c834ba	Move record script files to unpublishedScripts directory	2017-05-31 09:06:11 +12:00
Vladyslav Stelmakhovskyi	0f80a8b7af	On create button, switch Tablet to landscape mode	2017-05-30 16:51:04 +02:00
David Rowe	f5066aac51	Don't adjust position of imported entities of particular types	2017-05-30 15:53:03 +12:00
David Rowe	1e8698aee1	Snap imported JSON to grid	2017-05-30 15:23:18 +12:00
David Rowe	e02021bddf	Tidying	2017-05-30 14:38:59 +12:00
David Rowe	b176dbe544	Refactoring	2017-05-30 14:35:59 +12:00
David Rowe	4c0296daaa	Reposition imported JSON entities so that they start at import distance	2017-05-30 14:29:10 +12:00
David Rowe	18558dd795	Make JSON import distance 2m	2017-05-30 13:34:17 +12:00
David Rowe	31df18ff5b	Fix snap-to-grid elevation	2017-05-29 18:43:49 +12:00
David Rowe	6c890d90ef	Adjust position of model after its been resized	2017-05-29 17:48:01 +12:00
David Rowe	f0785cd39e	Adjust creation position so that bounding box is creation distance away	2017-05-29 13:52:36 +12:00
David Rowe	9b679325ff	Don't raise creation position if in independent or entity view mode	2017-05-29 13:35:54 +12:00
David Rowe	508dee4580	Increase entity creation distance to 2m	2017-05-29 13:35:18 +12:00
Vladyslav Stelmakhovskyi	bcee25acc7	Make sure that there is only one connection created for web events, so downloads from CLARA IO not duplicated	2017-05-28 19:54:41 +02:00
Menithal	0e46c11a94	Fixed not being able to override slider sizes	2017-05-28 11:59:30 +03:00
David Rowe	367b3ec603	Handle nonvertical avatar orientation	2017-05-28 09:59:32 +12:00
Menithal	4e97f8ad9c	Removed stray print	2017-05-27 16:21:25 +03:00
Menithal	26389be826	Minor tweaks to unselect behavior	2017-05-27 11:18:29 +03:00
Menithal	9201af96bd	Added Changes from Alan's Feedback	2017-05-27 11:02:01 +03:00
Menithal	5500f8240d	Merge remote-tracking branch 'upstream/master' into 21324	2017-05-27 09:55:56 +03:00
David Rowe	2a88f5cc79	Merge branch 'master' into 21345	2017-05-27 11:51:29 +12:00
Stephen Birarda	6c2758e4ea	fix reference to pending transfer count for progress/stats	2017-05-26 14:37:24 -07:00
Liv	06a5467b50	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes	2017-05-26 09:10:50 -07:00
David Rowe	de4184e9fa	Merge branch 'master' into 21345	2017-05-26 15:49:47 +12:00
Liv	d3e900e42f	Adding first pass on cone shape	2017-05-25 12:54:49 -07:00
Liv	417d9ec80b	Surface cylinder option for primitive shape to html	2017-05-25 11:04:25 -07:00
Seth Alves	de40604042	whitespace	2017-05-25 09:54:40 -07:00
Seth Alves	80e641b6d4	fix code that was using old raypickInfo.properties field	2017-05-25 09:47:02 -07:00
David Rowe	f1dca5019a	Fix making the tablet horizontal	2017-05-25 11:48:28 +12:00
David Rowe	6452e92ac9	Hand controller data may not be valid	2017-05-25 11:28:26 +12:00
David Rowe	925cca97db	Make the tablet horizontal	2017-05-25 09:16:17 +12:00
Menithal	a3fc87fb23	Removed straggling print	2017-05-24 21:27:47 +03:00
Menithal	3f9b306c7f	Finalized UI changes doing final tests	2017-05-24 21:23:30 +03:00
Menithal	255540d0f8	Reverted a few files	2017-05-24 10:16:46 +03:00
Menithal	674f1f5f3a	Trying to hunt down a specific issue	2017-05-24 09:53:01 +03:00
David Rowe	39654779fb	Position tablet relative to hand	2017-05-24 13:35:00 +12:00
Menithal	9aa7e2e56d	Adjusted values	2017-05-23 02:19:52 +03:00
Menithal	46acbe1aba	Fixed typo	2017-05-22 11:27:32 +03:00
Menithal	d5b7a4e36b	Doing some one-way binding for now. ... - Oddly, there is still an issue with the webview occasionally not appearing when a particle is selected, and appearing inthe wrong time. Investigate.	2017-05-22 02:45:24 +03:00
Menithal	b8695e2509	Returned undescore, is smaller overally actually	2017-05-22 01:14:51 +03:00
Menithal	c6a22bcfa3	Majority of the Bindings complete	2017-05-21 20:49:07 +03:00
Menithal	4269fcf69c	Lots of Groundwork for UI Building ... - Changed underscore to lodash for smaller file size / faster loading - Removed dat.gui dependency, as we now have a completely custom solution - Started to use some more modern convensions which Qt Supports	2017-05-21 19:42:14 +03:00
Menithal	42bb5fa8e9	Part. Tab now only appears if selected ... - Particle Tab now only appears if a Particle Entity is selected	2017-05-20 13:47:24 +03:00
Zach Fox	6765451cc8	Ensure snapshots without story_ids get uploaded	2017-05-19 10:36:31 -07:00
Zach Fox	8efac1e7f1	Prevent another GIF from being captured while one is processing	2017-05-18 14:30:08 -07:00
Thijs Wenker	2d6c6af37f	Merge pull request #10381 from Triplelexx/21297 ... DNM 21297 - Edit.js: Make the default particle system attractive	2017-05-17 15:55:40 +02:00
Triplelexx	c678fd67ed	change default particle texture to production	2017-05-17 14:52:11 +01:00
Brad Hefta-Gaub	b0d2de7bc0	Merge pull request #10427 from ctrlaltdavid/21334 ... Fix erroneous "did not start playing recording" messages	2017-05-16 20:54:27 -07:00
Brad Hefta-Gaub	b759a148f3	Merge pull request #10480 from ctrlaltdavid/21360 ... Add domain to record script user activity logging	2017-05-16 20:48:27 -07:00
Seth Alves	36f8d08b32	Merge pull request #10450 from hiflex/patch-1 ... Fix the Face Camera checkbox on the text entity properties tab.	2017-05-16 20:31:56 -07:00
David Rowe	04fcdfc4a2	Add domain to record script user activity logging	2017-05-17 12:23:53 +12:00
Triplelexx	5a742002e2	change default particle values	2017-05-16 23:39:38 +01:00
Zach Fox	aa0394c2ef	Fix case when user stories would be incorrectly deleted	2017-05-16 11:07:03 -07:00
David Rowe	0cd5fe35da	Lint	2017-05-16 15:54:55 +12:00
David Rowe	8ab261d1b0	Work around Script.clearTimeout() occasionally failing	2017-05-16 15:52:34 +12:00
David Rowe	4b175e98e9	Delete persistence entity if recording fails to load for manual playback	2017-05-16 15:30:30 +12:00
David Rowe	6d9bf2b33e	Typos	2017-05-16 13:58:42 +12:00
David Rowe	6bdd498ecf	Cancel autoplay when manually playing	2017-05-16 10:47:52 +12:00
David Rowe	5c5eb298f5	Better error message	2017-05-16 09:20:58 +12:00
David Rowe	8480a8e7d5	Merge branch 'master' into 21334	2017-05-16 08:52:31 +12:00
Philip Rosedale	6e82343b29	Merge pull request #10406 from amvmoody/21289 ... 21289 - Edit: Add the ability to duplicate an object with hand controller	2017-05-13 20:43:52 -07:00
Zach Fox	d189f3f110	Fix the twitter mention	2017-05-12 12:39:10 -07:00
David Rowe	2bed69cfea	Display playback errors only for user that initiated playback	2017-05-12 15:18:25 +12:00
David Rowe	acd71caae2	Inform user when an AC error prevents a recording from playing	2017-05-12 14:53:38 +12:00
David Rowe	42aacb07ff	Remove check that recording has started playing	2017-05-12 14:14:24 +12:00
David Rowe	26672b475f	Clear timer value when timer stopped	2017-05-12 14:13:32 +12:00
hiflex	a4406906f3	Fix the Face Camera checkbox on the text entity properties tab. ... The checkbox appeared unchecked even if the underlying property was true.	2017-05-11 20:12:10 -05:00
David Rowe	d7a4396daa	Improve log messages	2017-05-12 11:45:11 +12:00
David Rowe	f74e29e4b0	Code review	2017-05-12 11:43:12 +12:00
David Rowe	021c3dff32	Merge branch 'master' into 21334	2017-05-12 10:34:16 +12:00
David Kelly	52c288bfed	Desktop users of different height can shake hands	2017-05-11 14:20:42 -07:00
Seth Alves	9d63113e62	Merge pull request #10337 from vladest/audio-source-sync ... Audio source sync	2017-05-11 12:50:38 -07:00
Vladyslav Stelmakhovskyi	bd6ac7a39e	Code style fixes	2017-05-11 20:38:09 +02:00
David Kelly	0ea5bf7834	Merge pull request #10440 from davidkelly/dk/fixSettingsDialog ... Fix for multiple settings dialogs	2017-05-11 08:11:16 -07:00
Vladyslav Stelmakhovskyi	f963233a7b	Merge branch 'master' into audio-source-sync	2017-05-11 15:25:24 +02:00
Thijs Wenker	0a3a2705af	Merge pull request #10426 from huffman/fix/tablet-invisible-by-default ... Fix tablet showing up for a short period of time on launch	2017-05-11 15:03:52 +02:00
Mike Moody	89d93ee56d	Updated HMD grab Clone to work with all entity types.	2017-05-11 04:16:22 -07:00
Philip Rosedale	f9567d0330	Merge pull request #10182 from CraftsmanMG/master ... hifi: #21216 - Resize entities with hand controllers while editing	2017-05-10 22:03:35 -07:00
David Kelly	4cc0aaf102	Fix for multiple settings dialogs	2017-05-10 18:31:57 -07:00
Triplelexx	7edda87330	change default particle to wispy smoke	2017-05-11 01:21:42 +01:00
Howard Stearns	3c652a52d8	Merge pull request #10431 from davidkelly/dk/messageLoggedInStatus ... minor handshake script update	2017-05-10 13:54:21 -07:00
Vladyslav Stelmakhovskyi	2328da3c48	Merge branch 'master' into audio-source-sync	2017-05-10 21:22:40 +02:00
Vladyslav Stelmakhovskyi	2d46f9d30e	Move most of the logic to C++ model, speed up initialization. Reduce number of AudioClient blocking calls to minimum	2017-05-10 21:21:39 +02:00
Chris Collins	3b5b567578	Merge pull request #10409 from hyperlogic/bugfix/hand-lasers-in-third-person-view ... Hand controller lasers work better in thirdPerson camera mode.	2017-05-10 10:35:35 -07:00
David Kelly	4536d3c484	cr feedback	2017-05-10 10:09:45 -07:00
David Kelly	a45dc673be	minor handshake script update	2017-05-09 17:33:33 -07:00
Zach Fox	8c2851b996	Merge pull request #10425 from zfox23/PAL_FixConnectionsDrift ... Enable the PAL to update data about a single connection	2017-05-09 16:01:45 -07:00
David Rowe	c2d22a1246	Log stopping playing recording	2017-05-10 10:57:53 +12:00
David Rowe	771b76690c	Clear timeout that checks recording started when stop recording	2017-05-10 10:56:23 +12:00
David Rowe	a7cc582459	Don't multiply heartbeats	2017-05-10 10:32:43 +12:00
Ryan Huffman	51db0cef98	Fix tablet showing up for a short time on launch	2017-05-09 15:12:12 -07:00
Zach Fox	cf3c10c5b1	Fix the bugs, add the feature	2017-05-09 14:40:41 -07:00
David Kelly	5b33e0233c	fix typo in handshake script	2017-05-09 13:27:42 -07:00
Howard Stearns	713ddd5cef	Merge pull request #10408 from davidkelly/dk/updatePalForProfileUrl ... Use new images in api/v1/users response json	2017-05-09 12:01:47 -07:00
David Kelly	d40984b475	Merge pull request #10384 from davidkelly/dk/minorHandshakeImprovement ... Some minor handshake improvements	2017-05-09 09:14:31 -07:00
Anthony J. Thibault	b276970258	Hand controller lasers work better in thirdPerson camera mode.	2017-05-08 14:32:50 -07:00
David Kelly	7d0494dd56	use new images in api/v1/users response json	2017-05-08 12:15:03 -07:00
Mike Moody	dae652d3db	v1 HMD duplication overlay.	2017-05-08 11:25:24 -07:00
Vladyslav Stelmakhovskyi	d0111ac0bb	Merge branch 'master' into audio-source-sync	2017-05-08 20:09:34 +02:00
Mike Moody	03490c81da	v1 with bug, looking into.	2017-05-06 15:36:18 -07:00
Triplelexx	fae51c5c46	change default particle texture to production	2017-05-06 20:12:09 +01:00
Seth Alves	9e0845f17e	Merge pull request #10387 from vladest/tablet-performance ... Decrease CPU usage in tabletUI periodical updates	2017-05-06 07:07:29 -07:00
Vladyslav Stelmakhovskyi	b2be22f0e0	Maerge broke the logic. Fixed now	2017-05-06 10:28:57 +02:00
Vladyslav Stelmakhovskyi	e395a51c60	Merge with master	2017-05-05 07:05:16 +02:00
Seth Alves	9ee6badc86	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 19:06:13 -07:00
Seth Alves	92966377fb	Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 19:05:57 -07:00
Seth Alves	900fae30fd	avoid calling editEntity on overlays	2017-05-04 19:05:52 -07:00
Seth Alves	70efe4aa4f	avoid calling editEntity on overlays	2017-05-04 18:52:17 -07:00
Howard Stearns	d9540d7ece	Merge pull request #10390 from zfox23/newSnapshotReview_Improvements3 ... Lots of Snapshot app improvements, Round Three	2017-05-04 17:05:37 -07:00
Seth Alves	960bab6e4e	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 16:42:57 -07:00
David Kelly	a4125c1507	logic tweak	2017-05-04 16:33:50 -07:00
Howard Stearns	fc9e9e1d28	Merge pull request #10374 from howard-stearns/notification-circumstances ... Notification circumstances	2017-05-04 16:18:58 -07:00
Zach Fox	6a33ef49c2	New language for unshareable snaps	2017-05-04 16:17:33 -07:00
Zach Fox	2ad3346697	Are there bugs?	2017-05-04 16:05:20 -07:00
Zach Fox	946c5e7662	Almost finished with not-logged-in and not-shareable	2017-05-04 15:24:51 -07:00
howard-stearns	25ab8e7e94	debugging on call, but mostly, specify json headers, etc.	2017-05-04 14:45:58 -07:00
Anthony Thibault	7006fa6da4	Merge pull request #10257 from sethalves/grab-try-timer-instead-of-update ... grab is driven by timer rather than update, load tablet model with high priority	2017-05-04 14:07:21 -07:00
Vladyslav Stelmakhovskyi	ba5a371da1	Decrease CPU usage in tabletUI periodical updates	2017-05-04 22:54:41 +02:00
David Kelly	5b56956637	Some minor handshake improvements	2017-05-04 12:38:17 -07:00
Triplelexx	0d21d7108e	change default particle properties	2017-05-04 19:27:43 +01:00
Zach Fox	b08d23924a	Keep hover status of both images in sync	2017-05-04 11:00:13 -07:00
Zach Fox	b01bff061e	Hover lock when uploading	2017-05-04 10:06:52 -07:00
Zach Fox	c7f5115e26	Move help text to above buttons	2017-05-04 10:06:52 -07:00
Seth Alves	9ab2a61a4b	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 10:04:18 -07:00
howard-stearns	a7e3fad23e	Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances	2017-05-04 10:03:57 -07:00
Seth Alves	ecd690e5e9	Merge pull request #10348 from ctrlaltdavid/21311 ... Don't sort recordings	2017-05-04 09:59:12 -07:00
Seth Alves	006c5a3c20	Merge pull request #10347 from ctrlaltdavid/21310 ... Don't warn that recording didn't start playing if you stop it	2017-05-04 09:58:25 -07:00
Seth Alves	ed09dcbdc9	don't call editEntity on overlays	2017-05-03 21:32:06 -07:00
howard-stearns	3e57e80465	use new request module.	2017-05-03 16:39:34 -07:00
howard-stearns	aa74dda9f3	cleanup	2017-05-03 16:29:37 -07:00
howard-stearns	a007c1fe4b	Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances	2017-05-03 13:46:00 -07:00
howard-stearns	42887d41c4	debugging	2017-05-03 13:45:48 -07:00
Howard Stearns	fb8cfd720e	Merge pull request #10362 from cfresquet/requestModuleRefactor ... Request module refactor	2017-05-03 11:57:23 -07:00
Zach Fox	ae72b9b73d	Merge pull request #10357 from zfox23/newSnapshotReview_Improvements2 ... Lots of Snapshot app improvements, Round Two	2017-05-03 11:44:40 -07:00
howard-stearns	33356b94d1	Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances	2017-05-03 11:43:18 -07:00
Zach Fox	c82a07016d	New Preparing text; Better disabled behavior	2017-05-03 11:30:44 -07:00
Zach Fox	09488c4987	Disabled state for share butotns	2017-05-03 11:02:44 -07:00
CFresquet	afa72210e0	requested tweaks to makeUserConnection.js	2017-05-03 10:28:44 -07:00
CFresquet	28b166c51f	further request fiddling	2017-05-03 07:51:49 -07:00
CFresquet	b54ea63af7	incremental request module fixes	2017-05-03 07:35:30 -07:00
Zach Fox	ff3a76f716	No magic numbers!	2017-05-02 18:23:15 -07:00
Zach Fox	653dda7000	Fix pausing after snapshot in HMD	2017-05-02 17:21:50 -07:00
Zach Fox	aa46534b60	Whoops.	2017-05-02 17:10:57 -07:00
Zach Fox	964e79ce14	It's working!	2017-05-02 16:58:33 -07:00
Zach Fox	68fa8e06ef	Super amped about this. Only need to add disabled state?	2017-05-02 16:38:16 -07:00
Seth Alves	0cd0e46ca5	make clone work again	2017-05-02 16:20:59 -07:00
howard-stearns	6f52bb4b37	Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances	2017-05-02 16:16:27 -07:00
Zach Fox	5d38cd543d	Yet another checkpoint	2017-05-02 16:06:13 -07:00
Zach Fox	7817c72ea1	Another checkpoint	2017-05-02 15:58:43 -07:00
Seth Alves	f1170dc17d	AvatarList not AvatarManager	2017-05-02 15:48:12 -07:00
Seth Alves	eed4da3570	some cleanups, delete far-grabs during transition to near-grab rather than set ttl to zero	2017-05-02 15:36:38 -07:00
Zach Fox	0beceae59b	Checkpoint	2017-05-02 15:19:20 -07:00
Zach Fox	1067d1e0f6	Don't let user blast in certain cases	2017-05-02 14:43:16 -07:00
Zach Fox	d8095c5ea5	New setup instructions; new 'blank snapshot' text	2017-05-02 14:20:27 -07:00
Zach Fox	d1dff7606c	Lint cleanup; Immediate share button visibility;	2017-05-02 14:10:24 -07:00
Zach Fox	5302110e7b	Merge pull request #10346 from zfox23/newSnapshotReview_Improvements ... Lots of Snapshot app improvements, Round One	2017-05-02 13:00:08 -07:00
Vladyslav Stelmakhovskyi	e789b69a8e	Merge branch 'master' into audio-source-sync	2017-05-02 20:57:01 +02:00
howard-stearns	9b117165bd	expire our announcements when we leave, and turn off messagesWaiting when ... everything is expired.	2017-05-02 11:44:16 -07:00
Howard Stearns	3a36feacad	On touch, grip is a trigger, not a button, so it can have lots of callbacks with slightly different values that we ignore. In that case, don't update hand/joint.	2017-05-02 11:29:51 -07:00
Zach Fox	c9e0679b70	Subscribe to changes to snapshotsLocation setter for better UX	2017-05-02 10:55:57 -07:00
Zach Fox	f453df36cf	Prevent cursor appearance in snaps	2017-05-02 10:11:54 -07:00