1229 commits

Author	SHA1	Message	Date
Ryan Huffman	a56303a3fe	Merge pull request #11379 from highfidelity/feat/auto-bake ... Add auto baking to Asset Server and mesh compression for FBXs	2017-09-21 08:33:51 -07:00
vladest	c48aba423a	Rename check box	2017-09-20 22:48:39 +02:00
vladest	7a36894f76	Make sure audio device not gets unchecked	2017-09-19 23:25:41 +02:00
vladest	10f7f08171	Added peak model, missed during merging	2017-09-19 21:42:52 +02:00
vladest	6297448e90	Build fix	2017-09-19 19:49:19 +02:00
vladest	6c32783a09	Merge branch 'master' into audio_devices_split	2017-09-19 17:43:03 +02:00
Atlante45	a37642ba44	Pull Auto-Baking changes to TabletAssetServer.qml	2017-09-15 14:43:15 -07:00
Atlante45	c4d018504b	Pull Auto-Baking changes to TabletAssetServer.qml	2017-09-15 13:28:51 -07:00
vladest	de4f34aacb	Add resizable flag. Use the flag for Create only	2017-09-15 21:49:38 +02:00
Atlante45	8711823a9b	Sync up AssetServer.qml and TabletAssetServer.qml	2017-09-15 11:44:08 -07:00
Atlante45	ae14f1f88e	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake	2017-09-14 15:34:20 -07:00
Seth Alves	10494cf3e0	Merge pull request #11359 from vladest/fix_runningscripts_selection ... use selection model of TreeView	2017-09-14 11:22:08 -07:00
Seth Alves	11df5a447e	Merge pull request #11310 from ElderOrb/case6718 ... 6718 PR11082: Help text cannot be dismissed by clicking on the text i…	2017-09-14 11:17:48 -07:00
vladest	7233c47257	use selection model of TreeView	2017-09-14 15:36:12 +02:00
Atlante45	2e84f48539	Fix QML errors	2017-09-13 09:54:55 -07:00
David Kelly	1903f65e45	oops	2017-09-08 16:58:12 -07:00
David Kelly	0a3958f743	cr feedback	2017-09-08 16:06:30 -07:00
David Kelly	99cdbbe306	and lets fix the purchases flow too	2017-09-08 14:00:09 -07:00
David Kelly	db0ecb61fd	Merge pull request #11325 from davidkelly/dk/UserHfcAccountRework ... Use new hfc account endpoint	2017-09-08 09:03:53 -07:00
David Kelly	45c8dd9dd4	cr feedback	2017-09-08 05:28:41 -07:00
David Kelly	efdc340c5c	Use new hfc account endpoint	2017-09-07 18:15:04 -07:00
Stephen Birarda	5e1decb02b	Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake	2017-09-07 12:06:53 -07:00
Brad Hefta-Gaub	c5098abfb9	Merge pull request #10937 from kencooke/zzmp-audio/peak-values ... Add peak values for all input devices in selection dialog	2017-09-07 11:58:50 -07:00
Howard Stearns	a0ae9ee747	Merge pull request #11311 from davidkelly/dk/walletCleanup ... wallet cleanup	2017-09-06 14:29:24 -07:00
anshuman64	94e1545e58	Merge pull request #11298 from ElderOrb/case7382 ... 7382 Create Menu does not Work on Tablet	2017-09-06 14:09:41 -07:00
vladest	e17f05a337	Correct UI	2017-09-06 14:52:08 +02:00
vladest	57643bd904	Merge branch 'master' into audio_devices_split	2017-09-06 14:20:41 +02:00
David Kelly	89cda8d306	oops -- === not ==	2017-09-05 17:15:25 -07:00
David Kelly	1fd30b1e0f	fix passphrase reset	2017-09-05 17:03:11 -07:00
David Kelly	350cee5f35	Wallet cleanup	2017-09-05 16:33:16 -07:00
beholder	41d014ca0c	6718 PR11082: Help text cannot be dismissed by clicking on the text inside the box.	2017-09-06 02:11:40 +03:00
Dante Ruiz	e69227aef8	Merge pull request #11209 from vladest/tablet_login_button ... Added login button to Tablet	2017-09-05 12:59:02 -07:00
David Kelly	3bc45aefb1	Reset passphrase fix	2017-09-05 10:04:16 -07:00
beholder	b5faa8ac56	7382 Create Menu does not Work on Tablet	2017-09-02 18:20:00 +03:00
David Kelly	90316e275a	Merge branch 'commerce_walletPassphraseModal' of https://github.com/zfox23/hifi into commerce_walletPassphraseModal	2017-09-01 13:33:23 -07:00
David Kelly	9fe6ce0337	working change passphrase. some cleanup to come	2017-09-01 13:11:56 -07:00
Zach Fox	3cf0df518f	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal	2017-09-01 11:53:47 -07:00
Zach Fox	51699c9a6a	Minor changes to fonts and colors	2017-09-01 11:44:46 -07:00
Zach Fox	8fcdfa171d	Add debug button to clear passphrase	2017-08-31 16:51:39 -07:00
Zach Fox	1bfc767daf	Quick fixes	2017-08-31 16:42:14 -07:00
Zach Fox	fa25c434ca	Messages to marketplaces.js	2017-08-31 15:50:42 -07:00
Zach Fox	0a9e3e8967	Remove unnecessary code	2017-08-31 15:46:37 -07:00
Zach Fox	2c2500875f	Fixes and improvements	2017-08-31 15:39:58 -07:00
Zach Fox	eab2947d40	Auth flow	2017-08-31 15:16:29 -07:00
Zach Fox	ce32d2d420	Checkout and Purchases	2017-08-31 14:12:05 -07:00
David Kelly	cdadaa8c9c	missed one	2017-08-31 13:41:53 -07:00
David Kelly	de2ce1cd5f	warning	2017-08-31 13:23:38 -07:00
Zach Fox	21a73b2f39	Changes in what I think are the right direction	2017-08-31 13:16:10 -07:00
druiz17	98b1fe6138	Merge pull request #11266 from ElderOrb/case6819 ... 6819 - Create button not disabled	2017-08-31 12:36:08 -07:00
Zach Fox	914a6bae00	Commerce: Wallet Passphrase Modal	2017-08-31 12:18:38 -07:00