61959 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Rowe	58fa8b9fbf	Miscellaneous fixes	2017-12-12 10:49:05 +13:00
David Rowe	0146eca315	JSDoc review	2017-12-07 10:09:05 +13:00
David Rowe	cd2922a560	Merge branch '21602' into 21624 ... # Conflicts: # tools/jsdoc/plugins/hifi.js	2017-11-28 17:04:59 +13:00
David Rowe	97b4dcaa5c	Web3DOverlay's resolution property is deprecated	2017-11-28 16:31:13 +13:00
David Rowe	a6937d7c8b	Add Overlays API examples JSDoc	2017-11-28 16:30:25 +13:00
David Rowe	92493f14d7	Miscellaneous JSDoc fixes	2017-11-28 16:30:09 +13:00
David Rowe	425e2eb82c	Add missing parameter to Camera.newMode() JSDoc	2017-11-25 18:24:58 +13:00
David Rowe	16dd9e0063	Move Camera mode JSDoc to be a typedef	2017-11-25 18:24:38 +13:00
David Rowe	9983e1fd1c	Polish Paths JSDoc	2017-11-25 18:06:27 +13:00
David Rowe	167bc21784	Fix up PickRay and StylusTip JSDoc	2017-11-25 17:23:53 +13:00
David Rowe	de49fefc61	Merge branch 'master' into 21602 ... # Conflicts: # libraries/shared/src/RegisteredMetaTypes.h	2017-11-25 17:06:36 +13:00
David Rowe	73f5841c9f	Add PointerEvent and KeyboardModifiers API types JSDoc	2017-11-25 16:18:57 +13:00
David Rowe	06012d9dfc	Add Color and Rect API types JSDoc	2017-11-25 16:18:40 +13:00
David Rowe	4b5aa9bdec	Add Overlays API functionality JSDoc	2017-11-25 16:18:14 +13:00
David Rowe	91671722a5	Add Shape API types JSDoc	2017-11-25 16:09:54 +13:00
Seth Alves	56e299c205	Merge pull request #11875 from samcake/orange ... Fix the spot light direction	2017-11-23 11:11:31 -08:00
Sam Gateau	9a31a3dc95	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-22 23:29:55 -08:00
Sam Gateau	9c53ab719a	Merge branch 'orange' of https://github.com/samcake/hifi into orange	2017-11-22 23:29:25 -08:00
Clément Brisset	e20555bf38	Merge pull request #11870 from Atlante45/feat/update-default-perms ... Add tmpRezCertified to default perms	2017-11-22 14:57:22 -08:00
Atlante45	b398e235a2	Add tmpRezCertified to default perms	2017-11-22 13:40:44 -08:00
Zach Fox	fada02a76c	Merge pull request #11864 from zfox23/commerce_newHelpText ... New Help questions/answers/link	2017-11-22 12:53:16 -05:00
Sam Gateau	8389137caa	Merge pull request #11834 from highfidelity/pointers ... UI Pointer Optimization	2017-11-21 16:01:52 -08:00
Zach Fox	d2ebfbf064	New Help questions/answers/link	2017-11-21 18:55:48 -05:00
Brad Hefta-Gaub	c66a500fcf	Merge pull request #11861 from druiz17/fix-modal ... Fix replace content dialog not closing	2017-11-21 15:43:20 -08:00
samcake	a0e40efdc8	Fixing all the changes of interface name coming from upstream	2017-11-21 14:55:58 -08:00
Dante Ruiz	767b0fa4af	remove unused variable warning	2017-11-21 14:45:55 -08:00
samcake	ebd701a1ab	Merging with master	2017-11-21 14:40:37 -08:00
samcake	84ff40c717	Merging with master	2017-11-21 14:12:47 -08:00
Dante Ruiz	c9ad7b1db5	Merge branch 'master' of github.com:highfidelity/hifi into fix-modal	2017-11-21 13:56:22 -08:00
Dante Ruiz	88c3adbff1	change askToReplaceDomainContent to use async question and warning	2017-11-21 13:56:11 -08:00
Brad Hefta-Gaub	817afcd083	Merge pull request #11741 from ZappoMan/entityItemCleanup ... Entity item cleanup	2017-11-21 12:24:46 -08:00
Brad Hefta-Gaub	5914f27027	Merge pull request #11706 from luiscuenca/webAudioDev_fresh ... QML & Web generated audio now follow the client audio device selection	2017-11-21 11:29:48 -08:00
ZappoMan	3a967ca895	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-21 10:53:29 -08:00
Brad Hefta-Gaub	0945c1c50b	Merge pull request #11851 from Atlante45/feat/wizard ... Reworked wizard congratulation page.	2017-11-21 09:15:59 -08:00
Brad Hefta-Gaub	4d1e90dfca	Merge pull request #11821 from dback2/mirrorfanciness3 ... Mirror projection for Secondary Camera	2017-11-21 07:59:07 -08:00
Brad Hefta-Gaub	5dadec0b93	Merge pull request #11845 from thoys/feat/parentJointName ... Import JSON parentJointName value	2017-11-21 07:58:13 -08:00
ZappoMan	b44ced4c21	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-20 17:19:18 -08:00
Thijs Wenker	627fee80ec	added support for exporting parentJointName	2017-11-21 01:49:56 +01:00
Howard Stearns	89425ca210	Merge pull request #11854 from howard-stearns/consolidated-blockchain-history-log ... consolidated blockchain history log	2017-11-20 16:19:27 -08:00
Howard Stearns	4018b99118	Merge pull request #11848 from zfox23/commerce_flipTheSwitch ... Turn Commerce on by default!	2017-11-20 16:18:53 -08:00
Elisa Lupin-Jimenez	3211aa7d13	Merge pull request #11849 from elisa-lj11/blocks ... Zip file structures replicated in asset server	2017-11-20 16:13:51 -08:00
Brad Hefta-Gaub	50ff782ab5	Merge pull request #11829 from sethalves/av-ent-misc-fixes ... misc avatar-entity fixes	2017-11-20 16:05:39 -08:00
Bradley Austin Davis	7a5dc9e00b	remove test code disabling the script cache	2017-11-20 15:57:44 -08:00
Clément Brisset	381fbe833d	Merge pull request #11855 from highfidelity/stable ... Merge stable back into master	2017-11-20 15:40:14 -08:00
Elisa Lupin-Jimenez	fb6287503e	hopefully fixed build error resulting from escape sequence	2017-11-20 15:12:11 -08:00
Thijs Wenker	c3754d6369	smart pointer	2017-11-20 23:24:03 +01:00
Elisa Lupin-Jimenez	ecd45534dd	merge conflict	2017-11-20 14:04:29 -08:00
Elisa Lupin-Jimenez	a54f4eca93	simplified naming of zip folders	2017-11-20 14:02:46 -08:00
David Rowe	8e647fb32c	Disable unused Overlays.panelDeleted signal ... #if'd out to match the other panel code that is disabled.	2017-11-21 11:00:36 +13:00
Ryan Downe Karpf	f7c27966a9	Merge pull request #11801 from highfidelity/RC59 ... Beta Release 59 - Includes up to Developer Release 7426	2017-11-20 13:25:27 -08:00