922 commits

Author	SHA1	Message	Date
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	586fb4829c	Merge pull request #12637 from druiz17/fix-asset-server-qml ... Fix asset server qml sorting	2018-03-28 09:35:53 -07:00
David Rowe	d1d58eceab	Add Window.raise() as replacement for Window.raiseMainWindow()	2018-03-27 13:04:50 +13: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
Seth Alves	4033af9b11	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-21 11:11:43 -07:00
Dante Ruiz	2fb1fbe027	fix sorting	2018-03-14 09:17:22 -07:00
David Rowe	966d711e56	Fix Window.raiseMainWindow()	2018-03-14 13:38:48 +13:00
David Rowe	025d2807f4	Fix Window.setFocus() JSDoc	2018-03-14 12:59:27 +13:00
David Rowe	16aefea2e1	Merge branch 'master' into 21776	2018-03-13 14:46:07 +13:00
Seth Alves	621e6a62d6	merge from upstream	2018-03-09 12:07:24 -08:00
Seth Alves	58bc42990c	merge from upstream	2018-03-09 12:03:26 -08:00
Brad Hefta-Gaub	5437ffb2c8	Merge pull request #12536 from ctrlaltdavid/21700 ... Remove deprecated Window.openFileChanged() signal from API	2018-03-09 08:47:57 -08:00
David Rowe	b1bda281ee	Merge branch 'master' into 21776	2018-03-08 15:36:10 +13:00
Cristian Luis Duarte	bde2ba9272	Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed	2018-03-06 22:02:23 -03:00
Brad Davis	8bfc610cfb	Merge remote-tracking branch 'upstream/master' into android	2018-03-05 11:48:58 -08:00
vladest	126f05f8bd	Added space	2018-03-04 13:28:26 +01:00
vladest	2a9bbfa808	Wrap text in query dialogs. Add right margins for input field and buttons	2018-03-04 13:19:56 +01:00
Seth Alves	45157a16f2	merge from upstream	2018-03-02 09:57:27 -08:00
David Rowe	287ea8eff2	Fix Window.setFocus() unsetting focus if Interface has focus	2018-03-02 15:40:49 +13:00
David Rowe	b50044fb2b	Remove deprecated Window.openFileChanged() signal from API	2018-03-02 13:15:27 +13:00
Seth Alves	33065fb51c	more consistent variable names. rework DomainManager and AddressManager methods to take a url rather than host and port	2018-03-01 11:07:37 -08:00
Cristian Luis Duarte	9acb83632c	Android - Make joystick move up when showing the bottom bar	2018-02-28 18:52:13 -03:00
Cristian Luis Duarte	55d52f92df	Android - Make Joystick appear always when possible (not in radar mode and when not hidden by some windows)	2018-02-28 15:55:50 -03:00
Seth Alves	666fa77be2	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-02-26 13:53:20 -08:00
Brad Davis	b9387f2a21	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-26 13:18:14 -08:00
Brad Davis	3e552e5739	Fix warnings	2018-02-26 09:53:35 -08:00
NissimHadar	c0f20900a0	Merge pull request #12458 from NissimHadar/snapshotDefaultNameFix ... Corrected edge case of creating a snapshot with "" as the filename.	2018-02-26 09:39:16 -08:00
Brad Davis	0550138609	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-23 12:48:10 -08:00
Seth Alves	99893d81e2	merge from upstream	2018-02-23 09:14:48 -08:00
Brad Davis	aeb29db37d	Merge remote-tracking branch 'upstream/stable' into android_stable	2018-02-22 17:35:00 -08:00
Nissim Hadar	a843a53427	Improved JSDoc comments.	2018-02-22 10:17:20 -08:00
Zach Fox	90f05f4db7	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-22 09:23:49 -08:00
Seth Alves	c83dcbc626	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-02-22 07:42:49 -08:00
Seth Alves	db195c6184	Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items ... Remove some deprecated JavaScript API items	2018-02-21 16:31:16 -08:00
Nissim Hadar	049beba157	Corrected edge case of creating a snapshot with "" as the filename.	2018-02-21 14:15:41 -08:00
Zach Fox	2daa30f125	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-20 12:41:12 -08:00
Seth Alves	afa059d331	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-02-16 12:58:56 -08:00
Seth Alves	b2a4181bc0	working to integrate serverless domains into history, etc	2018-02-16 12:58:50 -08:00
MiladNazeri	331b253ba0	Merge pull request #12386 from cain-kilgore/21668 ... WL 21668 - Make sure all Prompts are correctly emitting a signal on cancel and that cancellations return null	2018-02-16 06:57:03 -08:00
Zach Fox	ae8a8a48eb	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-13 13:55:32 -08:00
Zach Fox	0809210dc3	No permission card	2018-02-13 11:16:48 -08:00
Sam Gateau	714e3f445d	Merge pull request #11537 from jherico/threaded_qml ... Migrating QML rendering off the main thread	2018-02-12 15:32:33 -08:00
Cain Kilgore	d1ecc85fb3	Merge branch 'master' of https://github.com/highfidelity/hifi into 21668	2018-02-12 23:19:20 +00:00
Cain Kilgore	5048bf16cb	Fixed Async Prompts/Assets/Dialogs	2018-02-12 23:01:19 +00:00
David Rowe	033b85a3a8	Merge branch 'master' into remove-deprecated-items ... # Conflicts: # scripts/system/libraries/entitySelectionTool.js	2018-02-13 09:42:40 +13:00
NissimHadar	5579eac034	Nothing...	2018-02-06 16:42:25 -08:00
NissimHadar	d5bf9cdbcd	Updated JSDoc comments.	2018-02-06 16:16:25 -08:00
Brad Davis	7d5502eb92	Migrating QML rendering off the main thread	2018-02-06 11:53:09 -08:00
NissimHadar	faec9a62b6	Changed "" to QString()	2018-02-06 11:01:50 -08:00
NissimHadar	cf87052b7f	Added option to select snapshot filename in scripts.	2018-02-05 17:29:00 -08:00