19605 commits

Author	SHA1	Message	Date
Zach Fox	e700ff91d0	Remove warning	2018-01-16 15:58:17 -08:00
Zach Fox	8cc427a374	Merge branch 'dk/senderAndRecipientInTxnHistory' of https://github.com/davidkelly/hifi into commerce_sendMoney1	2018-01-16 15:07:53 -08:00
David Kelly	929760c226	fix time display	2018-01-16 14:52:26 -08:00
Zach Fox	d64b35729f	Merge branch 'dk/senderAndRecipientInTxnHistory' of https://github.com/davidkelly/hifi into commerce_sendMoney1	2018-01-16 13:44:29 -08:00
David Kelly	d8f8f9ff1a	First cut at alan's new design	2018-01-16 11:19:10 -08:00
Zach Fox	f7ed8c10fa	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-15 10:13:07 -08:00
David Kelly	6cedc016c4	Adding sender/recipient to transaction history for hfc transfers	2018-01-12 16:08:52 -07:00
David Kelly	579a4d85b3	Merge branch 'commerce_sendMoney1' of https://github.com/zfox23/hifi into dk/senderAndRecipientInTxnHistory	2018-01-12 14:37:46 -07:00
Zach Fox	6920e57613	Fix 'Browse Avatars' button from Avatar Settings	2018-01-12 13:31:58 -08:00
howard-stearns	2987d21f66	remove some more	2018-01-11 13:15:34 -08:00
Zach Fox	81ab5ac81c	hfc_key -> public_key	2018-01-11 12:50:25 -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
howard-stearns	c39771d995	do not delete wallet file when things go wrong, and remove obsolete ... reset machinery	2018-01-11 11:50:23 -08:00
Seth Alves	568c27d6e0	Merge pull request #12039 from luiscuenca/currentAPI ... Fix and improve currentAPI.js	2018-01-10 17:55:08 -08:00
Seth Alves	aefd294bf2	Merge pull request #12107 from hyperlogic/bug-fix/better-third-person-camera ... Improve stability for HMD third person avatars	2018-01-10 17:46:47 -08:00
Andrew Meadows	b3fcca8446	Merge pull request #12132 from hyperlogic/bug-fix/prevent-hands-from-entering-body ... Bug fix to prevent wrists entering the avatar's torso.	2018-01-10 17:22:50 -08:00
MiladNazeri	301731554f	Merge pull request #12102 from cain-kilgore/21664 ... WL 21664 - Window.innerHeight should not include the menu bar	2018-01-10 17:10:14 -08:00
Zach Fox	939012a2d0	Hook up the endpoints!	2018-01-10 17:10:05 -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
MiladNazeri	b73106fa7e	Merge pull request #12120 from cain-kilgore/21666 ... WL 21666 - Window.domainChanged() isn't emitted if domain isn't running	2018-01-10 12:30:21 -08:00
Cain Kilgore	b26e31a362	Copy paste? Never!	2018-01-10 20:27:19 +00:00
MiladNazeri	2220b976dc	Merge pull request #12130 from cain-kilgore/21665 ... WL 21665 - Window.takeSecondaryCameraSnapshot() should emit a stillSnapshotTaken signal	2018-01-10 12:06:58 -08:00
MiladNazeri	bf61d8c7b3	Merge pull request #12115 from ctrlaltdavid/deprecations ... Update JSDoc with some deprecations	2018-01-10 12:04:21 -08:00
Anthony J. Thibault	ae997928c1	Bug fix to prevent wrists entering the avatar's torso. ... This was inadvertently disabled in PR #11978.	2018-01-10 11:51:44 -08:00
Anthony J. Thibault	220b7f5e55	Merge branch 'master' into bug-fix/better-third-person-camera	2018-01-10 10:14:09 -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
Andrew Meadows	7060cd9a90	Merge pull request #12122 from druiz17/fix-double-set-tablet-root ... don't call setQmlTabletRoot twice	2018-01-10 09:53:09 -08:00
Sam Gateau	d4dc1e352f	Merge pull request #12124 from AndrewMeadows/no-misc-stats ... more context for update performance stats	2018-01-10 09:10:26 -08:00
Sam Gateau	8c80247925	Merge pull request #12123 from SamGondelman/meta ... Model meta render item is only withTypeShape if visual geometry request fails	2018-01-10 09:09:19 -08:00
Cain Kilgore	330b266ca8	Merge branch 'master' of https://github.com/highfidelity/hifi into 21665	2018-01-10 11:33:06 +00:00
Cain Kilgore	38afc5a25b	WL 21665 - Window.takeSecondaryCameraSnapshot() should emit a stillSnapshotTaken signal	2018-01-10 11:31:46 +00:00
Zach Fox	928e3d2ef7	Merge pull request #12108 from zfox23/commerce_pagination ... Commerce: Support pagination at History endpoint; improve Purchases scrolling	2018-01-09 15:57:34 -08:00
Zach Fox	edf25c3e4e	Remove code duplication...	2018-01-09 14:14:54 -08:00
Zach Fox	a6259a5ef5	Initial progress	2018-01-09 13:39:28 -08:00
Andrew Meadows	8c6edc749a	provide more context for update perf stats	2018-01-09 12:59:32 -08:00
SamGondelman	7c56a9ffb2	model meta is only withTypeShape if visual geometry request fails	2018-01-09 12:43:43 -08:00
Zach Fox	d31dec7acb	Fix unix build errors	2018-01-09 12:41:56 -08:00
Zach Fox	360a7cc4c6	CR feedback	2018-01-09 11:08:18 -08:00
Anthony J. Thibault	e28f13c1db	Merge branch 'master' into bug-fix/better-third-person-camera	2018-01-09 10:34:04 -08:00
Cain Kilgore	0e3913baff	Removed Window.menuHeight	2018-01-09 09:07:26 +00:00
Cain Kilgore	773461bd30	Merge branch 'master' of https://github.com/highfidelity/hifi into 21666	2018-01-09 08:33:44 +00:00
Cain Kilgore	46de7ed83b	WL 21666 - Window.domainChanged() isn't emitted if domain isn't running	2018-01-09 08:32:59 +00:00
David Rowe	3d9d2a1859	Filed overlay property has been removed	2018-01-09 14:35:02 +13:00
Dante Ruiz	4cf40554c0	don't call setQmlTabletRoot twice	2018-01-08 16:06:31 -08:00
David Rowe	8016ae1bf3	Fix typo	2018-01-09 12:47:12 +13:00
David Rowe	ceb2d38103	Deprecate Overlays.getOverlayObject()	2018-01-09 12:45:12 +13:00
Anthony Thibault	f4c38b91b3	Merge pull request #12071 from luiscuenca/handTouch ... Touch feeling for near grab	2018-01-08 12:50:30 -08:00
Zach Fox	dcfceab078	Remove all work done on paginating purchases	2018-01-08 12:03:56 -08:00
MiladNazeri	56d4429a8b	Merge pull request #12020 from ctrlaltdavid/21646 ... Window JSDoc	2018-01-08 11:53:34 -08:00
Zach Fox	2231bf2bdd	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_pagination	2018-01-08 11:45:20 -08:00