58344 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Fox	65f9b0052f	Working buy button	2017-08-09 13:59:21 -07:00
Sam Gondelman	85c3f94976	Merge branch 'master' into sharks	2017-08-09 13:36:18 -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
beholder	802b5733c5	6742: Multiple highlighted buttons	2017-08-09 22:26:13 +03: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
SamGondelman	6157f4fa55	script fixes	2017-08-09 11:56:25 -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
beholder	836b09b83d	5351: Help Button has Old UI	2017-08-09 20:56:02 +03:00
Atlante45	2eedf1316c	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2017-08-09 10:32:15 -07:00
Liv	0784686450	small typo fix	2017-08-09 10:17:31 -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
Liv	bd1619b1b2	update error message wording	2017-08-09 09:14:46 -07:00
LaShonda Hopper	48e327815d	[Case 6491] Resolves arg order to centerToZero and centerToIntersection vectors. ... Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js	2017-08-09 11:38:44 -04:00
Elisa Lupin-Jimenez	d599753771	Started blocks download catch, fixed a debug typo	2017-08-08 18:43:35 -07:00
SamGondelman	3645bf04b6	possibly fix most annoying crash	2017-08-08 18:10:53 -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
Liv	ab8f5c1288	add user logging detail message	2017-08-08 13:55:07 -07:00
Elisa Lupin-Jimenez	1102b27ba1	Fixed merge conflicts with master	2017-08-08 11:47:08 -07:00
SamGondelman	684001a756	workaround deadlock in editRenderState	2017-08-08 11:11:19 -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
Liv	3f30162215	Make spawning point not 0,0,0 and change error message	2017-08-08 09:44:36 -07:00
SamGondelman	6d253fcc5f	cleaning up	2017-08-07 18:37:55 -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
Liv	b63fcc329e	localhost default can change settings	2017-08-07 17:28:49 -07:00