19698 commits

Author	SHA1	Message	Date
samcake	9a4f667059	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-12-08 08:50:33 -08:00
Seth Alves	d095d4ef44	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-08 07:19:33 -08:00
Seth Alves	a7a6dee8e0	Merge pull request #11950 from hyperlogic/bug-fix/hand-scaling ... Fix for hand controller avatar scaling.	2017-12-08 07:17:59 -08:00
Seth Alves	91b2d8df8a	Merge pull request #11874 from luiscuenca/audioscope ... Improve Audio Scope	2017-12-08 07:15:28 -08:00
Sam Gateau	d07cde3ecb	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-12-07 19:20:25 -08:00
samcake	7a9d77fed4	return a legit selectedItemsList js object as long as the list exist, only void if the list name is unknown	2017-12-07 17:53:30 -08:00
samcake	ace8e153c2	making sure the ID of an object in the Selection list is unique and more refined debugging	2017-12-07 17:45:40 -08:00
Anthony J. Thibault	542af47e9e	Fix for hand controller avatar scaling. ... * Added getDomainMaxScale() and getDomainMinScale() to JS api. * Updated scaleAvatar controller module to use this to prevent scaling past the limits. * Made sure that getDomainMaxScale() getDomainMinScale() and getUnscaledEyeHeight are thread safe, so that they can be invoked on the script thread. * Added signals to Model class that can be used to let observers know when the Rig has finished initializing it's skeleton. and also when the skeleton is no longer valid. These hooks are used to cache the unscaled eye height of the avatar.	2017-12-07 17:08:13 -08:00
Seth Alves	40412b80c6	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-07 17:03:04 -08:00
Andrew Meadows	ed231fa4a1	Merge pull request #11894 from hyperlogic/bug-fix/flying ... Improvements to HMD flying	2017-12-07 16:31:33 -08:00
Andrew Meadows	4691a98509	Merge pull request #11865 from hyperlogic/feature/domain-limited-height ... domain uses min/max avatar height instead of min/max scale	2017-12-07 16:29:15 -08:00
samcake	6148458aeb	Workable state, need final clean up and testing	2017-12-07 16:04:08 -08:00
Sam Gondelman	e7d7e9abb8	Merge pull request #11947 from ctrlaltdavid/21634 ... Move mouse and hover slots out of Overlays API	2017-12-07 14:47:01 -08:00
Zach Fox	4b3c61178c	Merge pull request #11944 from zfox23/commerce_dontSendEmptyPublicKeys ... Don't send commerce requests to backend if cached public keys is empty	2017-12-07 14:31:09 -08:00
Sam Gondelman	b05e1f8a32	Merge pull request #11847 from SamGondelman/overlayFlash ... Cleanup Web3DOverlay and tablet home button	2017-12-07 14:06:56 -08:00
David Rowe	fd38b89f35	Move mouse and hover slots out of Overlays API	2017-12-08 10:58:52 +13:00
Zach Fox	b2bafed2bb	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-07 11:21:24 -08:00
Anthony J. Thibault	47b52238d9	code review feedback	2017-12-07 10:49:23 -08:00
Anthony J. Thibault	68ad27a38d	Merge branch 'master' into bug-fix/flying	2017-12-07 10:28:13 -08:00
David Back	46d265e3f1	Merge branch 'master' of https://github.com/highfidelity/hifi into mergeaccountglobalservices	2017-12-07 10:13:55 -08:00
Anthony J. Thibault	fbcecbfc89	Merge branch 'master' into feature/domain-limited-height	2017-12-07 10:01:33 -08:00
Zach Fox	21077da41a	Don't send requests to backend if cached public keys is empty	2017-12-07 09:48:06 -08:00
Sam Gondelman	99c52f8602	coding standards	2017-12-07 09:38:14 -08:00
Brad Hefta-Gaub	4f8a2ea4be	Merge pull request #11934 from ctrlaltdavid/21630 ... Fix cloned 3D overlays' dimensions	2017-12-07 09:24:01 -08:00
Brad Hefta-Gaub	a0457d2b5e	Merge pull request #11856 from AndrewMeadows/sort-and-throttle-avatars ... Use PrioritySortUtil for avatar updates from avatar-mixer	2017-12-07 09:22:52 -08:00
Seth Alves	86f58c1353	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-07 08:50:50 -08:00
samcake	5f85e8e2cb	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-12-07 08:48:12 -08:00
Sam Gateau	0245a7005d	Adding the query of a particular selection content	2017-12-06 22:44:58 -08:00
samcake	5500a6d11c	More to come	2017-12-06 18:02:30 -08:00
Elisa Lupin-Jimenez	1d5875c45b	removed key	2017-12-06 17:40:39 -08:00
Elisa Lupin-Jimenez	66b6be1302	fixed weird merge conflicts	2017-12-06 17:37:44 -08:00
John Conklin II	fffcf56904	Merge pull request #11892 from SamGondelman/snapshot ... Expose Window.getDeviceSize()	2017-12-06 16:44:08 -08:00
Elisa Lupin-Jimenez	4ed689672e	can fetch poly asset list synchronously	2017-12-06 16:07:29 -08:00
David Rowe	0146eca315	JSDoc review	2017-12-07 10:09:05 +13:00
samcake	1efddb8260	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-12-06 10:21:45 -08:00
unknown	5e1064800a	fix marketplace	2017-12-05 18:39:17 -08:00
samcake	1483195285	almost complete setup working, yeah	2017-12-05 18:27:53 -08:00
luiscuenca	8abe8b9879	move save logic to audioclient	2017-12-05 18:22:14 -08:00
David Rowe	cafebf6a7e	Fix Unix build warnings and tidy initializers	2017-12-06 13:38:42 +13:00
luiscuenca	20d6615417	emit only when recording	2017-12-05 16:13:44 -08:00
David Rowe	e074bd85f9	Fix shape of cloned shape overlay	2017-12-06 12:29:09 +13:00
David Rowe	2752dc7cac	Fix dimensions of cloned cube, sphere, shape, and model overlays	2017-12-06 12:28:55 +13:00
Seth Alves	390c11e0a0	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-05 11:26:41 -08:00
Zach Fox	d59c9bd73a	Fix gray/incorrect security image after relog	2017-12-05 10:27:40 -08:00
Elisa Lupin-Jimenez	d6e1a9defe	Created poly scripting interface template	2017-12-05 09:43:01 -08:00
Seth Alves	73b21f7cd5	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-05 06:55:10 -08:00
Sam Gateau	987246afb8	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-12-04 19:11:42 -08:00
samcake	de410b6833	I need a color editor	2017-12-04 17:29:01 -08:00
Elisa Lupin-Jimenez	7bb44f4139	Created poly scripting interface template	2017-12-04 16:46:58 -08:00
luiscuenca	390c59b45c	Change menu and minor fixes	2017-12-04 15:29:01 -08:00
David Back	3873a8f91e	Merge branch 'master' into mergeAccountGlobalServices	2017-12-04 14:46:59 -08:00
samcake	9fceaad38b	Merging with master	2017-12-04 14:20:10 -08:00
Zach Fox	4c96fc2d9d	Merge pull request #11905 from zfox23/commerce_resetWalletBeforeCreation ... Call reset() on Wallet before creating new wallet	2017-12-04 13:05:36 -08:00
Brad Hefta-Gaub	33adb0d76d	Merge pull request #11868 from ctrlaltdavid/21615 ... Add "size" as synonym for "dimensions" in model overlay property setter	2017-12-03 18:10:30 -08:00
luiscuenca	4030688e7a	added record wav files	2017-12-03 11:54:37 -07:00
Brad Hefta-Gaub	314265fa86	Merge pull request #11891 from ctrlaltdavid/21625 ... Add missing line3d overlay property getters and setters	2017-12-02 12:52:44 -08:00
Seth Alves	b590cd5b89	avatar-entities which are children of an avatar will scale with the avatar	2017-12-02 09:31:43 -08:00
Zach Fox	24e5994f20	The nuclear option is a bad option.	2017-11-30 15:55:09 -08:00
Daniela Fontes	9bc165d8b4	Changing to Smaller Avatar Resizes Tablet	2017-11-30 18:49:53 +00:00
howard-stearns	55589312f1	new padding/initialization that matters on linux server	2017-11-29 09:53:48 -08:00
Anthony J. Thibault	a4d70e89df	hmd turn roll tuning ... * Tighten action motor timescale while flying. This should cause less drift as the user changes direction and should lead to more comfort and control. * Hmd head roll is only enabled if you are forward or backward faster then 2 meters per second. This should prevent un-intentional turning/rolling when hovering or moving at slow speeds. * Documented hmdRoll tuning parameters accessible from JavaScript. * Removed roll feathering code, because it is non-linear and can perhaps induce nausea. * Tuned default dead spot and turning speeds to match Eagle Flight's defaults.	2017-11-28 17:20:26 -08:00
SamGondelman	c5ebb8a279	expose Window.getDeviceSize()	2017-11-28 16:16:30 -08:00
David Rowe	b9ad15b19e	Add missing line3d overlay property getters	2017-11-29 11:03:16 +13:00
David Rowe	3956b3b953	Fix missing line3d overlay property setter overrides of base class	2017-11-29 10:41:51 +13:00
David Rowe	76c934f012	Add missing line3d overlay property setters	2017-11-29 10:41:21 +13:00
Anthony J. Thibault	7327b79ce3	WIP	2017-11-28 11:37:58 -08:00
Andrew Meadows	e212ac67c1	enable custom avatar sort tuning	2017-11-28 11:30:06 -08:00
Andrew Meadows	d65101c4e9	sort and throttle avatar updates in interface	2017-11-28 09:07:17 -08:00
David Rowe	cd2922a560	Merge branch '21602' into 21624 ... # Conflicts: # tools/jsdoc/plugins/hifi.js	2017-11-28 17:04:59 +13:00
David Rowe	97b4dcaa5c	Web3DOverlay's resolution property is deprecated	2017-11-28 16:31:13 +13:00
David Rowe	a6937d7c8b	Add Overlays API examples JSDoc	2017-11-28 16:30:25 +13:00
David Rowe	92493f14d7	Miscellaneous JSDoc fixes	2017-11-28 16:30:09 +13:00
SamGondelman	52039e022b	merge from master, get rid of resolution in RayPick	2017-11-27 13:11:35 -08:00
howard-stearns	1575119327	PR feedback	2017-11-27 10:46:57 -08:00
luiscuenca	ad02118588	fixed menu error	2017-11-26 23:43:13 -07:00
luiscuenca	027d2d323c	Measure tool and corrections	2017-11-26 22:28:34 -07:00
David Rowe	de49fefc61	Merge branch 'master' into 21602 ... # Conflicts: # libraries/shared/src/RegisteredMetaTypes.h	2017-11-25 17:06:36 +13:00
David Rowe	4b5aa9bdec	Add Overlays API functionality JSDoc	2017-11-25 16:18:14 +13:00
luiscuenca	69299bdd68	try to fix errors	2017-11-22 19:25:24 -07:00
luiscuenca	b481a6060e	improve audio scope	2017-11-22 18:15:42 -07:00
howard-stearns	899999a4c6	fix up dynamic ownership challenge	2017-11-22 15:58:30 -08:00
Anthony J. Thibault	b3896f664d	Made increaseScale and decreaseScale more responsive at limits	2017-11-22 14:45:52 -08:00
David Rowe	3535071178	Add "size" as synonym for "dimensions" in model overlay property setter	2017-11-22 21:04:04 +13:00
samcake	1514cdfb2f	extend the set of interface for multi highlight	2017-11-21 17:59:45 -08:00
howard-stearns	16d6d8a361	Merge branch 'master' of https://github.com/highfidelity/hifi into MandatoryMania-ECWallet	2017-11-21 16:28:29 -08:00
howard-stearns	ca80c9b764	Merge branch 'ECWallet' of https://github.com/MandatoryMania/hifi into MandatoryMania-ECWallet	2017-11-21 16:28:08 -08:00
Sam Gateau	8389137caa	Merge pull request #11834 from highfidelity/pointers ... UI Pointer Optimization	2017-11-21 16:01:52 -08:00
samcake	a0e40efdc8	Fixing all the changes of interface name coming from upstream	2017-11-21 14:55:58 -08:00
Dante Ruiz	767b0fa4af	remove unused variable warning	2017-11-21 14:45:55 -08:00
samcake	ebd701a1ab	Merging with master	2017-11-21 14:40:37 -08:00
samcake	84ff40c717	Merging with master	2017-11-21 14:12:47 -08:00
Dante Ruiz	c9ad7b1db5	Merge branch 'master' of github.com:highfidelity/hifi into fix-modal	2017-11-21 13:56:22 -08:00
Dante Ruiz	88c3adbff1	change askToReplaceDomainContent to use async question and warning	2017-11-21 13:56:11 -08:00
Anthony J. Thibault	9f54ce55f3	Change domain setting from min/max avatar scale to min/max avatar height ... * Domain settings version has been bumped from version 2.0 to 2.1 * Old domain settings for avatar scale will be auto-converted to avatar height * Avatar code has been changed so that limitDomainScale() works with the new height limits * Avatar getUnscaledEyeHeight() was added to C++. * MyAvatar.getHeight() was added to JS.	2017-11-21 13:25:47 -08:00
ZappoMan	3a967ca895	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-21 10:53:29 -08:00
Brad Hefta-Gaub	4d1e90dfca	Merge pull request #11821 from dback2/mirrorfanciness3 ... Mirror projection for Secondary Camera	2017-11-21 07:59:07 -08:00
Brad Hefta-Gaub	5dadec0b93	Merge pull request #11845 from thoys/feat/parentJointName ... Import JSON parentJointName value	2017-11-21 07:58:13 -08:00
samcake	aa163db4e6	Trying to make selection threadsafe	2017-11-20 17:21:15 -08:00
ZappoMan	b44ced4c21	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-20 17:19:18 -08:00
Thijs Wenker	627fee80ec	added support for exporting parentJointName	2017-11-21 01:49:56 +01:00
Howard Stearns	89425ca210	Merge pull request #11854 from howard-stearns/consolidated-blockchain-history-log ... consolidated blockchain history log	2017-11-20 16:19:27 -08:00
Howard Stearns	4018b99118	Merge pull request #11848 from zfox23/commerce_flipTheSwitch ... Turn Commerce on by default!	2017-11-20 16:18:53 -08:00
Elisa Lupin-Jimenez	3211aa7d13	Merge pull request #11849 from elisa-lj11/blocks ... Zip file structures replicated in asset server	2017-11-20 16:13:51 -08:00
Elisa Lupin-Jimenez	fb6287503e	hopefully fixed build error resulting from escape sequence	2017-11-20 15:12:11 -08:00
Thijs Wenker	c3754d6369	smart pointer	2017-11-20 23:24:03 +01:00
Elisa Lupin-Jimenez	a54f4eca93	simplified naming of zip folders	2017-11-20 14:02:46 -08:00
David Rowe	8e647fb32c	Disable unused Overlays.panelDeleted signal ... #if'd out to match the other panel code that is disabled.	2017-11-21 11:00:36 +13:00
Elisa Lupin-Jimenez	b6e75d1222	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-11-20 10:07:11 -08:00
Elisa Lupin-Jimenez	3aa7cb440d	file structures in zip files replicated, more useful unzip debug print, updated blocks tablet app url	2017-11-20 10:01:33 -08:00
Dante Ruiz	76935c1457	fixing merge conflict	2017-11-20 09:51:10 -08:00
Thijs Wenker	e94199acad	Merge branch 'master' of github.com:highfidelity/hifi into feat/parentJointName	2017-11-20 18:29:54 +01:00
Thijs Wenker	84ec9890ca	reverted special property case, parentJointName is now only parsed from the JSON import	2017-11-20 18:29:33 +01:00
samcake	a74372b233	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-11-20 09:26:29 -08:00
Seth Alves	df07b66872	Merge branch 'master' of github.com:highfidelity/hifi into av-ent-misc-fixes	2017-11-20 07:47:19 -08:00
howard-stearns	07d52306c4	consolidated blockchain history log	2017-11-19 22:51:36 -08:00
ZappoMan	04ee1adabd	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-19 14:40:31 -08:00
Brad Hefta-Gaub	e070033ce4	Merge pull request #11793 from ElderOrb/FB9032 ... 9032 - Current display mode can be deselected in the toolbar/tablet menu	2017-11-19 11:25:35 -08:00
David Rowe	27e3e0bf0b	Merge branch 'master' into 21602	2017-11-20 08:12:19 +13:00
Brad Hefta-Gaub	ff8ca6da4c	Merge pull request #11303 from vladest/webbrowser_updates ... Webbrowser updates	2017-11-19 11:11:09 -08:00
Brad Hefta-Gaub	e4a03a7d12	Merge pull request #11840 from ctrlaltdavid/21609 ... Fix typo in overlay "filled" property	2017-11-18 14:31:11 -08:00
David Rowe	b4bc8da20a	Document deprecation of "filed" property	2017-11-19 08:44:00 +13:00
Sam Gateau	44f63ef802	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-11-18 08:23:59 -08:00
Alexander Ivash	c4aa937108	adjust to coding standards	2017-11-18 11:16:40 +03:00
samcake	e0740b323d	keep debuging the seelction highlight	2017-11-17 18:11:18 -08:00
Brad Hefta-Gaub	592f4921bc	Merge pull request #11825 from druiz17/fix-tablet-rez ... fix tablet rez point for commence button	2017-11-17 16:51:52 -08:00
SamGondelman	033f658fff	Merge remote-tracking branch 'upstream/master' into pointers	2017-11-17 16:10:20 -08:00
Zach Fox	7d34b3fe67	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-11-17 15:45:03 -08:00
SamGondelman	393ad0079c	home button is circle instead of sphere, fixed positioning, fix lasers on tablet	2017-11-17 15:24:21 -08:00
David Back	4be29c5a7a	Merge branch 'master' of https://github.com/highfidelity/hifi into mirrorfanciness3	2017-11-17 15:15:22 -08:00
Zach Fox	f47f259816	Turn Commerce on by default	2017-11-17 15:12:49 -08:00
Stephen Birarda	239b116874	Merge pull request #11835 from birarda/bug/octree-connection-id ... Reset EntityTreeSendThread known state if client disconnects from Entity Server	2017-11-17 12:56:25 -08:00
SamGondelman	42d047c572	merge with master	2017-11-17 11:52:34 -08:00
SamGondelman	e38b0ab6b8	make web overlays match web entities more, remove resolution	2017-11-17 11:50:24 -08:00
Dante Ruiz	4de0fdf7d1	Merge pull request #11768 from ctrlaltdavid/21596 ... Add instructions and cursor to GOTO dialog input	2017-11-17 11:45:40 -08:00
SamGondelman	61c7ccde6e	cleanup	2017-11-17 10:45:39 -08:00
samcake	45f14d0cd3	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-11-17 08:50:44 -08:00
H Q	21a28827c9	Remaining coding style changes, other small fixes	2017-11-17 07:59:52 -08:00
David Rowe	a33162d7ff	Fix typo in Base3DOverlay "filled" property	2017-11-17 21:07:43 +13:00
David Rowe	12e005f215	Initial update of Overlays JSDoc	2017-11-17 17:59:11 +13:00
samcake	08dd76c9a8	changes of the day	2017-11-16 17:52:12 -08:00
H Q	14890495a2	Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet ... Syncing	2017-11-16 12:38:45 -08:00
H Q	27350ddbfc	Coding style corrections	2017-11-16 12:35:00 -08:00
David Back	abba965328	todo comment	2017-11-16 11:41:28 -08:00
Stephen Birarda	eedb77dae9	add clearing of known state if client resets ES connection	2017-11-16 11:40:35 -08:00
SamGondelman	ac7242102c	Merge remote-tracking branch 'upstream/pointers' into ui	2017-11-16 09:47:29 -08:00
SamGondelman	e3aa79990b	merge with master	2017-11-16 09:45:32 -08:00
Brad Davis	7bbc719d79	Fix for black screen on HMD derived display plugins	2017-11-16 08:53:12 -08:00
Sam Gateau	3a0b2651d5	Keep spinning on the bridge between js interface and the highlighting feature	2017-11-16 00:55:51 -08:00
Seth Alves	93fd2a6a6b	clear garbage out of avatar-entity settings array before writing it to disk. when changing domains, re-rez avatar-entities after octree is cleared	2017-11-15 20:10:05 -08:00
David Back	4b2ff68fa3	var name and empty line	2017-11-15 19:05:44 -08:00
Sam Gateau	6889c9d6d1	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-11-15 18:49:30 -08:00
samcake	771c64fc97	Working on the selection highlight js interface	2017-11-15 18:21:07 -08:00
David Back	9bfbcb4434	code review updates	2017-11-15 18:06:49 -08:00
SamGondelman	3274c41aeb	Merge remote-tracking branch 'upstream/pointers' into ui	2017-11-15 17:45:45 -08:00
David Rowe	6f82049021	Merge branch 'master' into 21602	2017-11-16 13:41:29 +13:00
David Rowe	4f083a1b20	Further Menu API JSDoc improvements	2017-11-16 13:39:14 +13:00
David Rowe	bdb1bbe88d	Menu API JSDoc improvements	2017-11-16 13:34:50 +13:00
Dante Ruiz	dd8ea759d4	fix tablet rez for commence button	2017-11-15 15:48:39 -08:00
Ryan Huffman	60a222e4b4	Merge pull request #11810 from Atlante45/fix/stuck-acs ... Fix stuck ACs	2017-11-15 14:59:51 -08:00
SamGondelman	7eb22b372f	merge with master	2017-11-15 14:35:30 -08:00
SamGondelman	8730a26d20	use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation	2017-11-15 14:12:16 -08:00
David Back	e0ce154472	remove includes, fix comment	2017-11-15 13:37:15 -08:00
samcake	932089115e	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-11-15 12:51:01 -08:00
David Back	0b8f888d9b	Merge branch 'master' of https://github.com/highfidelity/hifi into mirrorfanciness3	2017-11-15 12:50:03 -08:00
David Back	fee7701890	working mirror projection for secondary camera	2017-11-15 12:49:39 -08:00
Brad Davis	26a745be6f	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-15 11:59:06 -08:00
Brad Davis	1167be4102	Reverting tablet API rename, cleaning up duplicated code	2017-11-15 11:52:55 -08:00
Atlante45	e68ce97697	Remove the number of socket change tracking	2017-11-15 11:19:54 -08:00
John Conklin II	8592f3fd4d	Merge pull request #11764 from luiscuenca/case7587 ... 7587 Lasers resize with avatar	2017-11-15 09:31:45 -08:00
Zach Fox	8f855c6c95	Update QUrls	2017-11-15 09:21:10 -08:00
samcake	d4f93b9203	Adding style from VariantMap	2017-11-14 18:21:02 -08:00
H Q	0db9e876d6	Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet	2017-11-14 15:40:44 -08:00
H Q	44f2c92d30	Final ECSDA and nonce modifications for this dev cycle	2017-11-14 15:40:29 -08:00
Zach Fox	5290ee3b4e	Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist	2017-11-14 10:07:44 -08:00
luiscuenca	489e244342	More accurate scale from SensorToWorldScale	2017-11-14 09:56:23 -07:00
Sam Gateau	fc53c26190	drafting the interface	2017-11-14 00:40:37 -08:00
Sam Gateau	02c60c425e	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-11-13 18:40:51 -08:00
samcake	fd46aa15ff	adding occluded/visisble to highlight outline	2017-11-13 17:23:21 -08:00
Brad Davis	d71fd151c5	Fixing button model exposure	2017-11-13 16:45:27 -08:00
Zach Fox	a3332e15b7	Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist	2017-11-13 15:01:26 -08:00
SamGondelman	60db24f2d3	merge with master	2017-11-13 14:36:24 -08:00
SamGondelman	2fb1981c4a	merge with master	2017-11-13 14:34:39 -08:00
SamGondelman	2c0272f304	(mostly?) fix touch events	2017-11-13 12:58:31 -08:00
David Rowe	4a84116877	Merge branch 'master' into 21602	2017-11-14 08:27:13 +13:00
Brad Davis	5cf9c1bb33	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-13 10:48:21 -08:00
Ryan Downe Karpf	3ea6ecf104	Merge pull request #11747 from luiscuenca/case8495 ... 8495 No mirror camera in HMD mode	2017-11-13 09:09:34 -08:00
David Rowe	2119e01ac3	Tidying	2017-11-13 11:59:21 +13:00
David Rowe	9d9f684af5	Tidying	2017-11-12 11:44:51 +13:00
David Rowe	39ccd7d656	Update JSDoc for Camera API	2017-11-12 11:04:35 +13:00
David Rowe	f5e155bf94	Expand Menu's JSDoc	2017-11-11 17:01:55 +13:00
David Rowe	c8734ccd63	Menu JSDoc improvements	2017-11-11 16:18:05 +13:00
David Rowe	a576cc04e1	Clipboard JSDoc improvements	2017-11-11 16:16:24 +13:00
David Back	6466a05740	alternate approach to mirror projection wip	2017-11-10 17:15:47 -08:00
Sam Gateau	ecf67cc331	Merge pull request #11650 from Zvork/outline ... Multiple Outline Groups	2017-11-10 15:45:03 -08:00
Brad Davis	7bf1b176d7	Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem	2017-11-10 14:21:24 -08:00
SamGondelman	cbf0543646	deadspot	2017-11-10 13:22:38 -08:00
Brad Davis	92a3c209aa	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-10 11:44:29 -08:00
luiscuenca	d53a29b958	correction	2017-11-10 12:24:19 -07:00
David Rowe	c77a12f5fa	Update Clipboard and Menu JSDoc to use JavaScript type names	2017-11-11 07:55:57 +13:00
luiscuenca	bf576e63fe	move constant to class definition	2017-11-10 11:54:53 -07:00
Anthony J. Thibault	ba4c0f189e	code review feedback ... removed discontinuity in safeDeltaTime, which is used to prevent division by zero.	2017-11-10 10:25:29 -08:00
samcake	8d75e5e96a	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-11-10 10:24:56 -08:00
Anthony J. Thibault	4169e11e77	Merge branch 'master' into bug-fix/div-by-zero	2017-11-10 10:15:26 -08:00
beholder	da49ee8bee	9032 Current display mode can be deselected in the toolbar/tablet menu	2017-11-10 19:53:55 +03:00
David Rowe	036ac8de6d	Update JSDoc for Menu JavaScript API	2017-11-10 21:55:42 +13:00
David Rowe	875b9846a0	Remove unused signal	2017-11-10 21:55:03 +13:00
David Rowe	7bbe5cdf70	Update JSDoc for Clipboard JavaScript API	2017-11-10 21:53:55 +13:00
luiscuenca	255a40ce31	Corrections	2017-11-09 18:38:04 -07:00
luiscuenca	055fe16677	Allow script to change to mirror camera in HMD	2017-11-09 18:27:16 -07:00
Sam Gondelman	9010a02bee	Merge pull request #11790 from SamGondelman/overlayFlash ... Fix laser end not disappearing	2017-11-09 17:10:07 -08:00
luiscuenca	7dfdc8da59	Redesign and clean of unused lineWidths	2017-11-09 17:50:38 -07:00
Anthony Thibault	38cc56db7f	Merge pull request #11785 from luiscuenca/case6944 ... 6944 Avatar scale is preserved across domains	2017-11-09 16:38:45 -08:00
SamGondelman	9188ae9fb5	fix laser end not disappearing	2017-11-09 16:26:37 -08:00
luiscuenca	355b465109	make leaveDomain slot private	2017-11-09 16:05:53 -07:00
David Kelly	31dc140ea6	Merge pull request #11771 from zfox23/commerce_seedingFrontend ... Commerce: Seeding Frontend	2017-11-09 14:45:10 -07:00
Sam Gondelman	d1e41e6bf0	Merge pull request #11786 from SamGondelman/overlayFlash ... Fix overlay flash on visibility and position change	2017-11-09 13:36:49 -08:00
SamGondelman	224386317d	send overlay visibility through transaction	2017-11-09 12:14:40 -08:00
SamGondelman	5a78c9ebfe	integrated stylus into pointer system, need to update controller module	2017-11-09 11:59:17 -08:00
luiscuenca	10f484c668	6944 Avatar scale is saved across domains	2017-11-09 12:21:23 -07:00
Sam Gateau	f9a1388de3	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-11-08 19:48:23 -08:00
Elisa Lupin-Jimenez	1e526605ba	Merge pull request #11778 from elisa-lj11/blocks ... Fixed Blocks downloads (now Google Poly)	2017-11-08 17:53:26 -08:00
luiscuenca	1791ed01ca	add width param to vertex shader	2017-11-08 18:35:26 -07:00
Zach Fox	19b7c6e025	Remove machine fingerprint from receiveAt	2017-11-08 17:15:27 -08:00
Elisa Lupin-Jimenez	45b9a150dc	updated blocks url refs in application to fix download issue	2017-11-08 15:21:48 -08:00
MissLiviRose	45e58b93e5	add skeleton scale change signal so scripts can detect scaling change	2017-11-08 14:23:49 -08:00
David Rowe	c5c1ead400	Fix GOTO dialog's connection status and location not always updating	2017-11-09 10:51:21 +13:00
Zach Fox	38fde43009	...simplify your life	2017-11-08 13:19:47 -08:00
Zach Fox	7995f50fab	Fix seeding	2017-11-08 12:52:53 -08:00
Zach Fox	3190fe1f32	Use keyfilepath instead of cached public keys	2017-11-08 12:30:48 -08:00
Zach Fox	72fa0823ba	Logic changes	2017-11-08 11:01:54 -08:00
Zach Fox	b7163bb8fc	Frontend changes	2017-11-08 10:25:11 -08:00
Zach Fox	085355222f	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-11-08 09:31:09 -08:00
Olivier Prat	f996435ac8	Merge branch 'master' of git://github.com/highfidelity/hifi into highlight	2017-11-08 11:41:21 +01:00
luiscuenca	8c5f97f3d1	More corrections	2017-11-07 20:25:24 -07:00
samcake	f5e1add694	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-11-07 17:41:36 -08:00
luiscuenca	536bf6f81d	Corrections	2017-11-07 18:34:33 -07:00
luiscuenca	ee3900be4f	Corrections	2017-11-07 18:26:41 -07:00
Elisa Lupin-Jimenez	1ceec17405	missed an fbx block	2017-11-07 17:12:39 -08:00
Elisa Lupin-Jimenez	9a09ffe12f	removed old fbx code	2017-11-07 17:10:57 -08:00
Elisa Lupin-Jimenez	e37010565f	changed fileDialog return value to be compatible with musvis	2017-11-07 16:55:07 -08:00
Luis Cuenca	6fb47eef85	Merge branch 'master' into case7587	2017-11-07 17:19:39 -07:00
unknown	f997ad4628	changed Wallet from RSA to ECSDA cryto	2017-11-07 16:15:48 -08:00
luiscuenca	332cb48a41	Lasers and teleport scale with avatar	2017-11-07 16:57:55 -07:00
Zach Fox	8f54c106f6	Could it be this simple?	2017-11-07 12:12:27 -08:00
Elisa Lupin-Jimenez	89a9269982	synced up	2017-11-07 10:37:55 -08:00
Seth Alves	e9c0e53aa6	Merge pull request #11760 from druiz17/far-grab-parent ... Far grab rolls up parent tree when grabbing and add offset to LaserPointer::lockEndUUID	2017-11-07 08:53:13 -08:00
Olivier Prat	9817cb4c44	Added highlight configuration in HighlightStageSetup job	2017-11-07 15:35:43 +01:00
Olivier Prat	3cc445ff02	Renamed outline to highlight	2017-11-07 11:07:25 +01:00
Olivier Prat	84be026e0b	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-11-07 09:48:45 +01:00
Sam Gateau	e145e30049	Drafting the selection to highlight interface	2017-11-06 22:47:07 -08:00
Dante Ruiz	c9d67f762b	made requested changes	2017-11-06 16:20:16 -08:00
Dante Ruiz	067ed2ffe0	apply coding standard	2017-11-06 16:09:31 -08:00
Dante Ruiz	646e5455ac	forgot to remove unused variable	2017-11-06 16:05:44 -08:00
Dante Ruiz	41c6261b74	LaserPointer: made _objectLockEnd into a struct	2017-11-06 16:04:33 -08:00
Dante Ruiz	3b15897b12	fixed farGrab parent grabbing and laser LockEndUUID	2017-11-06 15:21:20 -08:00
Zach Fox	bb21c52783	Fix crash when logging out while Passphrase screen visible	2017-11-06 15:12:01 -08:00
SamGondelman	f970eb2302	merge with pointers branch	2017-11-06 14:49:50 -08:00
SamGondelman	7d420f5242	isLeftHand, isRightHand, isMouse	2017-11-06 12:29:21 -08:00
Zach Fox	8636a3396e	Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist	2017-11-06 10:44:54 -08:00
Brad Davis	2cd76be6c4	Fix encoding for wallet scripting interface	2017-11-06 10:31:32 -08:00
Brad Davis	544c54b8ee	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-06 10:07:22 -08:00
Zach Fox	b54627594b	Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist	2017-11-06 09:29:26 -08:00
Zach Fox	149c8fbeb2	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-11-06 09:25:30 -08:00
Dante Ruiz	e432e62a39	Merge branch 'master' of github.com:highfidelity/hifi into far-grab-parent	2017-11-06 09:02:03 -08:00
luiscuenca	31b63ffbe6	Not posible to change to mirror mode using js	2017-11-06 08:03:07 -07:00
Olivier Prat	9e6472b577	Added OutlineStyleStage	2017-11-06 15:55:57 +01:00
Olivier Prat	09ee69db30	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-11-06 09:47:48 +01:00
Brad Davis	d162e1cff6	Whitelist functionality for tablet apps	2017-11-04 15:14:06 -07:00
SamGondelman	55ac585cd9	Merge remote-tracking branch 'upstream/master' into ui	2017-11-03 17:32:13 -07:00
SamGondelman	ce58b6c401	trying to fix HUD events, abstracting touch event logic (wip), seth's comments	2017-11-03 17:15:30 -07:00
Dante Ruiz	539cf35f30	saving work	2017-11-03 17:14:27 -07:00
luiscuenca	f226835876	8495 No mirror camera in HMD mode	2017-11-03 11:51:03 -07:00
Zach Fox	c496429a85	Add Machine Fingerprint to receive_at endpoint txn'	2017-11-03 10:40:25 -07:00
John Conklin II	ff36cbf45f	Merge pull request #11731 from sethalves/fix-ignore ... stop drawing ignored avatars, even if PAL is still open	2017-11-03 09:45:03 -07:00
Olivier Prat	e0fd71f246	Merged from master	2017-11-03 14:39:42 +01:00
SamGondelman	dd4275430b	fix hover events, working on HUD events	2017-11-02 17:48:37 -07:00
ZappoMan	b5199220ab	cleanup SpatiallyNestable Velocity to match WorldVelocity naming	2017-11-02 17:07:53 -07:00
Zach Fox	6173ad810b	Reset wallet passphrase when login username changes	2017-11-02 15:48:59 -07:00
Zach Fox	23e627a46f	Send empty decrypted text if impossible to decrypt	2017-11-02 13:46:24 -07:00
ZappoMan	afaad5fcd7	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-02 13:39:51 -07:00
Zach Fox	19945c5991	Update cert UI	2017-11-02 10:22:00 -07:00
Zach Fox	f8718efe25	Fix warnings	2017-11-02 09:42:33 -07:00
Olivier Prat	e9743d4c95	Added jsdoc to SelectionScriptingInterface	2017-11-02 10:00:30 +01:00
Olivier Prat	f2444f9a30	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-11-02 09:25:07 +01:00
Seth Alves	12792c3821	stop drawing ignored avatars, even if PAL is still open	2017-11-01 17:26:00 -07:00
Zach Fox	72d61f1825	Remove unnecessary log - static verif isn't working	2017-11-01 12:03:44 -07:00
Zach Fox	56cb98d96f	Make inspection cert work	2017-11-01 12:02:57 -07:00
Zach Fox	b335ba9a75	Timeout timer	2017-11-01 11:34:29 -07:00
Brad Davis	f061b9c2da	Add stylus functionality to pointer manager	2017-11-01 11:27:57 -07:00
Zach Fox	8a6a744099	It's working	2017-11-01 10:46:13 -07:00
SamGondelman	657a0fb036	Merge remote-tracking branch 'upstream/pointers' into ui	2017-10-31 17:41:14 -07:00
SamGondelman	64665c87b2	replace ids with unsigned ints	2017-10-31 17:07:48 -07:00
Zach Fox	93308dfcd3	Why did I think this would work before?	2017-10-31 16:21:10 -07:00
SamGondelman	3c779f1528	HUD events WIP, fix entity/overlay hover, no hover for empty renderState	2017-10-31 14:42:31 -07:00
Zach Fox	d49e281fab	Add RSA error handling	2017-10-31 14:12:30 -07:00
Zach Fox	e9c144892a	Fixes	2017-10-31 13:11:32 -07:00
Zach Fox	f5ada4fe62	Will it compile?	2017-10-31 12:33:28 -07:00
Zach Fox	6f96e0c7bd	More progress	2017-10-31 12:14:12 -07:00
Zach Fox	90e9251176	It's a start	2017-10-31 11:28:19 -07:00
Bradley Austin Davis	55d819d7e3	Merge pull request #11699 from SamGondelman/ui ... Pointers generate PointerEvents (WIP)	2017-10-31 10:01:15 -07:00
SamGondelman	76eb4c656e	fix multi-touch and keyboard on web entities	2017-10-30 16:41:59 -07:00
vladest	aa9ae6c838	License header fix	2017-10-30 20:29:44 +01:00
vladest	ea55b5407e	bracket fix	2017-10-30 20:22:47 +01:00
vladest	7b57fe1a5d	type fixed	2017-10-30 20:21:34 +01:00
vladest	d9c6f17e42	Coding standards	2017-10-30 20:06:17 +01:00
SamGondelman	e9a5acda06	control hovering, preset buttons for clicking, constness, scroll off ... surface	2017-10-30 10:28:43 -07:00
vladest	d3c62db65d	Merge branch 'master' into webbrowser_updates	2017-10-30 18:17:19 +01:00
vladest	586dde7dd7	Removed GPL code. Added own implementation of suggestions engine. Fixed Google maps different issues	2017-10-30 18:15:42 +01:00
Brad Davis	23653f08ca	Merge remote-tracking branch 'upstream/master' into HEAD	2017-10-30 09:20:58 -07:00
Ryan Downe Karpf	28a99fe685	Merge pull request #11655 from dback2/tabletcontextualmode ... add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place	2017-10-30 08:56:26 -07:00
ZappoMan	f63db42c0e	migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation	2017-10-28 10:14:25 -07:00
vladest	865c241a13	Merge branch 'master' into webbrowser_updates	2017-10-28 12:31:26 +02:00
ZappoMan	a7a0f03ede	rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()	2017-10-27 18:39:17 -07:00
Andrew Meadows	f958829d00	Merge pull request #11708 from samcake/blue ... Expose the Render api to the tablet js context and update render engine tool	2017-10-27 17:12:36 -07:00
Brad Hefta-Gaub	8322631a6d	Merge pull request #11695 from luiscuenca/case6719 ... 6719 Avatar attachment window will update when attachments are modified	2017-10-27 17:01:05 -07:00
samcake	8a3b1a20cc	merge with upstream	2017-10-27 14:57:25 -07:00
Brad Hefta-Gaub	d61ede2a4e	Merge pull request #11697 from ElderOrb/FB8211 ... 8211 Add very short haptic feedback when highlighting letters on keyboard	2017-10-27 13:26:41 -07:00
Zach Fox	5ab737f66d	Merge pull request #11658 from zfox23/pop_dynamicTestsMaster ... Commerce: Owner Verification for Certified Entities	2017-10-27 12:28:04 -07:00
Zach Fox	3fae121335	Merge pull request #11670 from zfox23/stagingSetting ... Make it easier to switch between STABLE and STAGING Metaverses	2017-10-27 12:03:29 -07:00
samcake	55f6ecb070	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-27 09:29:41 -07:00
Olivier Prat	bced566510	Merged from master and disable scissor testing with define macro until I figure out how to make it work in stereo	2017-10-27 10:45:43 +02:00
samcake	0636a2db06	removing historic changes	2017-10-26 19:19:52 -07:00
SamGondelman	7951826e49	more advanced laser focusing	2017-10-26 16:10:27 -07:00
beholder	f6fa85fed2	adjust to coding standards	2017-10-27 01:25:25 +03:00
Zach Fox	c62eb2bf3c	Merge branch 'feature/qml_whitelist_2' of https://github.com/jherico/hifi into commerce_QmlWhitelist	2017-10-26 14:58:43 -07:00
SamGondelman	f0c15e874c	merge with master	2017-10-26 14:52:17 -07:00
samcake	b9112024b8	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-26 14:27:23 -07:00
Brad Davis	ffc51d5387	Working on QML whitelist functionality	2017-10-26 14:20:13 -07:00
SamGondelman	755ce183e0	fix is facing avatar	2017-10-26 14:16:31 -07:00
Zach Fox	002141724b	Return to using NetworkingConstants	2017-10-26 14:12:36 -07:00
Zach Fox	3e95484c4c	Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting	2017-10-26 13:58:50 -07:00
beholder	5969e0b118	8211 Add very short haptic feedback when highlighting letters on keyboard	2017-10-26 23:03:06 +03:00
vladest	794355dc35	Merge branch 'master' into webbrowser_updates	2017-10-26 21:18:00 +02:00
SamGondelman	a44e8efb99	merge from master	2017-10-26 12:14:53 -07:00
SamGondelman	cf34fe3345	laserpointers generate pointerevents	2017-10-26 12:01:09 -07:00
Bradley Austin Davis	becd99a964	Merge pull request #11584 from SamGondelman/pointerEvents ... First step of cleaning up PointerEvents	2017-10-26 12:01:03 -07:00
Zach Fox	40aa3b522c	Three slashes, not two	2017-10-26 10:59:18 -07:00
Zach Fox	7027dbb8d4	Integrate Austin's changes	2017-10-26 10:48:26 -07:00
Zach Fox	c1e990e7be	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-10-26 10:37:31 -07:00
luiscuenca	f0eab58ebd	Bug 6719 fixed	2017-10-26 09:41:24 -07:00
Ken Cooke	4eb8b826c2	Merge pull request #11681 from luiscuenca/case6443 ... 6443 Audio Menu Sample Sound won't play while domain is loading	2017-10-26 08:40:30 -07:00
luiscuenca	3d3077978e	Simplyfied and fixed null pointer	2017-10-25 18:47:10 -07:00
Sam Gondelman	863a2041a6	Merge branch 'master' into pointerEvents	2017-10-25 17:22:19 -07:00
Zach Fox	dafa830c0d	First steps	2017-10-25 14:44:59 -07:00
samcake	5b0bbbb21e	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-25 13:14:47 -07:00
luiscuenca	a1c9285c90	Fixed bug on case 6443	2017-10-25 13:13:50 -07:00
Zach Fox	14150c09ac	Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting	2017-10-25 12:59:36 -07:00
vladest	9f32b6c634	Merge branch 'master' into webbrowser_updates	2017-10-25 21:46:39 +02:00
Andrew Meadows	2d0b94817c	Merge pull request #11336 from 1P-Cusack/21389_PR2 ... WL21389 PR2: Representation of collision shapes need updating (details below).	2017-10-25 10:41:21 -07:00
Zach Fox	91333cdf7b	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-25 10:26:50 -07:00