20373 commits

Author	SHA1	Message	Date
Zach Fox	752246d950	Merge pull request #12760 from zfox23/inspection_rightClickTweaking ... Inspection: Tweak mouse-right-click-to-inspect behavior	2018-04-04 09:32:29 -07:00
Clément Brisset	3d4490f3fd	Merge pull request #12737 from highfidelity/RC66 ... RC66 mergeback	2018-04-03 15:39:16 -07:00
Seth Alves	5f13df4102	Merge pull request #12722 from druiz17/fix-entities-outline ... fix ContextOverlayInferface highlighing unspecified entities.	2018-04-03 12:29:19 -07:00
John Conklin II	53a5261905	Merge pull request #12712 from zfox23/newUpdateCertLocation ... Fix cert location for content sets; handle .content.zip content sets	2018-04-03 09:10:11 -07:00
John Conklin II	9dcef996c5	Merge pull request #12684 from vladest/assetserver_wrong_dialog ... Fix invalid message if cancel adding asset to AssetServer	2018-04-02 15:28:46 -07:00
John Conklin II	74ca98dc81	Merge pull request #12727 from amantley/triggerRecenterBehaviour ... Trigger Avatar Recenter Behaviour	2018-04-02 14:42:21 -07:00
Zach Fox	1f3063193a	Tweak right-click to inspect	2018-04-02 14:24:51 -07:00
John Conklin II	796bd069b2	Merge pull request #12659 from alexiamandeville/script_charcontroller ... Updating char controller	2018-04-02 13:24:15 -07:00
Dante Ruiz	a9a53c7d64	make resquested changes	2018-04-02 10:51:39 -07:00
Dante Ruiz	4b7e2cb331	made requested changes	2018-03-30 15:15:17 -07:00
Dante Ruiz	c99676b510	atlernate fix for selected entities	2018-03-30 13:44:54 -07:00
Ken Cooke	ff6c9f3127	Merge pull request #12704 from ElderOrb/FB13057 ... Improve audio devices selection logic	2018-03-30 11:18:05 -07:00
Zach Fox	32e5e9986f	Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation	2018-03-30 10:10:43 -07:00
Ken Cooke	a2be291363	Merge pull request #12715 from ctrlaltdavid/21677 ... Add Window.raise() as replacement for Window.raiseMainWindow()	2018-03-30 09:41:54 -07:00
John Conklin II	5013760aa1	Merge pull request #12742 from jherico/fix/rc66_crashes ... Fix/rc66 crashes	2018-03-29 18:04:52 -07:00
Seth Alves	dcfebde54a	put back the pre serverless-domain behavior for when a json file is dragged-and-dropped into the interface window -- import the json rather than load as a serverless-domain	2018-03-29 10:50:43 -07:00
amantley	3f44b88d2d	added js documentation for the three trigger recenter functionsthat have been added to MyAvatar class	2018-03-29 10:09:51 -07:00
John Conklin II	97d9c1b735	Merge pull request #12726 from jherico/fix/rc66_crashes ... Attempt to resolve potential overlay crashes at shutdown	2018-03-29 09:37:23 -07:00
amantley	90d87c5b5d	changed get functions to const in MyAvatar.cpp changed bool variables to atomic for thread safety	2018-03-28 14:00:36 -07:00
John Conklin II	790162c88b	Merge pull request #12689 from ctrlaltdavid/21808 ... Reinstate Overlays.getOverlayObject API function	2018-03-28 14:00:28 -07:00
amantley	4b1f974561	fixed merge conflict for declaring _hmdLeanRecenterEnabled in MyAvatar.h	2018-03-28 11:57:48 -07:00
amantley	95f1d0e4fa	added get and set functions for the activate recenter variables	2018-03-28 10:33:00 -07:00
Zach Fox	ca2fba675d	Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation	2018-03-28 10:28:32 -07:00
Brad Hefta-Gaub	16df773de4	Merge pull request #12721 from highfidelity/RC66 ... RC66 - Mergeback	2018-03-28 09:55:46 -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
Brad Davis	aacfe92751	Don't trigger crashes from timers while waiting for some operation on exit	2018-03-28 09:09:56 -07:00
Seth Alves	bb101956a6	fix entity importing	2018-03-27 18:25:43 -07:00
amantley	9f3b82a417	added the functions triggerVerticalRecenter,triggerHorizontalRecenter,and triggerRotationRecenter to MyAvatar.h, these allow java script calls to recenter the avatar on the fly	2018-03-27 18:21:14 -07:00
Dante Ruiz	197662fd5e	fix contextOverlay highlighing all entities	2018-03-27 15:22:22 -07:00
Brad Davis	29106fbbbe	Prevent potential double delete of QML overlays	2018-03-27 14:18:19 -07:00
Brad Davis	eb20181b60	Shut down the overlay interface on exit	2018-03-27 14:18:01 -07:00
David Rowe	d1d58eceab	Add Window.raise() as replacement for Window.raiseMainWindow()	2018-03-27 13:04:50 +13:00
Zach Fox	bf48ecda6d	Fix cert location for content sets	2018-03-26 14:48:05 -07:00
Alexander Ivash	06410ec342	temporarily select 'similar-by-title' device if previously selected one was unlplugged; re-select originally selected device if it was re-plugged	2018-03-27 00:44:17 +03:00
Dante Ruiz	b8796db1e5	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-26 09:13:58 -07:00
Alexander Ivash	8e551f4dc0	re-select re-plugged device	2018-03-25 13:49:59 +03:00
Alexander Ivash	3c45f17d70	remove unused code	2018-03-25 13:44:16 +03:00
Alexander Ivash	f6bbdec902	remove 'isHMD' from input parameters of AudioDeviceList::onDevicesChanged ... note: having 'isHMD' as a parameter doesn't make sense because function rebuilds model which is used by both HMD and Desktop	2018-03-25 13:43:51 +03:00
Dante Ruiz	a14d5c6546	make alternate keys work	2018-03-23 11:55:16 -07:00
John Conklin II	c61ed697df	Merge pull request #12552 from vladest/assetbrowser_cosmetics ... Wrap text in query dialogs. Add right margins for input field and but…	2018-03-22 17:56:47 -07:00
Dante Ruiz	f36a916fb6	revert comment change	2018-03-22 17:44:17 -07:00
Dante Ruiz	4d52caccde	making some more requested changes	2018-03-22 17:39:22 -07:00
Dante Ruiz	1d17658c80	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-22 16:29:16 -07:00
Howard Stearns	113670e33b	Merge pull request #12638 from zfox23/commerce_upgrades_1 ... Commerce: Item Updates!	2018-03-22 15:40:22 -07:00
Seth Alves	6c1d713968	review	2018-03-21 19:21:57 -07:00
Seth Alves	916ed3a0d4	review	2018-03-21 16:18:31 -07:00
Seth Alves	196f621a60	remove unneeded setSessionUUID	2018-03-21 15:21:49 -07:00
Seth Alves	ef52ae13ee	rearrange domain-url-changed signals	2018-03-21 14:30:00 -07:00
Dante Ruiz	9d8770b134	changing speed	2018-03-21 13:25:50 -07:00
Seth Alves	4033af9b11	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-21 11:11:43 -07:00