Commit graph

1559 commits

Author SHA1 Message Date
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
danteruiz
850dcb839d adding build qt-lite build rules 2019-10-23 14:39:34 -07: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
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