81698 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
sabrina-shanman	a4c10e2903	Attempt fix for Android build	2019-11-01 10:39:43 -07:00
Sabrina Shanman	05ac16536e	Merge pull request #16436 from highfidelity/master ... Merge master into instancing	2019-10-31 17:39:15 -07:00
Sam Gateau	ad0fce9c3b	Merge pull request #16431 from sabrina-shanman/instancing_slimmesh ... (DEV-564) Introduce and populate geometry-only mesh representation from hfm::Mesh	2019-10-31 15:08:52 -07:00
sabrina-shanman	6666df6137	Fix build warnings/errors	2019-10-31 14:49:28 -07:00
sabrina-shanman	297ce9d88b	Remove debug	2019-10-31 13:47:00 -07:00
sabrina-shanman	023d73a25d	Finish TriangleListMesh generation, rename some things	2019-10-31 13:47:00 -07:00
sabrina-shanman	7d37a064f2	Fix crash	2019-10-31 13:46:53 -07:00
Sam Gateau	e9ce467eb9	Crahs because of ?	2019-10-31 13:04:11 -07:00
Sam Gateau	465e8c3e18	Prototyping the slim mesh generation	2019-10-31 12:58:15 -07:00
Sam Gateau	24e6a966a8	Keep exploring	2019-10-31 12:58:08 -07:00
Sam Gateau	927e08acdb	Explore the simple mesh pure pos triangle list idea	2019-10-31 12:57:29 -07:00
Anthony Thibault	f99bb3ec77	Merge pull request #16400 from hyperlogic/feature/arkit-blendshapes ... Extended avatar blendshape support for ARKit compatiblity	2019-10-31 12:33:50 -07:00
Zach Fox	a03534427e	Merge pull request #16430 from zfox23/moreMenuScriptingInterfaceGuards ... Attempt to fix DEV-2615 and DEV-2618 with more menu scripting interface guards	2019-10-31 12:25:41 -07:00
Zach Fox	68819addd5	Attempt to fix DEV-2615 and DEV-2618 with more menu scripting interface guards	2019-10-31 11:29:46 -07:00
Maia Hansen	de5570ced8	Merge pull request #16421 from amerhifi/dev-2571new ... case DEV-2771: Audio client shutdown lock	2019-10-31 09:50:56 -07:00
amerhifi	52e0f54d0c	addressing comments	2019-10-31 07:21:16 -07:00
amer cerkic	4b4b722875	fixed issues related to context switching and selection with hmd	2019-10-30 16:27:19 -07:00
Sabrina Shanman	503973ae7c	Merge pull request #16417 from sabrina-shanman/instancing_serializers_conservative ... (DEV-559) Instancing: FBX and OBJ fixes	2019-10-30 14:58:43 -07:00
sabrina-shanman	4ecd25c8bb	Add TODO for joint.geometricOffset	2019-10-30 14:32:36 -07:00
sabrina-shanman	ecdca05679	Do not apply geometric offset to loaded FBX. Proper fix TBD	2019-10-30 14:28:55 -07:00
sabrina-shanman	9b41fa20c6	Clean up hfm joint geometric offset definition	2019-10-30 14:08:02 -07:00
Shannon Romano	faa192a337	Merge pull request #16338 from ctrlaltdavid/DOC-126 ... DOC-126: Toolbars JSDoc	2019-10-30 13:46:16 -07:00
Shannon Romano	161de1478b	Merge pull request #16335 from ctrlaltdavid/DOC-191 ... DOC-191: Recording JSDoc	2019-10-30 13:46:04 -07:00
Shannon Romano	8d6434fbca	Merge pull request #16367 from ctrlaltdavid/DOC-199 ... DOC-199: AudioScope JSDoc	2019-10-30 13:45:13 -07:00
sabrina-shanman	0d1bd6afbf	Fix wrong transformForCluster for non-root joints with Z up axis	2019-10-30 13:32:30 -07:00
sabrina-shanman	296cd4a47b	Rename globalTransformForCluster(s) -> transformForCluster(s)	2019-10-30 12:05:50 -07:00
sabrina-shanman	c8bf1ddfea	Only recalculate globalTransformForCluster if needed	2019-10-30 12:01:25 -07:00
sabrina-shanman	61825f2e06	Remove joint.transform self-assignment	2019-10-30 11:50:10 -07:00
sabrina-shanman	ff908a36d6	Define separately globalTransformForCluster and localTransformForCluster for clarity	2019-10-30 11:49:28 -07:00
amer cerkic	39e1092660	working on hmd fix	2019-10-30 11:34:41 -07:00
Zach Fox	80b93bd43b	Merge pull request #16426 from danteruiz/update-launcher-text ... Dev-2602: Update Text on new QT Launcher	2019-10-30 10:47:47 -07:00
dante ruiz	d48097ce2c	Make requested changes	2019-10-30 10:41:17 -07:00
Shannon Romano	9948a181dc	Merge pull request #16392 from kitely/load-avatar-entities-after-skeleton ... In Bookmarks, attach avatar entities after the skeleton is loaded	2019-10-30 09:29:51 -07:00
dante ruiz	1a42ad0736	update launcher text	2019-10-30 09:27:37 -07:00
sabrina-shanman	6f5c9924c0	Merge branch 'instancing' into instancing_serializers_conservative	2019-10-30 09:17:09 -07:00
Sabrina Shanman	e8b963b59a	Merge pull request #16425 from highfidelity/master ... Merge master into instancing	2019-10-30 09:16:04 -07:00
Shannon Romano	2b25dd30d2	Merge pull request #16424 from RebeccaStankus/consoleText ... Specified color on text edit for console	2019-10-30 09:15:27 -07:00
sabrina-shanman	fe1fe6aa83	Fix build warnings	2019-10-30 09:09:17 -07:00
Oren Hurvitz	7953e3889f	Wait for the avatar skeleton to finish loading before adding the avatar entities	2019-10-30 12:12:26 +02:00
sabrina-shanman	3c078eeef6	It makes more sense for joint.globalTransform to have the hfmModel.offset applied	2019-10-29 17:37:26 -07:00
sabrina-shanman	28e3fd4bc4	Refactor joint transform definition	2019-10-29 17:37:25 -07:00
Shannon Romano	4d001a1040	Merge pull request #16122 from danteruiz/qt-launcher ... Qt launcher	2019-10-29 17:05:37 -07:00
sabrina-shanman	27b30a9646	Move hfm debug dump to hfm::Model	2019-10-29 16:49:55 -07:00
Rebecca Stankus	9c0003515a	Specified color on text edit for console	2019-10-29 15:46:16 -07:00
amerhifi	ddfbb55e19	fixed old ui filtering of audio devices	2019-10-29 15:36:43 -07:00
dante ruiz	d752d95a8d	Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher	2019-10-29 15:22:06 -07:00
dante ruiz	5d69d554f9	fix mac update issues	2019-10-29 15:21:54 -07:00
danteruiz	f9446e8247	Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher	2019-10-29 13:45:38 -07:00
danteruiz	3f110d2035	fix windows install process	2019-10-29 13:45:28 -07:00
Shannon Romano	8fc135d972	Merge pull request #16423 from hyperlogic/bug-fix/third-person-look-at-fix-2 ... DEV-2302: Fix for head not turning in third person look at camera mode	2019-10-29 13:41:13 -07:00