2653 commits

Author	SHA1	Message	Date
Thijs Wenker	dab4a621a3	Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager	2018-12-21 01:59:11 +01:00
Ryan Huffman	556f516be6	Update uploader screen	2018-12-20 16:30:08 -08:00
Thijs Wenker	79a9c82168	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2018-12-20 18:56:33 +01:00
Jeff Clinton	3d4311b7d4	Merge pull request #14613 from zfox23/MS20253_eventBridge ... MS20253: Only emit screenChanged once screen has changed	2018-12-20 08:58:53 -08:00
Zach Fox	b0ce3a54d5	Merge branch 'MS20187_itemTrash' of github.com:zfox23/hifi into MS20187_itemTrash	2018-12-19 15:16:55 -08:00
Zach Fox	d0998174ff	Un-wear things when trashing them if worn	2018-12-19 15:16:48 -08:00
Zach Fox	46e00cf1b3	Merge branch 'master' of github.com:highfidelity/hifi into MS20187_itemTrash	2018-12-19 15:03:36 -08:00
Ryan Huffman	202326dbac	Merge branch 'feat/avatarTools/avatarPackager' of https://github.com/thoys/hifi into feat/avatarTools/avatarPackager	2018-12-19 12:03:30 -08:00
Ryan Huffman	c2aca64b11	Add start of opening uploaded avatar in inventory	2018-12-19 11:30:21 -08:00
Thijs Wenker	cb74313de8	create projects / style changes	2018-12-19 19:23:24 +01:00
Zach Fox	7fee0fc1e4	Fix MS20253: Only emit screenChanged once screen has changed	2018-12-19 09:50:52 -08:00
Zach Fox	116edcc224	I have no idea how this happened	2018-12-19 09:36:05 -08:00
Jeff Clinton	a7e7a2426e	Merge pull request #14538 from ElderOrb/FB19355 ... FB19355 - When I have avatar entities as children of my avatar, the A…	2018-12-19 09:09:54 -08:00
Zach Fox	f407042f3e	Quick polish fix to prevent UI flashing	2018-12-18 17:11:10 -08:00
Ryan Huffman	720cd90dc7	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2018-12-18 13:17:28 -08:00
Ryan Huffman	ad471387f7	Integrate marketplace upload API	2018-12-18 13:08:55 -08:00
Shannon Romano	a89c53cc52	Merge pull request #14581 from zfox23/MS20308_unknownItems ... Fix MS20308: Allow users to checkout uncertifiable items	2018-12-15 00:44:50 +00:00
Zach Fox	47a46c1d1b	Fix MS20308: Allow users to checkout uncertifiable items	2018-12-14 11:17:56 -08:00
Shannon Romano	131b53e4df	Merge pull request #14315 from wayne-chen/loginInitiative2 ... 2nd initiative for encouraging login	2018-12-14 01:59:35 +00:00
Ryan Huffman	2269447741	Fix AvatarPackager QML size	2018-12-13 15:27:10 -08:00
Shannon Romano	3e10bea1ce	Merge pull request #14567 from davidkelly/dk/18639 ... Return more connections in pal	2018-12-13 22:48:00 +00:00
Ryan Huffman	78c4c2599e	Add start of marketplace uploading and project file list	2018-12-13 13:27:31 -08:00
Wayne Chen	4116f6ca9a	Merge branch 'master' into loginInitiative2	2018-12-12 18:00:07 -08:00
Jeff Clinton	5a81d8c093	Merge pull request #14453 from danteruiz/keyboard-menus ... Keyboard interaction menus	2018-12-12 17:53:59 -08:00
Thijs Wenker	96673bb5b9	show project page	2018-12-12 21:15:44 +01:00
Dante Ruiz	51bdf1bf78	adding keyboards settings	2018-12-12 11:55:13 -08:00
Thijs Wenker	c0bd9121fb	open avatar projects	2018-12-12 19:55:14 +01:00
Wayne Chen	2f07a0eb5d	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-11 20:01:19 -08:00
Zach Fox	dff7804cdc	Change username to trashbot	2018-12-11 16:26:49 -08:00
Zach Fox	d74f7eb098	Implement MS20187: Add trash can feature to Inventory	2018-12-11 15:44:42 -08:00
David Kelly	b2645bc23b	Return more connections in pal	2018-12-11 14:47:18 -08:00
Shannon Romano	efedc1f0b5	Merge pull request #14563 from danteruiz/teleport-settings ... Adding menu settings to disable teleporting	2018-12-11 21:08:23 +00:00
Zach Fox	826644ef08	Merge pull request #14559 from zfox23/MS20161_updatesDot ... Fix MS20161: Fix INVENTORY notification dot state	2018-12-11 13:03:26 -08:00
Dante Ruiz	deaf3e8e44	adding option to disable teleportring	2018-12-11 11:06:13 -08:00
Zach Fox	75ba1cb3c7	I forgot to clear dot immediately	2018-12-11 10:30:12 -08:00
Thijs Wenker	3943fe2861	avatar packager initial	2018-12-10 21:29:03 +01:00
Jeff Clinton	40f50eccb1	Merge pull request #14550 from zfox23/MS20208_assetsToInventory ... Fix MS20208: Change an instance of 'ASSETS' to 'INVENTORY'	2018-12-10 10:49:06 -08:00
Wayne Chen	4c9c785c24	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-10 07:57:44 -08:00
Jamil Akram	bc5166d1d8	Merge pull request #14531 from hyperlogic/feature/drop-after-delay-out-of-range-tracking ... Added DropAfterDelay strategy to Vive Tracker Calibration Dialog	2018-12-07 12:09:44 -08:00
Zach Fox	4cc5fc755f	Fix MS20208: Change an instance of 'ASSETS' to 'INVENTORY'	2018-12-07 11:42:03 -08:00
Wayne Chen	4e6f162e01	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-07 10:12:46 -08:00
Zach Fox	7dcf5da954	Merge pull request #14503 from zfox23/payOut1 ... Pay-Out API Frontend, Part One	2018-12-06 15:25:54 -08:00
Jeff Clinton	43f84a9577	Merge pull request #14426 from ElderOrb/FB19400 ... FB19400 during shutdown -- TypeError: Cannot read property 'buttons' of null	2018-12-06 11:18:39 -08:00
Zach Fox	a2af50a9d0	Show pre-auth'd transactions in Recent Activity before redemption	2018-12-06 11:07:26 -08:00
Zach Fox	235b27a198	Merge branch 'master' of github.com:highfidelity/hifi into payOut1	2018-12-05 16:35:07 -08:00
Zach Fox	02307d2308	Secret to Coupon ID	2018-12-05 16:34:53 -08:00
Alexander Ivash	090bc4fc0d	FB19355 - When I have avatar entities as children of my avatar, the Avatar app is not consistent in displaying wearables	2018-12-05 23:33:34 +03:00
Wayne Chen	a30f4ed0b3	Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2	2018-12-05 08:17:06 -08:00
Wayne Chen	2a77a29f8a	Delete LoginScreenDialog.qml	2018-12-04 17:07:03 -08:00
Wayne Chen	57b21730de	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-04 17:01:56 -08:00