57937 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Elisa Lupin-Jimenez	74c90d6323	minor typo	2017-08-09 16:08:47 -07:00
Elisa Lupin-Jimenez	a2e407f786	fixed merge conflicts in marketplacesInject.js	2017-08-09 15:59:20 -07:00
Elisa Lupin-Jimenez	1ac9536f95	Downloading blocks from marketplace in own asset folder	2017-08-09 15:56:07 -07:00
Clément Brisset	6fdee374e0	Merge pull request #11125 from Atlante45/new-master ... Update master from stable	2017-08-09 15:19:28 -07:00
Brad Hefta-Gaub	91ca38e016	Merge pull request #11152 from zfox23/dontAlwaysDoPrecisionPicking ... Don't always do precision picking inside mouseMoveEvent	2017-08-09 14:29:42 -07:00
Zach Fox	b8c45b0c30	Don't always do precision picking inside mouseMoveEvent	2017-08-09 14:23:43 -07:00
Howard Stearns	cc634a2d1b	Merge pull request #11148 from zfox23/commerce_singleSetting ... New commerce mode now depends on 1 setting; bugfixes; Tablet -> TAB key	2017-08-09 13:25:10 -07:00
Howard Stearns	860934cd59	Merge pull request #11149 from howard-stearns/buy ... Buy	2017-08-09 13:24:25 -07:00
howard-stearns	f1ab91edd1	PR feedback	2017-08-09 12:41:16 -07:00
howard-stearns	a726b01263	remove duplicated line	2017-08-09 12:11:12 -07:00
howard-stearns	7414bf0d9a	oops. didn't test what I thought I did	2017-08-09 12:09:03 -07:00
howard-stearns	1cf81495ab	basic commerce infrastructure	2017-08-09 11:50:52 -07:00
Zach Fox	33fa8c4f86	Fix bugs and also change to single setting	2017-08-09 11:44:09 -07:00
Elisa Lupin-Jimenez	17acf0520d	Download from blocks in marketplace working	2017-08-09 11:08:14 -07:00
Atlante45	2eedf1316c	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2017-08-09 10:32:15 -07:00
howard-stearns	9349e72eeb	Merge branch 'master' of https://github.com/highfidelity/hifi into buy	2017-08-09 10:00:36 -07:00
Howard Stearns	afbe35a2fe	Merge pull request #11143 from zfox23/commerce_CheckoutQMLInvestigation ... Add skeleton "Checkout" page for Marketplace items	2017-08-09 09:58:21 -07:00
Zach Fox	61526256bc	Remove personalized comment	2017-08-09 09:30:18 -07:00
Elisa Lupin-Jimenez	d599753771	Started blocks download catch, fixed a debug typo	2017-08-08 18:43:35 -07:00
Zach Fox	9d60d5153f	Clarifying comment and turn setting off first	2017-08-08 18:00:17 -07:00
Zach Fox	4f85923517	Tons of fixes and improvements!	2017-08-08 17:58:41 -07:00
Zach Fox	b2c5a1f899	Fancy MutationObserver!	2017-08-08 17:12:06 -07:00
Elisa Lupin-Jimenez	efd25a5e70	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-08 16:55:10 -07:00
Zach Fox	03729bf165	Actually fix context menu	2017-08-08 16:38:12 -07:00
Zach Fox	871a5ff1ab	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_CheckoutQMLInvestigation	2017-08-08 15:53:22 -07:00
Zach Fox	69fc69cffb	Comment fix and overlay click fix	2017-08-08 15:52:59 -07:00
Andrew Meadows	71ba6ba10a	Merge pull request #10807 from jmo7/21356 ... 21356 - Reorder Edit.js	2017-08-08 15:15:37 -07:00
Andrew Meadows	23c3715e8f	Merge pull request #10902 from jmo7/21391 ... Worklist #21391 Implement a Parenting Tool	2017-08-08 14:56:24 -07:00
Chris Collins	995ee60aa5	Merge pull request #11129 from highfidelity/RC-50 ... Beta Release 50 - Includes up to Developer Release 6961	2017-08-08 14:39:17 -07:00
Zach Fox	7d26d2d88b	Switch and fix overlay clicks	2017-08-08 14:29:44 -07:00
Elisa Lupin-Jimenez	1102b27ba1	Fixed merge conflicts with master	2017-08-08 11:47:08 -07:00
utkarshgautamnyu	aa6b97f91a	Update NSIS.template.in	2017-08-08 10:33:27 -07:00
utkarshgautamnyu	99b0da9336	Update NSIS.template.in	2017-08-08 10:33:21 -07:00
utkarshgautamnyu	dfc570b2db	Update NSIS.template.in	2017-08-08 10:33:09 -07:00
utkarshgautamnyu	47937d85d5	indentation fixes	2017-08-08 10:33:02 -07:00
utkarshgautamnyu	5e706e84ce	bug fixes for express installer	2017-08-08 10:32:54 -07:00
Chris Collins	153b5cb065	Merge pull request #11137 from highfidelity/bug/6834 ... Fixed bugs related to express installer	2017-08-08 10:11:11 -07:00
utkarshgautamnyu	56c695acbb	Update NSIS.template.in	2017-08-07 18:34:20 -07:00
utkarshgautamnyu	dc4121f9d1	Update NSIS.template.in	2017-08-07 17:55:45 -07:00
utkarshgautamnyu	b80def995f	Update NSIS.template.in	2017-08-07 17:53:39 -07:00
utkarshgautamnyu	c9c36bb19e	indentation fixes	2017-08-07 17:50:53 -07:00
utkarshgautamnyu	3ee5f78c40	bug fixes for express installer	2017-08-07 17:44:07 -07:00
Zach Fox	1493a310af	Beginning of stack stuff	2017-08-07 17:02:24 -07:00
Zach Fox	45424f0cfe	Prototype V1	2017-08-07 16:25:42 -07:00
Zach Fox	7e922cb2c2	Layout	2017-08-07 16:16:17 -07:00
Zach Fox	517128a939	More steps	2017-08-07 16:03:42 -07:00
Seth Alves	e0daa92757	Merge pull request #11133 from druiz17/bug-create-spinner ... Fixed this issue of the spinner not displaying in create mode	2017-08-07 14:48:27 -07:00
Zach Fox	d7dd331685	Bugfixes	2017-08-07 14:39:31 -07:00
Zach Fox	7d4fd995f2	First steps	2017-08-07 14:29:47 -07:00
Seth Alves	60895872ca	Merge pull request #11123 from vladest/attachment_speedup ... Remove snap to item. Add caching for scrolling speedup	2017-08-07 13:18:50 -07:00