5053 commits

Author	SHA1	Message	Date
Seth Alves	c4f57877dd	if hand is already in 'drop gesture' position when equipping something, don't unequip until the hand has been upright	2018-01-31 10:06:20 -08:00
Atlante45	bc819c698e	Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back	2018-01-30 16:09:30 -08:00
Liv Erickson	3aa12eb7df	pass in deletedIDs so can delete children depth > 1	2018-01-29 17:51:26 -08:00
Dante Ruiz	08511a2a2e	fix new model path	2018-01-29 15:27:55 -08:00
Zach Fox	00555250a0	400 connections per page for Wallet and PAL	2018-01-29 12:07:07 -08:00
MiladNazeri	9baf02b7a1	Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request ... Leopoly_Phase1_003_Asset-Request	2018-01-29 11:40:41 -08:00
John Conklin II	d537146fd1	Merge pull request #12240 from luiscuenca/gotoFixForHMD ... RC63 GoTo fix for HMD	2018-01-25 09:37:59 -08:00
John Conklin II	1529fea983	Revert "Display both lasers on tablet and Web surfaces" ... (cherry picked from commit 455090d2b9)	2018-01-24 14:51:42 -08:00
luiscuenca	29dd24b05f	Fix GoTo app in HMD mode	2018-01-23 15:50:32 -07:00
humbletim	51d8b9aea6	update and expand on js unit tests	2018-01-23 03:12:50 -05:00
Brad Davis	8ae0b09ea2	Merge remote-tracking branch 'upstream/master' into android	2018-01-22 15:07:30 -08:00
Sam Gondelman	bdef05a326	Merge pull request #12221 from highfidelity/revert-12203-21703 ... Revert "Display both lasers on tablet and Web surfaces"	2018-01-22 12:27:00 -08:00
John Conklin II	8d028d4bd4	Merge pull request #12220 from RebeccaStankus/API-Debugger-UI ... Updated UI to fit Toolkit Standards	2018-01-22 10:30:48 -08:00
John Conklin II	8b461b960f	Merge pull request #12223 from zfox23/commerce_sendMoney2 ... Commerce: Pixel-perfect "Send Money" UI	2018-01-22 09:39:23 -08:00
Seth Alves	45a00bebc0	Merge pull request #12217 from luiscuenca/sortOrderFix ... Fix sortOrder param on tablet buttons	2018-01-21 10:40:25 -08:00
ZappoMan	f6062ebfcc	new icon and button layout	2018-01-19 16:00:08 -08:00
John Conklin II	455090d2b9	Revert "Display both lasers on tablet and Web surfaces"	2018-01-19 15:15:52 -08:00
John Conklin II	db5bf68431	Merge pull request #12203 from ctrlaltdavid/21703 ... Display both lasers on tablet and Web surfaces	2018-01-19 15:15:44 -08:00
RebeccaStankus	5db5f24043	Updated UI to fit Toolkit Standards	2018-01-19 14:52:44 -08:00
Brad Davis	d53b8b38ac	Merge remote-tracking branch 'upstream/master' into android	2018-01-19 14:35:20 -08:00
David Rowe	7898aa2c4b	Code review	2018-01-20 10:32:42 +13:00
Stephen Birarda	018bcc623b	Merge pull request #12213 from birarda/feat/hide-error-decrypting-notification ... suppress Interface notification for DS decryption error	2018-01-19 14:10:10 -07:00
David Rowe	94e6a68d41	Code review	2018-01-20 09:50:24 +13:00
Zach Fox	9d6e62d6bf	Merge pull request #12163 from ElderOrb/FB11109 ... FB11109 Preview disabled image swap (Commerce only)	2018-01-19 11:40:05 -08:00
Ryan Downe Karpf	f1b18ccc00	Merge pull request #12184 from ctrlaltdavid/21700 ... Add Window browseChanged signal as replacement for openFileChanged	2018-01-19 10:45:27 -08:00
Ryan Downe Karpf	08b4c6eb40	Merge pull request #12206 from druiz17/fix-reduce-calls-isPointOnDesktopWindow ... reduce calls to isPointOnDesktopWindow in controllerModules	2018-01-19 10:44:57 -08:00
Brad Davis	d6f7b23b2d	Merge remote-tracking branch 'upstream/master' into android	2018-01-19 10:37:41 -08:00
luiscuenca	27ea74f5bf	Fix sortOrder param on tablet buttons	2018-01-19 11:22:37 -07:00
Zach Fox	8c52f92de8	Merge pull request #12208 from zfox23/fixBubbleButtonFlash ... Fix the Space Bubble button flash behavior; Rate limit sound	2018-01-19 09:29:17 -08:00
David Rowe	fb684909ce	Merge branch 'master' into 21703	2018-01-19 17:25:12 +13:00
David Rowe	45bc6b8dab	Dominant hand gets the highlight if both start pointing simultaneously	2018-01-19 16:41:23 +13:00
David Rowe	e0e6fc711b	Replace Pointers API function setNonHoverItems() with setDoesHover()	2018-01-19 16:05:09 +13:00
Brad Davis	bdfa1273ba	Merge remote-tracking branch 'upstream/master' into android	2018-01-18 17:33:10 -08:00
Zach Fox	c6429f4f33	Path towards pixel perfection	2018-01-18 17:05:36 -08:00
Stephen Birarda	a97b4b010d	suppress Interface notification for DS decryption error	2018-01-18 16:54:04 -08:00
Clément Brisset	37504eca15	Merge pull request #12186 from ctrlaltdavid/21702 ... Add Window.protocolSignature() as a replacement for location.protocolVersion()	2018-01-18 15:20:03 -08:00
Alexander Ivash	a74b093b60	FB11109 Preview disabled image swap (Commerce only)	2018-01-18 23:26:43 +03:00
David Rowe	8c2427dd58	Rename Window.protocolVersion() to Window.protocolSignature()	2018-01-19 09:06:16 +13:00
Zach Fox	13d8d643f7	Also rate limit the bubble sound	2018-01-18 12:05:16 -08:00
Zach Fox	1bda3faaf2	Fix the Space Bubble button flash behavior	2018-01-18 11:23:49 -08:00
Dante Ruiz	d88ff701b5	reduce calls to isPointOnDesktopWindow	2018-01-18 10:48:35 -08:00
Andrew Meadows	82cab5e4a1	add scripted/qml debug UI for render LOD	2018-01-18 08:53:45 -08:00
David Rowe	403dd3d7d0	Only first laser highlights	2018-01-18 22:31:12 +13:00
Brad Davis	cbb2d9d854	Merge remote-tracking branch 'upstream/master' into android	2018-01-17 17:51:39 -08:00
David Rowe	5878e36ea8	Display both lasers	2018-01-18 14:24:23 +13:00
Zach Fox	5ce768f402	Merge pull request #12151 from zfox23/commerce_sendMoney1 ... Commerce: P2P Transfer Iteration 1	2018-01-17 16:41:56 -08:00
humbletim	49bb9420cc	Merge branch 'master' into Leopoly_Phase1_003_Asset-Request	2018-01-17 17:11:33 -05:00
Dante Ruiz	8f22c719b3	Merge pull request #12099 from sethalves/run ... allow avatar walk-speed to be set from javascript	2018-01-17 13:53:13 -08:00
Seth Alves	8edded7059	Merge pull request #12164 from ctrlaltdavid/21695 ... Remove old ToolWindow code	2018-01-17 13:43:59 -08:00
Zach Fox	1d747bc0e4	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-17 11:56:00 -08:00