1599 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	42b69332f7	Merge pull request #16564 from ctrlaltdavid/DOC-239 ... DOC-239: Rates JSDoc	2019-12-13 10:36:39 -08:00
Brad Davis	1ac7215ac8	Fix GA S3 upload path	2019-12-10 12:44:49 -08:00
David Rowe	73ad5d1d31	Fix some JSDoc typos noticed in passing	2019-12-10 13:34:32 +13:00
Simon Walton	82ed358323	Merge remote-tracking branch 'upstream/master' into linux-actions-builds ... Also merge in Linux PR build	2019-12-05 16:19:12 -08:00
Brad Davis	697f445edd	Merge remote-tracking branch 'upstream/master' into ga/master_build	2019-12-04 08:44:12 -08:00
Brad Davis	8844620116	Change s3 key prefix	2019-12-03 12:06:51 -08:00
Brad Davis	f39088fb0b	Github Actions master builds	2019-12-03 10:56:04 -08:00
Simon Walton	c38fe5b2aa	Another dummy statement	2019-12-01 23:25:14 -08:00
Simon Walton	0d52462578	Dummy Dockerfile statement	2019-11-30 00:18:25 -08:00
Simon Walton	c88479610d	Use correct path for hifi.conf; copy DS resources to image	2019-11-27 15:19:22 -08:00
jennaingersoll	c9bdd54b1d	Merge pull request #16541 from ctrlaltdavid/DOC-233 ... DOC-233: MaterialCache JSDoc	2019-11-27 14:56:42 -08:00
Simon Walton	35fe7fe00c	Build from updated base docker image; copy over supervisor hifi.conf	2019-11-27 12:25:18 -08:00
Anthony J. Thibault	764b6a9adf	code review feedback	2019-11-26 10:52:21 -08:00
David Rowe	fafb3dd30b	MaterialCache JSDoc	2019-11-26 17:43:23 +13:00
Simon Walton	30f3525932	Merge branch 'master' into linux-actions-builds	2019-11-22 18:02:48 -08:00
Anthony J. Thibault	320095f765	Added animedit avatar-animation.json graph editor tool	2019-11-22 15:40:44 -08:00
Seth Alves	ea2c6b4dfb	fix linux build	2019-11-22 11:35:23 -08:00
Simon Walton	9e5c0a7afc	Copy quazip lib to build dir; built server-console	2019-11-21 15:02:08 -08:00
Simon Walton	51cf9fab8e	Take out .so copy	2019-11-20 23:51:21 -08:00
Simon Walton	27d3b493fa	Initial Linux GHA build	2019-11-20 16:15:39 -08:00
Maia Hansen	48cdbcf933	Merge pull request #16401 from jherico/github_actions ... DEV-2773: GitHub actions initial work	2019-11-19 11:46:52 -08:00
Brad Davis	d4b3a9ba49	Github actions	2019-11-18 15:20:37 -08:00
sabrina-shanman	f39121c53b	Fix build error/warning	2019-11-12 09:52:58 -08:00
sabrina-shanman	7b14c00540	Merge branch 'master' into instancing	2019-11-05 10:22:24 -08:00
HifiExperiments	bae2ba7bae	merge with master	2019-11-02 01:08:56 -07:00
HifiExperiments	6e5217b80d	fix build error, add environment variable	2019-11-02 01:03:34 -07:00
Sabrina Shanman	05ac16536e	Merge pull request #16436 from highfidelity/master ... Merge master into instancing	2019-10-31 17:39:15 -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
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	e8b963b59a	Merge pull request #16425 from highfidelity/master ... Merge master into instancing	2019-10-30 09:16:04 -07:00
danteruiz	bc207638a5	Merge branch 'master' of github.com:highfidelity/hifi into qt-launcher	2019-10-25 10:15:39 -07:00
danteruiz	58a3cf6e67	finishing qt-lite build info	2019-10-25 10:13:23 -07:00
Sabrina Shanman	e74de214e2	Merge pull request #16404 from highfidelity/master ... Merge master into instancing	2019-10-25 09:55:44 -07:00
HifiExperiments	1e100a672e	merge with master and try to fix opacity mode stuff	2019-10-23 22:21:45 -07:00
Anthony J. Thibault	d43d12dfa7	Merge branch 'master' into feature/arkit-blendshapes	2019-10-23 21:45:10 -07:00
danteruiz	850dcb839d	adding build qt-lite build rules	2019-10-23 14:39:34 -07:00
David Rowe	2591aed686	Exclude AudioScope API from JSDoc output	2019-10-24 09:20:24 +13:00
danteruiz	1d3be46068	Merge branch 'master' of github.com:highfidelity/hifi into qt-launcher	2019-10-23 10:17:46 -07:00
Bradley Austin Davis	6cb1421978	Qt patch for mac video	2019-10-21 16:09:48 -07:00
Sam Gateau	695b9cdba6	Clening up left over comments and typos, simplify the code to update Matrices in the model classes and removed renderITemsIdMap because not needed, chasing the problem of the physics objects transform	2019-10-18 03:31:06 -07:00
Anthony J. Thibault	da0911e01b	Delete legacy blendshape code ... Move FaceshiftConstants to BlendshapeConstants. Delete FaceTracker and DdeFaceTracker classes. Delete old facetracker menu and preferences	2019-10-16 10:36:37 -07:00
dante ruiz	7474f3f721	add qt-lite-mac-config.opt	2019-10-15 16:27:14 -07:00
Sabrina Shanman	63fa9afa13	Merge pull request #16323 from highfidelity/master ... Merge master into instancing	2019-10-09 16:59:54 -07:00
Shannon Romano	a52b8acf4d	Merge pull request #16306 from huffman/feat/hq-launcher-serverless ... DEV-2374: Add serverless content back to launcher builds	2019-10-09 16:15:58 -07:00
Shannon Romano	7aa28f29d2	Merge pull request #16224 from ctrlaltdavid/DOC-111 ... DOC-110, DOC-111, DOC-167: JSDoc fixes and tidying	2019-10-08 10:01:21 -07:00
David Rowe	f224832d27	Merge branch 'master' into DOC-111	2019-10-08 20:44:13 +13:00
Ryan Huffman	bab1a902a5	Add serverless content back to launcher builds	2019-10-07 15:44:57 -07:00
Brad Davis	b2bcf54b5b	Removing frame converter	2019-10-04 19:52:55 -07:00
Brad Davis	243120b95c	Even better frame capture	2019-10-04 14:57:39 -07:00
Brad Davis	88514540d1	Fixing tools build	2019-10-04 09:26:33 -07:00