876 commits

Author	SHA1	Message	Date
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
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
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
David Rowe	3af7701cac	Fix the spectator camera	2018-02-04 12:06:20 +13:00
Liv	6363ded74b	Merge pull request #12280 from misslivirose/feat/expose-identity-verification ... Expose functionality to enable entity scripts to check ownership verification on avatar entities	2018-02-01 10:07:58 -08:00
Seth Alves	50e6864988	Merge pull request #12138 from Triplelexx/21669_prompt_keyboard ... WL#21669: Allow better keyboard navigation of prompt windows such as Window.prompt()	2018-01-31 11:19:49 -08:00
Liv Erickson	8b7c989508	move emit signals to wallet interface	2018-01-29 16:34:44 -08:00
Liv Erickson	f8f76d6757	changing back to avatar only and making some changes to avoid multiple calls to dependency manager	2018-01-29 12:46:00 -08:00
MiladNazeri	9baf02b7a1	Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request ... Leopoly_Phase1_003_Asset-Request	2018-01-29 11:40:41 -08:00
Liv Erickson	6a971e1362	remove restriction to be avatar only	2018-01-29 11:27:30 -08:00
Liv Erickson	0e3a01f1e8	it's working! removed my null pointer and just get it from the dependency manager when required	2018-01-29 10:20:16 -08:00
Liv Erickson	20635acf27	moving logic to wallet, crashes currently	2018-01-26 17:13:39 -08:00
Brad Davis	d53b8b38ac	Merge remote-tracking branch 'upstream/master' into android	2018-01-19 14:35:20 -08:00
Ryan Downe Karpf	f1b18ccc00	Merge pull request #12184 from ctrlaltdavid/21700 ... Add Window browseChanged signal as replacement for openFileChanged	2018-01-19 10:45:27 -08:00
humbletim	dfb1619dc6	CR feedback; using namespace AssetUtils => inline AssetUtils::	2018-01-18 21:49:53 -05:00
Brad Davis	bdfa1273ba	Merge remote-tracking branch 'upstream/master' into android	2018-01-18 17:33:10 -08:00
Clément Brisset	37504eca15	Merge pull request #12186 from ctrlaltdavid/21702 ... Add Window.protocolSignature() as a replacement for location.protocolVersion()	2018-01-18 15:20:03 -08:00
David Rowe	8c2427dd58	Rename Window.protocolVersion() to Window.protocolSignature()	2018-01-19 09:06:16 +13:00
Brad Davis	cbb2d9d854	Merge remote-tracking branch 'upstream/master' into android	2018-01-17 17:51:39 -08:00
Seth Alves	7af90d5429	Merge pull request #12171 from mnafees/21671 ... CR for Job #21671 - Window.copyToClipboard() doesn't work in .js files	2018-01-17 13:42:47 -08:00
Bradley Austin Davis	9f6c2c3cdd	Merge remote-tracking branch 'upstream/master' into android	2018-01-17 11:44:00 -08:00
David Back	92c0fd4877	Merge pull request #12116 from dback2/deleteAccount_renameGS_addAS ... Merge Account & GlobalServices follow-up	2018-01-17 10:50:54 -08:00
Brad Davis	6a06bf405a	Merge remote-tracking branch 'upstream/master' into android	2018-01-16 18:24:44 -08:00
David Rowe	2883e24285	Add Window.protocolVersion() as a replacement for location's	2018-01-17 12:00:35 +13:00
David Rowe	85bda1da8e	Add Window browseChanged signal as replacement for openFileChanged	2018-01-17 09:57:20 +13:00
Mohammed Nafees	885801c5ca	Fix copying to clipboard from JS scripts	2018-01-16 13:17:47 -05:00
Brad Davis	58530c595a	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
David Rowe	a543d90090	Miscellaneous fixes	2018-01-11 15:53:45 +13:00
David Rowe	7ba42f0e76	Update JSDoc per recent changes in Window API	2018-01-11 15:52:56 +13:00
Brad Davis	560fd38547	Merge remote-tracking branch 'upstream/master' into android	2018-01-10 17:31:50 -08:00
MiladNazeri	301731554f	Merge pull request #12102 from cain-kilgore/21664 ... WL 21664 - Window.innerHeight should not include the menu bar	2018-01-10 17:10:14 -08:00
Triplelexx	24f1fc3546	fix Ui keyboard navigation ... various fixes to allow some support for keyboard navigation in message boxes and dialogs	2018-01-10 22:30:43 +00:00
Brad Davis	2c35242af1	Merge remote-tracking branch 'upstream/master' into android_nov	2018-01-10 13:40:12 -08:00
MiladNazeri	b73106fa7e	Merge pull request #12120 from cain-kilgore/21666 ... WL 21666 - Window.domainChanged() isn't emitted if domain isn't running	2018-01-10 12:30:21 -08:00
Cain Kilgore	b26e31a362	Copy paste? Never!	2018-01-10 20:27:19 +00:00
Brad Davis	d6dd29b952	Merge remote-tracking branch 'upstream/master' into android_nov	2018-01-09 11:43:03 -08:00
Brad Davis	bd5af2b493	Working on android avatar rendering	2018-01-09 11:40:32 -08:00
Cain Kilgore	0e3913baff	Removed Window.menuHeight	2018-01-09 09:07:26 +00:00
Cain Kilgore	773461bd30	Merge branch 'master' of https://github.com/highfidelity/hifi into 21666	2018-01-09 08:33:44 +00:00
Cain Kilgore	46de7ed83b	WL 21666 - Window.domainChanged() isn't emitted if domain isn't running	2018-01-09 08:32:59 +00:00
David Back	43cd5586f3	nuke AccountScriptingInterface, rename GlobalServicesScriptingInterface to AccountServicesScriptingInterface	2018-01-08 17:25:58 -08:00
David Rowe	8016ae1bf3	Fix typo	2018-01-09 12:47:12 +13:00