Commit graph

1645 commits

Author SHA1 Message Date
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
Brad Davis
cc1be64850 Fixing build issues 2019-10-04 09:20:02 -07:00
Brad Davis
3c6e98f16b New format for captured GPU frames 2019-10-04 08:34:06 -07:00
danteruiz
97644eb335 Merge branch 'master' of github.com:highfidelity/hifi into qt-launcher 2019-10-02 16:44:00 -07:00
Sam Gateau
1d19671e88 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-01 11:27:16 -07:00
Shannon Romano
e8f1eecc5b
Merge pull request #16258 from samcake/yellow
DEV-1815: Investigating rendering issues with opacity map and adding tools to debug resource caches
2019-09-30 16:36:24 -07:00
Shannon Romano
3d813b525e
Merge pull request #16230 from MattHardcastle/add-notarize-script
[INFRA-196] Add mac notarization script
2019-09-30 11:56:40 -07:00
Sam Gateau
9b8d159873 remove unused variable 2019-09-30 09:24:37 -07:00
Sam Gateau
ecd940e0e6 Addressing warnings 2019-09-27 14:01:00 -07:00
Sam Gateau
9d999baab2 FIrst pass to clean up before pushing a pr: 2019-09-26 11:59:01 -07:00
Sam Gateau
ba11c3e702 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-25 17:54:21 -07:00
Clement
96b58756b1 Add flag for account settings feature 2019-09-24 16:50:10 -07:00
Matt Hardcastle
f0f9fa0a80 [INFRA-196] Add mac notarization script
The `notarize` script signs and submits a bundle to Apple's notarization
service. This command is meant for use as the part of release process
and its us is documented on the internal wiki.

    https://highfidelity.atlassian.net/wiki/spaces/hifiOps/pages/532710623/Sign+and+notarize+a+build+on+macOS

Jira: https://highfidelity.atlassian.net/browse/INFRA-196
2019-09-20 15:00:38 -07:00
David Rowe
c2e5748452 Move classes' details above constructor 2019-09-20 10:16:43 +12:00
David Rowe
d02a111e69 Increase font sizes of Parameters and Example headings and example code 2019-09-20 09:18:44 +12:00
David Rowe
77fcda90c8 Remove Description section from Global page 2019-09-20 08:50:06 +12:00
David Rowe
78b7c04457 Fix white space in generated API docs 2019-09-20 08:09:51 +12:00
David Rowe
43a0ed48fd Fix JSDoc template HTML issues 2019-09-17 16:25:34 +12:00
Sam Gateau
18226e64f8 Add a read lock where we think it s needed and banging my head on the problem 2019-09-16 18:06:43 -07:00
sabrina-shanman
76b1f551b1 Merge branch 'master' into instancing 2019-09-16 10:17:59 -07:00
sabrina-shanman
5837053f50 Fix miscellaneous build errors/warnings 2019-09-13 16:56:30 -07:00
Sam Gateau
802326d4da Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-12 17:01:37 -07:00
Shannon Romano
6a78ea1471
Merge pull request #16139 from jennaingersoll/api-docs
API docs formatting updates
2019-09-12 13:09:28 -07:00
Sam Gateau
133a8b7d5e a bunch of changes to debug why... 2019-09-11 18:21:44 -07:00
jennaingersoll
d548afb277
Removed indent per review 2019-09-11 17:06:35 -07:00
sabrina-shanman
01b29c3aac Fix DomainBaker not finishing when Re-bake originals checked and
.baked.fbx present
2019-09-09 10:43:08 -07:00
ingerjm0
2322a9ea7f Making sure ctrlaltdavid's changes made it into my repository 2019-09-05 13:58:59 -07:00
ingerjm0
55bdc7d2a6 Made sure ctrlaltdavid's changes made it into my repo 2019-09-05 13:54:55 -07:00
ingerjm0
b8b7dbf681 DOC-148: Increase size of monospace type 2019-09-05 13:39:06 -07:00
ingerjm0
d8c655a151 Fixed spacing issues in navigation caused by fix to to DOC-156 2019-09-05 11:42:34 -07:00
ingerjm0
af7e68786a DOC-156 (comment): Fixed spacing on non-paragraph text 2019-09-05 11:29:13 -07:00
ingerjm0
9bf579d878 DOC-156: Fix font size issues on non-paragraph text 2019-09-05 11:08:25 -07:00
ingerjm0
5ebf141d73 DOC-67: Incorrect location of example code for Avatar API 2019-09-05 10:39:18 -07:00
ingerjm0
2502abe963 Merge branch 'master' of https://github.com/highfidelity/hifi into api-docs 2019-09-05 10:17:38 -07:00
ingerjm0
5aef2d674a DOC-69: Move Supported Script Types section to top of JSDoc pages 2019-09-05 10:12:59 -07:00
HifiExperiments
97b9179144 merge with master 2019-09-05 00:46:56 -07:00
dante ruiz
4c5de120b7 enable post build script for qt launcher 2019-09-04 09:13:22 -07:00
jennaingersoll
037ad36262
Merge pull request #16103 from ctrlaltdavid/DOC-64
DOC-64: ScriptDiscoveryService API JSDoc
2019-08-30 22:35:39 -07:00
Andrew Meadows
43cd543226
Merge pull request #16084 from sabrina-shanman/test-profile
(DEV-359) Per-profile test reference images (C++ component)
2019-08-26 16:36:01 -07:00
sabrina-shanman
e0b4734917 Add missing bullet point when test.md step has image with unknown test filter 2019-08-26 14:37:37 -07:00
sabrina-shanman
ad1a98b85a Trim else after return 2019-08-26 14:30:47 -07:00
sabrina-shanman
388a70502e Fix indexing typo in joinVector 2019-08-26 14:28:04 -07:00
David Rowe
233a1528df Add support for examples in API description section 2019-08-27 09:24:01 +12:00
sabrina-shanman
bc2cc11c06 Fix build warnings 2019-08-26 12:35:18 -07:00
sabrina-shanman
e4369feec5 Factor out directory parsing from md file output 2019-08-26 11:33:03 -07:00
sabrina-shanman
1ae66c6c10 Show expected images side-by-side rather than creating one MD file per
image set
2019-08-26 10:57:57 -07:00
sabrina-shanman
5e3777999d Revert unfinished alternative implementation 2019-08-26 10:57:49 -07:00
sabrina-shanman
acd07e904f Output profile-specific md files corresponding to profile images 2019-08-26 10:57:24 -07:00
ingerjm0
7ffcee35dd Fix formatting in API docs (DOC-112, DOC-113, DOC-142, DOC-143) 2019-08-22 15:37:34 -07:00
sabrina-shanman
2dbf3de58a Allow more image names to be used as Nitpick test reference images 2019-08-21 14:17:43 -07:00
David Rowe
11f8387a5a Fix typo noticed in passing 2019-08-17 16:56:35 +12:00
David Rowe
dbb964d415 Report type of callback as "function" in JSDoc 2019-08-17 16:56:01 +12:00
David Rowe
ed6407d2bd Fix callback functions' display in JSDoc 2019-08-16 21:07:34 +12:00
Clement
be534f2127 Add --version to the Oven 2019-08-09 17:11:07 -07:00
Shannon Romano
0b71cac84b
Merge pull request #16043 from sethalves/fix-linux-build-shared-nitpick
BUGZ-1205: fix Linux builds when -DBUILD_SHARED_LIBS=ON
2019-08-09 13:15:47 -07:00