3190 commits

Author	SHA1	Message	Date
Dante Ruiz	459f2c5cdc	fixed tab issue	2017-08-14 16:03:12 -07:00
Dante Ruiz	99617600c4	fix selection issue for TreeView.qml	2017-08-14 15:58:28 -07:00
druiz17	97aa92bc44	Merge pull request #11170 from cain-kilgore/web-browser-assets ... Added Assets for Web Browser MP Script	2017-08-14 13:50:11 -07:00
Zach Fox	199ba3bff0	Use new JSON inventory format	2017-08-14 11:55:21 -07:00
Zach Fox	0835b7b8e6	Bugfix	2017-08-11 16:36:26 -07:00
Zach Fox	d8e5f7a067	Small improvements	2017-08-11 16:32:35 -07:00
Zach Fox	c38837c200	Remove fixmes	2017-08-11 16:21:39 -07:00
Zach Fox	9120e678f1	Use asynchronous commerce API	2017-08-11 16:17:13 -07:00
howard-stearns	d7f83a2fdf	Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce	2017-08-11 15:53:53 -07:00
Zach Fox	a21ff75a49	Big progress!	2017-08-11 12:54:55 -07:00
howard-stearns	8ee54c7b36	Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce	2017-08-11 11:46:20 -07:00
howard-stearns	551ea921cd	Make API asynchronous, for communicating with server	2017-08-11 11:45:40 -07:00
Zach Fox	080c6da71a	Get HFC balance from QmlCommerce API	2017-08-11 10:49:11 -07:00
Zach Fox	e1064938cd	Add inventory; also fix some bugs	2017-08-11 10:31:32 -07:00
Cain Kilgore	4e81ebf85c	Added Assets for Web Browser MP Script	2017-08-10 22:53:35 +01:00
Sam Gateau	79f3be1efe	Merge pull request #11021 from Zvork/fade2 ... Fade dissolve effect JUST AVATARS	2017-08-10 13:48:30 -07:00
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
anshuman64	95b1d5fb91	Merge pull request #11146 from ElderOrb/help_buttons ... 5351: Help Button has Old UI	2017-08-10 11:56:11 -07:00
Seth Alves	f125ef04f1	Merge pull request #11150 from ElderOrb/Case6742 ... 6742: Multiple highlighted buttons	2017-08-09 17:53:55 -07:00
Zach Fox	65f9b0052f	Working buy button	2017-08-09 13:59:21 -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
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
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
beholder	836b09b83d	5351: Help Button has Old UI	2017-08-09 20:56:02 +03:00
Zach Fox	4f85923517	Tons of fixes and improvements!	2017-08-08 17:58:41 -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	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	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
Seth Alves	af1e27dc36	Merge pull request #11053 from hyperlogic/feature/secondary-pose-support ... Improved support for Vive Trackers on biceps	2017-08-07 13:11:48 -07:00
mukulHF	780644fa38	Update TabletRunningScripts.qml	2017-08-07 11:37:27 -07:00
mukulHF	fadc19d8bb	Update RunningScripts.qml	2017-08-07 11:36:37 -07:00
mukulHF	cf7b2ba547	Update LetterboxMessage.qml	2017-08-07 11:35:42 -07:00
mukulHF	3ca2bc0571	Update DesktopLetterboxMessage.qml	2017-08-07 11:35:27 -07:00
mukulHF	e9f268ff26	Update LetterboxMessage.qml	2017-08-07 10:01:50 -07:00
mukulHF	4382f22622	Update DesktopLetterboxMessage.qml	2017-08-07 10:01:26 -07:00
vladest	3a013bf86e	Remove snap to item. Add caching for scrolling speedup	2017-08-05 13:28:08 +02:00
mukulHF	1ce1e29368	Update DesktopLetterboxMessage.qml	2017-08-04 17:44:43 -07:00
mukulHF	7aad4af533	Update LetterboxMessage.qml	2017-08-04 17:44:16 -07:00
Anthony J. Thibault	98bbe887b9	Merge branch 'master' into feature/secondary-pose-support	2017-08-04 16:11:13 -07:00
Dante Ruiz	9be60ee658	made more requested changes	2017-08-04 17:57:53 +01:00
Dante Ruiz	b72ac63662	Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts	2017-08-04 17:19:06 +01:00
vladest	9058a8e2ca	Cleanup top menu on menu reinstantiation	2017-08-04 16:36:00 +02:00
anshuman64	83e50f894a	Merge pull request #11106 from seefo/tracked-objects ... Added Vive pucks as an input channel and added new puck-attach script	2017-08-03 17:03:45 -07:00