4602 commits

Author	SHA1	Message	Date
David Back	dd09ec1656	Merge branch 'master' of https://github.com/highfidelity/hifi into particleExplorerOptionalPropFix	2018-06-27 16:32:21 -07:00
John Conklin II	e9d2797573	Merge pull request #13472 from alexiamandeville/sittingUpdate69 ... Restoring Emote app to stable build state, adding sit and love emotes	2018-06-27 16:00:53 -07:00
Zach Fox	cfc8c0fb09	Implement MS16257: Remove 'clear overlay when moving' setting and code	2018-06-27 14:07:04 -07:00
Alexia Mandeville	0f25ab7376	Fixing error from typo	2018-06-27 13:30:10 -07:00
David Back	2cdda23169	more robustness for optional properties	2018-06-27 13:05:39 -07:00
John Conklin II	2da3192c33	Merge pull request #13402 from ctrlaltdavid/21895 ... Make desktop left and right mouse button actions independent	2018-06-27 12:46:11 -07:00
Zach Fox	bdeb22703c	Merge pull request #13474 from zfox23/MS16235_handshakeParticles ... Fix MS16235: Set previously-buggy Handshake particle properties to 0	2018-06-27 12:16:48 -07:00
Gabriel Calero	1e09f98f6e	Pick entity or overlay depending on distance	2018-06-27 12:23:43 -03:00
John Conklin II	a38859e4da	Merge pull request #13397 from ctrlaltdavid/21893 ... Fix Create app selection updating when entities are deleted	2018-06-26 17:06:43 -07:00
Zach Fox	6f956ffb8d	Fix MS16235: Set previously-buggy Handshake particle properties to 0	2018-06-26 15:45:18 -07:00
Alexia Mandeville	b3eec72c90	Removing animations.zip	2018-06-26 15:39:50 -07:00
Alexia Mandeville	6f6a9b2c64	Style formatting, updating comments	2018-06-26 15:02:46 -07:00
Alexia Mandeville	92acbdbbd7	Adding sit and love emotes	2018-06-26 14:21:10 -07:00
David Back	40b2525b99	Merge pull request #13439 from dback2/editHandleFixesImprovements ... Edit handle fixes	2018-06-26 13:33:25 -07:00
John Conklin II	47f907f44e	Merge pull request #13441 from wayne-chen/collisionlessGrab-case-12661 ... Fixing collisionless grabbing	2018-06-26 13:05:25 -07:00
David Back	46b5c0cc8e	Merge pull request #13448 from dback2/multiSelectColorInvisibleFix ... Fix multi-selection color setting visible/locked to false	2018-06-26 11:28:58 -07:00
Gabriel Calero	48cdd6d64c	Fix web entities for android	2018-06-26 12:30:03 -03:00
Gabriel Calero	7e640abb39	Support Web entities in android	2018-06-26 12:01:01 -03:00
Sam Gondelman	acfd562309	Merge pull request #13435 from gcalero/breakpad_android ... Breakpad integration for android Interface (part II)	2018-06-25 16:47:07 -07:00
David Back	05438f3b85	bad avatar collision merge	2018-06-25 15:26:54 -07:00
David Back	f65bc9b5ed	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleFixesImprovements	2018-06-25 15:22:07 -07:00
Gabriel	ea2c1298e5	Remove crash added with testing purposes only	2018-06-25 19:13:47 -03:00
Gabriel Calero	0a70e844bf	Merge remote-tracking branch 'upstream/master' into web_overlay_android	2018-06-25 17:41:51 -03:00
Gabriel Calero	fedc0a9e61	Support web3d overlays in android	2018-06-25 16:37:03 -03:00
David Back	6fa191742c	Merge pull request #13390 from dback2/editHandleDebugWindowFix ... Prevent edit press events when pointing at tablet or desktop windows	2018-06-25 11:11:37 -07:00
David Back	39b3e5a711	tabs	2018-06-22 18:15:16 -07:00
David Back	09ccd3acf0	fix multi-selection color setting visible/locked to false	2018-06-22 18:13:40 -07:00
David Back	88762e879f	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision	2018-06-22 13:53:04 -07:00
David Back	80adad7965	myAvatar constant	2018-06-22 13:52:43 -07:00
David Back	6a4c5ed12a	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision	2018-06-22 11:58:28 -07:00
Wayne Chen	1239472f2d	adding line for allowing grabbing of collisionless overlays	2018-06-22 11:35:01 -07:00
Wayne Chen	5b36449edd	allowing grabbing of collisionless entities	2018-06-22 09:54:25 -07:00
Sam Gondelman	850e2d5cf5	Merge branch 'master' into particleFix	2018-06-21 17:32:24 -07:00
SamGondelman	223350b7be	remove logging, play with debounce times	2018-06-21 17:26:39 -07:00
David Back	c019a4816f	CR changes + eslint fixes	2018-06-21 16:45:09 -07:00
David Back	ed56f09fcf	comment	2018-06-21 15:00:10 -07:00
David Back	37b35353d2	space	2018-06-21 14:48:37 -07:00
David Back	e3e8de1042	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleFixesImprovements	2018-06-21 10:24:12 -07:00
John Conklin II	835528b212	Merge pull request #13383 from dback2/autoLaserFix2 ... Fix auto lasering locked web entities & only auto laser tablet and web overlays	2018-06-21 09:21:54 -07:00
David Rowe	d43be5ce19	Code review	2018-06-21 16:35:37 +12:00
David Back	54145e0310	use previous pick ray when translate reaches end	2018-06-20 15:53:38 -07:00
Menithal	55e75298bd	Added Logging	2018-06-21 01:24:32 +03:00
Menithal	903762b122	Make sure max constraints reset ... This now occurs when selecting a new entity and having the UI filled again	2018-06-21 01:04:01 +03:00
David Back	7704e8c2a9	fix stretching too far, improve stretch sphere vs camera dist sizing	2018-06-20 14:47:41 -07:00
Menithal	32982326b1	Moved WebBridge sync to oninput: ... This avoids the settings_update being called only when the image finishes loaded	2018-06-21 00:08:36 +03:00
Menithal	d878ec66e2	Added Lock for not sending settings_update ... This occurs only when fields are being filled	2018-06-21 00:07:14 +03:00
SamGondelman	2f0877dc0f	debugging js	2018-06-19 16:36:13 -07:00
David Back	633be87473	fix stretch panel dimensions	2018-06-19 14:57:46 -07:00
David Back	61cbe84ae5	fix stretching below minimum still moving entity	2018-06-19 14:39:58 -07:00
SamGondelman	de5fcccc7b	proper reporting of nan values in get	2018-06-19 14:22:24 -07:00
SamGondelman	12a5d8b550	quiet ubuntu warnings, particle properties show radians	2018-06-19 12:51:35 -07:00
David Rowe	064f4ca204	Remove deleted entities from list without scrolling to top	2018-06-19 16:22:59 +12:00
David Rowe	5de451e8e0	Update entity list upon entity deletion	2018-06-19 14:52:49 +12:00
David Back	5b699d1cd4	tabs	2018-06-18 16:14:46 -07:00
David Back	7d4fa4f484	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleToggleFix	2018-06-18 15:56:05 -07:00
David Back	030e697945	fix toggling to world space	2018-06-18 15:55:55 -07:00
David Back	0c644c0504	Merge branch 'master' of https://github.com/highfidelity/hifi into autoLaserFix2	2018-06-18 11:06:56 -07:00
David Back	175e4b7013	also check tabletID	2018-06-18 11:06:33 -07:00
David Rowe	ffd66f4377	Make desktop left and right mouse button actions independent	2018-06-18 20:55:13 +12:00
David Rowe	e8154b5df1	Fix Create app selection updating when entities are deleted	2018-06-17 08:35:45 +12:00
SamGondelman	7771661948	fix particle spread properties	2018-06-15 17:35:49 -07:00
David Back	bb0b1cc4a4	no myAvatarIndex needed	2018-06-15 17:35:18 -07:00
David Back	d16b777977	tabs	2018-06-15 17:33:49 -07:00
David Back	b10cf364c4	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision	2018-06-15 17:32:32 -07:00
David Back	6ef8206f3a	temp disable myAvatar collisions when stretching	2018-06-15 17:32:03 -07:00
Gabriel Calero	583c46b3a0	Merge remote-tracking branch 'upstream/master' into breakpad_android	2018-06-15 21:21:03 -03:00
Seth Alves	b4b6c85aaf	Merge pull request #13366 from danteruiz/fixing-invisible-cursor ... fixing invisible cursor when coming from HMD mode	2018-06-15 17:16:46 -07:00
Seth Alves	7ca6dfc8c5	Merge pull request #13371 from danteruiz/fix-focus-issues ... fix focus issues when mouse is offscreen	2018-06-15 17:15:42 -07:00
David Back	cb9c255acd	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision	2018-06-15 14:51:53 -07:00
David Back	bc06b88afc	tabs	2018-06-15 14:31:18 -07:00
David Back	9b33e6757f	prevent edit press events when pointing at desktop window or tablet	2018-06-15 14:29:47 -07:00
Gabriel Calero	4cd94a32b8	Crash on audio button press with testing purpose	2018-06-15 17:44:28 -03:00
David Back	fcccaaea48	tabs	2018-06-14 17:49:02 -07:00
David Back	ed5b05eef4	fix auto laser on locked web entity, only auto laser at tablet or web overlays	2018-06-14 17:43:45 -07:00
David Back	3be477e7f2	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleDebugWindowFix	2018-06-14 13:14:24 -07:00
John Conklin II	fa1dc78469	Merge pull request #13374 from thoys/fix/dynamic-cloneDynamic ... [RC69] fix cloneDynamic	2018-06-14 12:58:17 -07:00
John Conklin II	d023d6adef	Merge pull request #13321 from danteruiz/tablet-imporvments ... Tablet improvements	2018-06-14 12:38:20 -07:00
John Conklin II	4f561b00da	Merge pull request #13003 from alexiamandeville/sittingUpdates ... Adding sitting and love to emote app	2018-06-14 11:52:47 -07:00
Thijs Wenker	4d3087b98c	fix cloneDynamic	2018-06-14 19:07:20 +02:00
Dante Ruiz	abee3e8b96	fix focus issue when mouse is offscreen	2018-06-13 17:07:05 -07:00
Dante Ruiz	a6202cf3cb	fixing invisible cursor	2018-06-13 11:31:14 -07:00
Dante Ruiz	60e46481b2	emissive maps	2018-06-13 10:41:02 -07:00
David Back	cde111d601	remove pointing at system overlay and overlay at point checks	2018-06-12 17:55:04 -07:00
Zach Fox	ffb9a47be0	Merge pull request #13355 from zfox23/MS14314_multipleSnapshots ... Interface Fix for MS14314: Make use of original image filename when sharing	2018-06-12 15:10:22 -07:00
Anthony Thibault	717093abf7	Merge pull request #13171 from luiscuenca/handTouchToDefault ... Enable Avatar Hand Touch Script by Default	2018-06-12 14:54:26 -07:00
Zach Fox	bf5d6de780	Merge branch 'master' of github.com:highfidelity/hifi into MS14314_multipleSnapshots	2018-06-12 11:19:05 -07:00
Zach Fox	cf9cf45d02	Merge pull request #13348 from zfox23/MS14129_buyButtonStuck ... Fix MS14129: Prevent Marketplace buttons from getting stuck in hover state	2018-06-12 11:02:52 -07:00
Dante Ruiz	f1d11f9566	Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments	2018-06-12 10:21:12 -07:00
Luis Cuenca	9126a6f66d	hide debug lines	2018-06-12 10:12:28 -07:00
Zach Fox	860f9db939	Remove logging	2018-06-12 09:25:09 -07:00
Zach Fox	14034f29a1	Interface Fix for MS14314: Make use of original image filename when sharing	2018-06-11 17:10:09 -07:00
Sam Gondelman	e8ec32c7f8	Merge pull request #13340 from SamGondelman/modelTextures ... Try to fix ModelOverlay texture loading	2018-06-11 16:09:10 -07:00
Dante Ruiz	6685fbbfc4	Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments	2018-06-11 13:56:54 -07:00
Dante Ruiz	f2d6b84e6c	fix qa fail issues	2018-06-11 13:56:44 -07:00
John Conklin II	9db71fb40d	Merge pull request #13322 from dback2/fixEquipMessage ... Fix Hifi-Grab-Hand message for equipping	2018-06-11 13:16:39 -07:00
Zach Fox	a5ef3fa729	Fix MS14129: Prevent Marketplace buttons from getting stuck on hover state	2018-06-11 12:00:51 -07:00
John Conklin II	d5b8570ef6	Merge pull request #13343 from ctrlaltdavid/21888 ... Fix tablet attaching to hand while far-grabbing an entity	2018-06-11 10:26:37 -07:00
Howard Stearns	5ce122f148	Merge pull request #13307 from howard-stearns/infinite-scroll ... Infinite scroll	2018-06-11 10:03:52 -07:00
Sam Gondelman	9c66ee412a	Merge pull request #13325 from Cristo86/patch-1 ... Use third person camera mode when switching to My View from Top View mode.	2018-06-11 09:36:29 -07:00
Dante Ruiz	ba86c9753d	Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments	2018-06-11 09:13:14 -07:00
SamGondelman	2dae613612	remove conserveResources	2018-06-08 17:58:06 -07:00
David Rowe	54b96cd602	Fix incomplete transition from far-grabbing entity to grabbing tablet	2018-06-09 11:32:10 +12:00
David Rowe	dc46c2077d	Fix function name	2018-06-09 11:01:18 +12:00
Dante Ruiz	5843c24309	adding perfectly straight model and adjusting ovelray	2018-06-08 13:56:00 -07:00
Dante Ruiz	dfea4a0f7c	fixing rotation	2018-06-08 11:50:52 -07:00
howard-stearns	2761688d39	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-07 16:14:57 -07:00
druiz17	8c83bd29a3	making requested changes	2018-06-07 14:04:39 -07:00
Zach Fox	93eba5fe5e	Merge pull request #13293 from zfox23/MS7224_cubeSnapshots ... Fix MS7224: Add dimensions to printed Snapshot entity	2018-06-07 12:52:20 -07:00
Cristian Duarte	664884c9a8	Use third person camera mode when switching to My View from Radar mode. ... This makes it consistent with the default third person camera in My View.	2018-06-07 16:41:41 -03:00
howard-stearns	890c97e7cb	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-07 12:24:27 -07:00
luiscuenca	df32fe60e4	using RayPick API	2018-06-07 11:44:59 -07:00
luiscuenca	5403db6d51	Merge branch 'master' into handTouchToDefault	2018-06-07 11:42:26 -07:00
John Conklin II	067fa46355	Merge pull request #13265 from wayne-chen/toggleSpaceMode ... Re-adding toggleSpaceMode function	2018-06-07 11:21:28 -07:00
John Conklin II	389bddb0f4	Merge pull request #13255 from ctrlaltdavid/21884 ... Fix properties not populating particle explorer tab	2018-06-07 09:42:45 -07:00
John Conklin II	66e2bebcbf	Merge pull request #13279 from thoys/fix/create-camera ... Fix MS13500: create-app camera orbit to not jump around on secondary monitor	2018-06-07 09:38:10 -07:00
David Back	8f5de7b16a	use messageGrabEntity flag instead	2018-06-06 18:05:26 -07:00
David Back	0ee55a09b6	fix tabs	2018-06-06 17:35:25 -07:00
David Back	048872c79a	use messageEquip flag to fix Hifi-Hand-Grab	2018-06-06 17:32:52 -07:00
David Rowe	32c21a1397	Fix particle property value reverting to old value when switch tabs	2018-06-07 12:22:56 +12:00
Dante Ruiz	5a89a51b85	make edit mode play nicely	2018-06-06 16:04:36 -07:00
David Rowe	3e100fb141	Merge branch 'master' into 21884	2018-06-07 10:46:53 +12:00
Dante Ruiz	6ddc768f57	making overlays use precisionPicking and adjust tablet screen position	2018-06-06 15:40:33 -07:00
Dante Ruiz	d57d087752	update tablet model again	2018-06-06 12:48:20 -07:00
Dante Ruiz	995cfeb3c5	cleaning code	2018-06-06 10:42:12 -07:00
Dante Ruiz	59c50b7f26	remove highlight overlay in favor of materialEntity	2018-06-06 08:38:58 -07:00
Dante Ruiz	b275bbe5a7	saving changes	2018-06-05 15:44:17 -07:00
Zach Fox	4ebfca0c57	Really fix it	2018-06-05 10:04:37 -07:00
Zach Fox	82c438a174	CR	2018-06-05 10:04:26 -07:00
Zach Fox	b9604fdb9d	Fix MS14796: Fix position of tablet close button highlight	2018-06-05 10:04:13 -07:00
Wayne Chen	c18c2358d6	adding fix for tablet screen y offset	2018-06-05 10:03:59 -07:00
David Rowe	b4b63187ae	Fix typo	2018-06-05 08:48:10 +12:00
howard-stearns	5257a254cb	more for the previous	2018-06-04 13:12:41 -07:00
howard-stearns	254abfa04a	add request-services to default scripts.	2018-06-04 12:59:08 -07:00
SamGondelman	8af1beca8d	add isGroupCulled for model overlays	2018-06-04 12:07:57 -07:00
Zach Fox	cf7a3d1af6	Fix MS7224: Add dimensions to printed Snapshot entity	2018-06-04 11:30:29 -07:00
howard-stearns	29b09d64e6	checkpoint with PAL working.	2018-06-01 13:33:45 -07:00
howard-stearns	e6ffb9a3e5	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-01 11:10:13 -07:00
Seth Alves	708cbbc984	Merge pull request #13258 from wayne-chen/toggleAdvancedMovementFile-case-15453 ... JavaScript exception in toggleAdvancedMovementForHandControllers.js	2018-06-01 10:48:24 -07:00
howard-stearns	84f5f0a653	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-01 09:58:08 -07:00
Thijs Wenker	3779a4780e	Prevent the cursor from being stuck on the most outer edges of the screen	2018-06-01 02:07:02 +02:00
Thijs Wenker	a06c9eccca	- fix create-app camera orbit to not jump around on secondary monitor ... - style fixes entityCameraTool.js	2018-06-01 00:16:42 +02:00
Wayne Chen	9f20d52d01	adding alternate solution.	2018-05-31 15:05:33 -07:00
Wayne Chen	d66b548fc5	fixing typo in script file.	2018-05-31 15:04:29 -07:00
howard-stearns	e8e12eef8f	checkpoint	2018-05-31 14:42:52 -07:00
David Rowe	3c5a779a98	Don't modify function parameter	2018-06-01 09:36:28 +12:00
David Back	d20d594ae5	use setCollisionEnabled for avatar collisions	2018-05-31 10:50:54 -07:00
howard-stearns	b0d3729d4d	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-05-30 17:09:57 -07:00
howard-stearns	bdd38cef7a	checkpoint	2018-05-30 17:09:13 -07:00
Wayne Chen	34120da63f	re-adding toggleSpaceMode	2018-05-30 16:06:34 -07:00
Dante Ruiz	072d8b70b1	adding back notifcations	2018-05-30 13:36:02 -07:00
David Rowe	8c9bdf51a7	Remove superfluous variable	2018-05-30 17:16:08 +12:00
David Rowe	03cec8cb54	Fix properties not populating particle explorer tab	2018-05-30 17:15:33 +12:00
howard-stearns	a84829392f	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-05-29 16:14:22 -07:00
Gabriel Calero	bb73af7230	Show stats button only in debug mode. Add isDebugMode to Script public interface	2018-05-29 17:21:44 -03:00
howard-stearns	17be460adf	checkpoint	2018-05-25 16:37:06 -07:00
Alexia Mandeville	cdf56d3c6d	Adding comment for clarification, formatting comment style	2018-05-25 10:42:56 -07:00
Wayne Chen	8453c7baba	reverting commit 802cedf1bc regarding toggleSpaceMode	2018-05-25 09:25:05 -07:00
Wayne Chen	89f7eb0b30	Adding fix for enabling saved front/back advanced controls.	2018-05-25 09:21:01 -07:00
Alexia Mandeville	5540561730	Removing trigger input stopping animation to enable VR	2018-05-24 18:45:04 -07:00
Alexia Mandeville	81d615c9db	Revert "Removing sit functionality from teleport" ... This reverts commit 36df9d7de8.	2018-05-24 17:36:29 -07:00
howard-stearns	235971f8bf	checkpoint	2018-05-24 15:23:45 -07:00
Wayne Chen	3d0e0da42f	re-adding removed toggleSpaceMode function	2018-05-24 11:08:26 -07:00
John Conklin II	3e665fb616	Merge pull request #13179 from dback2/cloneables ... Server-Managed Cloneables + Cloneable Properties	2018-05-23 12:40:27 -07:00
Dante Ruiz	c4f39841f5	fix another menu name changes that broke snapshot	2018-05-22 10:46:20 -07:00
Dante Ruiz	9df79462ad	fix snapshot	2018-05-22 09:06:10 -07:00
Liv Erickson	604b3cac1c	check for null entities in grab, add conversion for old userdata cloneable	2018-05-21 16:19:43 -07:00
howard-stearns	fc6bfe9e44	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-05-21 10:41:45 -07:00
Dante Ruiz	249d22b4b4	Merge branch 'master' of github.com:highfidelity/hifi into menu-updates	2018-05-21 10:31:24 -07:00
Anthony Thibault	4f69ae253d	Merge pull request #12906 from Triplelexx/21794_move_inspect ... WorkList #21794: Modify inspect.js to work with Avatars as well as entities	2018-05-21 09:40:42 -07:00
howard-stearns	d385a255c4	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-05-18 16:53:08 -07:00
Liv	0927cadf10	Merge pull request #13093 from RebeccaStankus/edit-bug-14671 ... moved checkEditPermissionsAndUpdate function to higher scope	2018-05-18 16:44:53 -07:00
Liv	99960b3024	Merge pull request #13085 from ctrlaltdavid/21863 ... Fix intermittent ability to select particle and light entities	2018-05-18 16:44:11 -07:00
Dante Ruiz	3b59af3ed7	Merge branch 'master' of github.com:highfidelity/hifi into menu-updates	2018-05-18 16:42:31 -07:00
Dante Ruiz	60dd7e49ab	making requested changes	2018-05-18 16:41:39 -07:00
Liv Erickson	de05388ebf	Merge branch 'master' of github.com:highfidelity/hifi into clone-server	2018-05-18 10:42:26 -07:00
RebeccaStankus	27638b9ced	Removing duplicate function	2018-05-18 09:20:03 -07:00
Sam Gondelman	74840d2130	Merge pull request #12935 from gcalero/android_new_login ... Android new login	2018-05-17 15:53:25 -07:00
David Back	900b373c96	Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables	2018-05-17 09:04:28 -07:00
Gabriel Calero	96da032b16	Add missing js to haptic feedback change	2018-05-17 11:49:44 -03:00
Gabriel Calero	8741c5e6a4	Make haptic pulse duration configurable in VirtualPadDevice	2018-05-17 11:37:13 -03:00
David Rowe	6c3174ccf1	Make particle / light icon translate x-z when inside bounding box	2018-05-17 17:04:12 +12:00
David Rowe	801a4b9aba	Make laser click in sky deselect entity	2018-05-17 15:09:23 +12:00
Zach Fox	585957409d	Merge pull request #13141 from zfox23/spectatorCameraImprovements ... Spectator Camera V2	2018-05-16 13:38:07 -07:00
David Rowe	b74f42dc23	Merge branch 'master' into 21863	2018-05-17 07:44:39 +12:00
Zach Fox	0021af8714	Merge in in-progress changes from old commerce_paginationAndFiltering branch	2018-05-16 12:28:52 -07:00
David Back	06fa4efe05	add comment	2018-05-16 11:39:53 -07:00
David Back	6c946d7ac5	prevent continuous clone calls	2018-05-16 11:36:57 -07:00
Dante Ruiz	37c51a7246	Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates	2018-05-16 10:41:40 -07:00
Dante Ruiz	e676348c4f	fixing some menu reog bugs	2018-05-16 10:40:28 -07:00
Gabriel Calero	5afc9c6df3	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-16 12:45:17 -03:00
vladest	5127cb0ea6	Merge branch 'master' into menu-updates	2018-05-16 14:37:00 +02:00
David Back	1e2d2819d5	tweaks	2018-05-15 17:36:39 -07:00
David Back	f8fc7bedd7	Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables	2018-05-15 17:31:43 -07:00
David Back	f74e219029	rename properties, add clone avatar entity, remove worldEntityProps arg, fix clone ID cleanup on delete	2018-05-15 17:24:14 -07:00
John Conklin II	ce1231910c	Merge pull request #13140 from Cristo86/android_avatar_name ... @SamGondelman We just do a quick 5-10 minute Windows check, just to make sure Windows/Mac weren't broken by the change.	2018-05-15 13:22:15 -07:00
vladest	7ea6181520	Merge branch 'master' into menu-updates	2018-05-15 21:54:45 +02:00
Zach Fox	bccaa2dbe5	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-15 11:50:38 -07:00
Dante Ruiz	931c8f5abe	Merge pull request #13110 from ctrlaltdavid/21866 ... Don't unnecessarily scroll HTML content when keyboard is raised	2018-05-15 11:00:38 -07:00
Seth Alves	6da59d15e5	Merge pull request #13167 from dback2/lowercaseUnequip ... Desktop equip: fix unequipping with capital U	2018-05-15 10:55:19 -07:00
John Conklin II	a76be78386	Merge pull request #13163 from sethalves/fix-near-grab-to-hips ... fix near-grab attaching entity to hips	2018-05-15 10:28:36 -07:00