61951 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Fox	8fcdfa171d	Add debug button to clear passphrase	2017-08-31 16:51:39 -07:00
David Kelly	1eb503f526	we are qt5.6 on mac	2017-08-31 16:49:12 -07:00
Zach Fox	1bfc767daf	Quick fixes	2017-08-31 16:42:14 -07:00
Bradley Austin Davis	d0fdf175fd	Fix access to menu on background thread	2017-08-31 16:30:17 -07:00
Ryan Huffman	7a68788c8c	Fix warning for non-const default in AssetServer	2017-08-31 16:22:46 -07:00
Atlante45	9b857eb53b	Ensure "enabled" binding stays in place	2017-08-31 16:16:43 -07:00
Atlante45	2fd2bb1e92	Auto reload after changing baking enabled	2017-08-31 16:00:55 -07:00
Ryan Huffman	bf53161a0b	Fix comparison between signed and unsigned int in MappingRequest	2017-08-31 15:55:27 -07:00
Atlante45	cdfae714b5	Remove baking tasks for hash once done	2017-08-31 15:51:47 -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
Hisham Qayum	6f1bb6abe2	wallet icon now has white background, diff design	2017-08-31 14:29:03 -08:00
Ryan Huffman	25f64e1aa9	Merge branch 'feat/auto-bake' of github.com:highfidelity/hifi into feat/bake-meta-errors	2017-08-31 15:17:40 -07:00
Hisham Qayum	d47b29f0aa	Merge branch 'master' of https://github.com/highfidelity/hifi	2017-08-31 14:16:36 -08:00
Zach Fox	eab2947d40	Auth flow	2017-08-31 15:16:29 -07:00
Brad Davis	65b49a958f	Merge branch 'master' into 21484	2017-08-31 14:59:30 -07:00
Anthony J. Thibault	98c89cbe78	Fixes for stylus size and offset	2017-08-31 14:45:59 -07:00
Ryan Huffman	d2c7235fed	Fix update to count width in GetAllMappings	2017-08-31 14:41:29 -07:00
Menithal	0e3fc64f63	Fixed Inverse logic and Cleanup	2017-09-01 00:35:56 +03:00
Zach Fox	ce32d2d420	Checkout and Purchases	2017-08-31 14:12:05 -07:00
Menithal	663e8514de	Found the culprit. Was overriding the value	2017-09-01 00:00:24 +03:00
David Kelly	cdadaa8c9c	missed one	2017-08-31 13:41:53 -07:00
David Kelly	f8341ce1da	warning	2017-08-31 13:24:07 -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
Anthony J. Thibault	a0eb8152a6	fix for tablet spawn position	2017-08-31 13:15:46 -07:00
Atlante45	a9cfc01df3	Set Baking Enabled API	2017-08-31 13:11:27 -07:00
Atlante45	aad0be2693	Set baking enabled mappings	2017-08-31 13:10:07 -07:00
Atlante45	764e5d2e4c	Move constant to central location	2017-08-31 13:08:18 -07:00
Atlante45	da2bede6fe	Hide .baked items from the Asset Browser	2017-08-31 13:08:18 -07:00
Atlante45	3aee6db1e8	Log baker errors	2017-08-31 13:08:18 -07:00
Stephen Birarda	b1bc899121	Merge pull request #11270 from birarda/feat/auto-bake ... refuse to perform mapping operations in /.baked/	2017-08-31 13:06:28 -07:00
Anthony J. Thibault	1a01209020	Fixes for scaling tablet at high frame rates	2017-08-31 13:02:31 -07:00
druiz17	98b1fe6138	Merge pull request #11266 from ElderOrb/case6819 ... 6819 - Create button not disabled	2017-08-31 12:36:08 -07:00
David Kelly	396f108182	forgot this the first time	2017-08-31 12:18:46 -07:00
Zach Fox	914a6bae00	Commerce: Wallet Passphrase Modal	2017-08-31 12:18:38 -07:00
David Kelly	8fbdd207c8	display hfc in "pennies"	2017-08-31 12:10:12 -07:00
Ryan Huffman	0cd8a5cd41	Merge branch 'feat/auto-bake' of github.com:highfidelity/hifi into feat/bake-meta-errors	2017-08-31 12:09:21 -07:00
Ryan Huffman	9ce0f03aa2	Fix mapping comparision in getAssetStatus being done against path	2017-08-31 11:58:03 -07:00
Brad Davis	71a403f03f	Update BUILD_WIN.md	2017-08-31 11:56:27 -07:00
Brad Davis	984503ce29	Update build instructions for vcpkg usage	2017-08-31 11:55:53 -07:00
Stephen Birarda	da8ae23756	move default to the bottom of bakingStatusToString	2017-08-31 11:52:42 -07:00
vladest	1b5e6fd5f8	Merge branch 'master' into modal_dialogs_async	2017-08-31 20:39:48 +02:00
Anthony J. Thibault	9c6b8a6826	Fixes for scaling tablet	2017-08-31 11:28:05 -07:00
Zach Fox	4643a6bf5f	Merge pull request #11286 from zfox23/commerce_fixAdminMarketplaceButtons ... Fix the duplicated buy buttons for admins on Marketplace	2017-08-31 10:53:48 -07:00
Bradley Austin Davis	fb79ba2c6c	Migrate to vcpkg version of OpenSSL	2017-08-31 10:49:49 -07:00
Zach Fox	164eeaae64	Fix the duplicated buy buttons for admins on Marketplace	2017-08-31 10:41:44 -07:00
vladest	6faab9fb1c	Switch flickable on by default for list and grid tabs	2017-08-31 19:21:38 +02:00
Daniela	42be6434af	Merge branch 'master' of https://github.com/highfidelity/hifi	2017-08-31 18:03:39 +01:00