3737 commits

Author	SHA1	Message	Date
Liv Erickson	3aa12eb7df	pass in deletedIDs so can delete children depth > 1	2018-01-29 17:51:26 -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	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
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
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
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
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
Zach Fox	1d747bc0e4	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-17 11:56:00 -08:00
David Rowe	2883e24285	Add Window.protocolVersion() as a replacement for location's	2018-01-17 12:00:35 +13:00
Seth Alves	511f94a4fc	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-16 14:01:54 -08:00
David Rowe	85bda1da8e	Add Window browseChanged signal as replacement for openFileChanged	2018-01-17 09:57:20 +13:00
Clément Brisset	1949471dad	Merge pull request #12182 from highfidelity/stable ... Merge stable (RC62) to master	2018-01-16 11:01:07 -08:00
Seth Alves	508a3b37cd	fix icon. button lights up when run in enabled	2018-01-12 15:28:42 -08:00
Zach Fox	1e608b13b2	Show username when admin (this probably isn't the way to get username	2018-01-11 14:45:43 -08:00
Seth Alves	1e92615459	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-11 13:21:45 -08:00
Zach Fox	d25ef074e1	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-11 12:35:18 -08:00
John Conklin II	da2c56dbc9	Merge pull request #12139 from hyperlogic/bug-fix/snapshot-app-settings ... RC62: Fix for black screen when clicking Settings from Snap app	2018-01-11 09:48:03 -08:00
Seth Alves	c09f644612	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-11 09:09:11 -08:00
Anthony J. Thibault	1deb75daf7	Fix for black screen when clicking Settings from Snap app ... (cherry picked from commit d5e3b97c93)	2018-01-10 16:31:51 -08:00
Anthony J. Thibault	d5e3b97c93	Fix for black screen when clicking Settings from Snap app	2018-01-10 16:03:53 -08:00
Zach Fox	c15b1669b1	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-10 15:53:23 -08:00
Seth Alves	ddc730f49f	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-10 13:49:07 -08:00
Zach Fox	c5a5bddbc9	More progress	2018-01-10 12:21:12 -08:00
Zach Fox	e5abdc77d9	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-10 10:02:56 -08:00
Zach Fox	f366fdf695	Beginnings of nearby	2018-01-10 09:58:23 -08:00
Seth Alves	3816c732c0	Merge branch 'run' of github.com:sethalves/hifi into run	2018-01-10 08:11:55 -08:00
Seth Alves	8cf94547e4	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-10 08:11:46 -08:00