62054 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
MiladNazeri	83d13717fe	Merge pull request #11752 from Menithal/21539 ... 21539: Add "None" option in Head Tracking section when "Use Vive in Desktop Mode" is selected	2017-11-27 16:02:01 -08:00
Brad Hefta-Gaub	6d6ac0a5a9	Merge pull request #11873 from sethalves/fix-wearable-domain-change-crash ... avoid a crash during domain change while wearing something	2017-11-27 13:01:48 -08:00
Alexander Ivash	02684e3fed	remove not used files	2017-11-27 22:49:11 +03:00
Alexander Ivash	da06b2656f	7991 Change Instances of Edit Mode to Create Mode	2017-11-27 22:47:42 +03:00
howard-stearns	1575119327	PR feedback	2017-11-27 10:46:57 -08:00
howard-stearns	2e919682a0	Merge branch 'master' of https://github.com/highfidelity/hifi into MandatoryMania-ECWallet	2017-11-27 10:02:53 -08:00
Brad Hefta-Gaub	068b93fc30	Merge pull request #11838 from druiz17/fix-grabbing ... fixing setting incorrect parent when grabbing entities	2017-11-27 08:27:42 -08:00
Menithal	693da50a68	21539: Fixed None Checkmark being on Desktop mode	2017-11-27 07:59:04 +02:00
Menithal	5d52b9936b	21539: Updated Logic to match request	2017-11-27 07:42:18 +02:00
Menithal	ba1cd74ffe	21539: Moved Desktop HMD to None	2017-11-26 21:58:16 +02:00
vladest	6136a4cea6	Rounded background	2017-11-25 10:03:56 +01:00
vladest	73a557a8a4	Added Scroll Bar for Trees. Fixed some anchoring issues. Fixed headerless views	2017-11-24 15:58:27 +01:00
vladest	bc33730c4e	Merge branch 'master' into fix_tablet_scrollbars	2017-11-24 15:30:30 +01:00
vladest	b69b580a68	Use ScrollBar from QQC2 which is supports both mouse and touch events	2017-11-23 23:08:43 +01:00
Seth Alves	56e299c205	Merge pull request #11875 from samcake/orange ... Fix the spot light direction	2017-11-23 11:11:31 -08:00
vladest	c03772d345	Merge branch 'master' into fix_tablet_scrollbars	2017-11-23 15:07:50 +01:00
vladest	22d57f1103	Fix click events from mouse	2017-11-23 14:56:15 +01: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
howard-stearns	a6b437a79f	get rid of "error" warning because the key wasn't broken into 64 char ... lines	2017-11-22 16:55:57 -08:00
Seth Alves	9ccc416e80	avoid a crash during domain change	2017-11-22 16:34:56 -08:00
howard-stearns	abf41300dd	refactor	2017-11-22 16:29:56 -08:00
howard-stearns	899999a4c6	fix up dynamic ownership challenge	2017-11-22 15:58:30 -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
vladest	094cc0e251	Merge conflict	2017-11-22 20:50:15 +01:00
David Back	1aeadcbc64	prevent spectator cam from updating secondary cam aspect ratio when its in use by mirrors	2017-11-22 11:38:52 -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
David Rowe	3535071178	Add "size" as synonym for "dimensions" in model overlay property setter	2017-11-22 21:04:04 +13:00
howard-stearns	16d6d8a361	Merge branch 'master' of https://github.com/highfidelity/hifi into MandatoryMania-ECWallet	2017-11-21 16:28:29 -08:00
howard-stearns	ca80c9b764	Merge branch 'ECWallet' of https://github.com/MandatoryMania/hifi into MandatoryMania-ECWallet	2017-11-21 16:28:08 -08: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
Dante Ruiz	56972d1547	Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing	2017-11-21 13:09:45 -08:00
vladest	a56e4e10c3	Remove unused variables	2017-11-21 21:44:04 +01: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
vladest	0ea5a7635c	Added mouse press and release events to be sent along with touch events to Tablet	2017-11-21 16:32:57 +01:00
ZappoMan	b44ced4c21	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-20 17:19:18 -08:00