2037 commits

Author	SHA1	Message	Date
Zach Fox	c0fe504713	Merge pull request #13030 from zfox23/finalize_14295_14559 ... Finalize work on MS14295 and MS14559	2018-04-27 13:49:02 -07:00
Howard Stearns	f8ad36afd0	Merge pull request #13028 from zfox23/updateCommerceFor67 ... Allow gifting of Pending items; remove PoP verification rescheduling on Pending items	2018-04-27 11:55:40 -07:00
Zach Fox	bbc15cdc63	Finalize work on MS14295 and MS14559	2018-04-27 11:04:46 -07:00
Zach Fox	0f36fb113d	Allow gifting of Pending items; remove PoP verification rescheduling on Pending items	2018-04-27 10:20:55 -07:00
Brad Hefta-Gaub	e4f5eb9cca	Merge pull request #13020 from zfox23/MS14295_GiftsUIFixes ... MS14295: Fix lingering Gifts UI Bugs	2018-04-27 07:30:14 -07:00
Zach Fox	e3b14bf478	MS14295: Fix lingering Gifts UI Bugs	2018-04-26 15:57:37 -07:00
Zach Fox	fc324f67bd	MS14559: Fix sometimes being unable to click on 'Nearby' orb when sending Gift/HFC	2018-04-26 15:09:53 -07:00
John Conklin II	236e75b6c6	Merge pull request #12903 from druiz17/add-more-hmd-data ... Get the correct device name connect to OpenVr	2018-04-24 13:29:41 -07:00
vladest	0e28e41107	Fix various issues with SpinBox-es and Sliders	2018-04-20 19:15:29 +02:00
Howard Stearns	6d151f022d	Merge pull request #12910 from zfox23/MS12217_letterboxMessageFix ... Only dismiss letterbox when clicking on grey areas	2018-04-19 11:47:10 -07:00
Zach Fox	e01e7cc7bc	Be a bit more efficient	2018-04-18 16:34:02 -07:00
Dante Ruiz	9d6fc13a04	Merge branch 'master' of github.com:highfidelity/hifi into more-tablet-changes	2018-04-18 13:06:51 -07:00
Dante Ruiz	a65f5f7917	making tablet changes	2018-04-18 13:06:26 -07:00
Zach Fox	93cf399fd6	Only dismiss letterbox when clicking on grey areas	2018-04-16 15:09:19 -07:00
Zach Fox	02aa8ac566	Bugfixes per QA	2018-04-16 11:53:37 -07:00
Zach Fox	071bf35683	Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018	2018-04-16 10:11:44 -07:00
Dante Ruiz	5af1ea54d3	Merge branch 'master' of github.com:highfidelity/hifi into add-more-hmd-data	2018-04-16 10:10:55 -07:00
Seth Alves	46a741be7b	Merge pull request #12068 from vladest/move_to_qqc2 ... Move to qqc2	2018-04-12 11:26:55 -07:00
John Conklin II	213c35dab4	Merge pull request #12790 from WolfGangS/bugfix/12759-editoverlay-subimage ... Bugfix for #12759 Overlays.editOverlay not applying subImage property	2018-04-12 10:34:17 -07:00
Zach Fox	0c9d65bc15	Merge pull request #12758 from zfox23/commerce_fixCertificateInfoError ... Commerce: Fix Certificate Info error	2018-04-11 09:38:43 -07:00
Zach Fox	a2f5891a0b	Cleanup 'Private' HMD Preview State Machine Logic	2018-04-10 16:00:18 -07:00
Zach Fox	ffab27d442	Commerce: Fix Certificate Info error	2018-04-10 15:54:55 -07:00
Zach Fox	a9b9a1cb10	Commerce: Gifts	2018-04-10 15:54:19 -07:00
Clément Brisset	c62a701a2d	Merge pull request #12838 from highfidelity/RC66 ... RC66 merge back to master	2018-04-09 13:17:12 -07:00
Alexander Ivash	faddc556d7	FB14015 - Go To app does not close when selecting forward and back arrows on desktop	2018-04-07 17:57:22 +03:00
Zach Fox	0c48ccefa4	Clean up failResponse to make it better	2018-04-06 11:41:17 -07:00
Zach Fox	af5a68b282	Merge branch 'master' of github.com:highfidelity/hifi into commerce_fixCertificateInfoError	2018-04-06 10:58:32 -07:00
WolfGang	787127b149	move subImage recalculation to it's own method	2018-04-04 22:10:54 +01:00
Howard Stearns	3a428bc44f	Merge pull request #12776 from zfox23/fixHmdPreviewAgain_1 ... Fix 'Private' HMD preview texture enable/disable...again	2018-04-04 10:03:18 -07:00
WolfGang	f9bcd23463	make subimage update the image anchors	2018-04-04 17:28:55 +01:00
Seth Alves	2df334c50e	Merge pull request #12663 from ElderOrb/FB12870 ... Fix for not updating checkbox state on 'baking' / 'unbaking'.	2018-04-04 09:03:03 -07:00
Zach Fox	f20eddefc8	Fix 'Private' HMD preview texture enable/disable...again	2018-04-03 13:46:02 -07:00
Zach Fox	5441767442	Better cert display	2018-04-02 12:22:41 -07:00
Zach Fox	32e5e9986f	Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation	2018-03-30 10:10:43 -07:00
Alexander Ivash	814cfa4587	fix TabletAssetServer	2018-03-30 00:09:28 +03:00
Alexander Ivash	e5da59a62f	FB12870 - Tablet UI ->Asset Browser unresponsive when enabling/disabling "use baked version"	2018-03-29 23:01:59 +03:00
Liv Erickson	387ff680d5	support deleted scenario	2018-03-28 18:12:30 -07:00
Liv Erickson	b78f00342e	Merge branch 'master' of github.com:highfidelity/hifi into feat/disable-add-without-url	2018-03-28 17:53:42 -07:00
vladest	70ce1b2bf7	Fix invalid scrolling detection	2018-03-28 21:48:44 +02:00
Cristian Luis Duarte	f0bcaa47c8	Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera	2018-03-28 16:47:21 -03:00
Zach Fox	0175028a88	Ensure location is correctly updated when replacing set from Checkout page	2018-03-28 11:31:51 -07:00
vladest	001b6d23ff	Merge branch 'master' into move_to_qqc2	2018-03-28 20:16:26 +02:00
Zach Fox	ca2fba675d	Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation	2018-03-28 10:28:32 -07:00
John Conklin II	586fb4829c	Merge pull request #12637 from druiz17/fix-asset-server-qml ... Fix asset server qml sorting	2018-03-28 09:35:53 -07:00
Seth Alves	46fb2033f2	Merge pull request #12574 from druiz17/remap-keybaord ... changing keyboard mapping	2018-03-27 19:00:05 -07:00
Dante Ruiz	ad9ca0da20	fix tablet version	2018-03-27 16:03:06 -07:00
John Conklin II	a258a330d3	Merge pull request #12676 from druiz17/fix-keyboard ... fixing AddressManager keyboard when switching domains	2018-03-27 15:34:23 -07:00
vladest	096b56395e	Fix crash on startup	2018-03-27 18:22:56 +02:00
Zach Fox	db2f3451bd	Support .content.zip content sets	2018-03-26 16:20:29 -07:00
Zach Fox	bf48ecda6d	Fix cert location for content sets	2018-03-26 14:48:05 -07:00