58329 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	d812c293e8	Merge pull request #11120 from mukulHF/bug-lock-default-scripts ... Disable the ability for a user to edit default scripts if developer settings is not enabled - adjusting values	2017-08-10 12:29:23 -07:00
druiz17	005c5a9278	Update TabletRunningScripts.qml	2017-08-10 12:26:57 -07:00
ZappoMan	87b2af25ba	re-enable sixense and update comment	2017-08-10 12:03:56 -07:00
anshuman64	95b1d5fb91	Merge pull request #11146 from ElderOrb/help_buttons ... 5351: Help Button has Old UI	2017-08-10 11:56:11 -07:00
Stephen Birarda	e8bd4334fe	Merge pull request #11156 from birarda/bug/update-tbb-vc14 ... stop compiling tbb from source and use vc14 version for VS 2015/2017	2017-08-10 11:25:21 -07:00
Stephen Birarda	8d0ed51035	clear entity tree in Agent if ES disappears	2017-08-10 11:02:56 -07:00
Elisa Lupin-Jimenez	af95d7f892	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-10 10:13:27 -07:00
Stephen Birarda	feef7dfec3	compare MSVC version numerically with greater_equal	2017-08-10 09:46:58 -07:00
Zach Fox	cb02ff4026	Merge pull request #11154 from zfox23/commerce_fixMarketplacesMessagePassing ... Fix marketplaces message passing	2017-08-10 09:46:54 -07:00
Ken Cooke	d0e7584f0f	Merge pull request #11158 from kencooke/audio-input-dummy ... Support for running Interface without a microphone	2017-08-10 06:47:04 -07:00
Ken Cooke	ee752df653	fix typo	2017-08-09 20:11:52 -07:00
Ken Cooke	bcdf13c59c	Add explicit shutdown request, since null device means something else	2017-08-09 19:40:07 -07:00
Stephen Birarda	c7edc98d5c	remove deprecated CMake policy no longer needed	2017-08-09 18:47:50 -07:00
Stephen Birarda	5b072b591e	remove commas breaking MSVC dir setting	2017-08-09 18:41:34 -07:00
anshuman64	0f163a6a7c	Merge pull request #11153 from hyperlogic/bug-fix/you-spin-me-right-round-baby-right-round ... Bug fix for HMD roll causing avatar yaw when standing still	2017-08-09 18:00:03 -07:00
Stephen Birarda	57fe5ae802	use tbb binaries more and update for vc14	2017-08-09 17:55:15 -07:00
Seth Alves	f125ef04f1	Merge pull request #11150 from ElderOrb/Case6742 ... 6742: Multiple highlighted buttons	2017-08-09 17:53:55 -07:00
Ken Cooke	ee6d4dfc14	If real input device fails to start, use dummy input	2017-08-09 17:50:20 -07:00
Elisa Lupin-Jimenez	d3c76c99c2	See all markets button working again	2017-08-09 17:28:05 -07:00
Elisa Lupin-Jimenez	69a13052ab	commented out blocks injection	2017-08-09 17:23:08 -07:00
Brad Davis	0452bcfbd5	Fix bad plugins causing instant crash on startup	2017-08-09 17:15:04 -07:00
Zach Fox	2d256a62a9	Fix marketplaces message passing	2017-08-09 17:04:36 -07:00
Ken Cooke	fc5b4be459	bugfix	2017-08-09 16:59:02 -07:00
Ken Cooke	9c6b7306c4	Re-implement callback to Use common handleAudioInput()	2017-08-09 16:58:12 -07:00
Zach Fox	4cfc80c70f	Merge pull request #11151 from zfox23/commerce_workingBuyButton ... Adds a working "Buy" button to Checkout.qml	2017-08-09 16:56:58 -07:00
Liv	6bde4db0d7	wrap in marketplace check and change landing point	2017-08-09 16:35:25 -07:00
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
Ken Cooke	7daa3ecff3	Handle dummy input callbacks	2017-08-09 15:54:14 -07:00
Anthony J. Thibault	4d845bd208	Bug fix for HMD roll causing avatar yaw when standing still ... HMD roll should only cause the avatar to yaw when actively driving.	2017-08-09 15:52:27 -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
Ken Cooke	6f2cc9cfeb	When no input device, create dummy input to generate callbacks	2017-08-09 14:01:17 -07:00
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