Commit graph

1260 commits

Author SHA1 Message Date
Thijs Wenker
63c0df9945 temporary de-optimize game objects during the export process 2019-03-08 23:18:56 +01:00
David Back
571e7c1ecc update avatar exporter package 2019-03-08 09:20:19 -08:00
David Back
6fe4307d51 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarExporterDuplicateJointNames 2019-03-08 09:20:02 -08:00
Sam Gateau
11adb83f22
Merge pull request #15106 from NissimHadar/21559-increaseComparisonThreshold
Case 21559: increased threshold to 0.9999
2019-03-08 08:43:30 -08:00
unknown
0e1dbded22 update avatar exporter package 2019-03-07 16:19:50 -08:00
unknown
cbddffd63b Merge branch 'master' of https://github.com/highfidelity/hifi into avatarExporterMaterials 2019-03-07 16:19:20 -08:00
Shannon Romano
29960cfd5c
Merge pull request #15009 from ingerjm0/api-docs
Add custom JSDoc template, add @signal tag
2019-03-07 16:07:50 -08:00
Thijs Wenker
db4a33e24a
Merge pull request #14967 from dback2/avatarExporterRootName
Case 21073: Avatar Exporter v0.3 - use root bone name from skeleton list
2019-03-08 00:58:22 +01:00
Thijs Wenker
174e9d3915
Merge pull request #14940 from dback2/fixAvatarExporterGitIgnore
Case 21273: Avatar Exporter - fix .gitignore to include all unneeded files
2019-03-08 00:48:44 +01:00
NissimHadar
684f9929a9 Improved error message. 2019-03-07 12:22:07 -08:00
NissimHadar
8acec5c9e9 Increased threshold to 0.9999 2019-03-07 12:21:40 -08:00
NissimHadar
53d682d40e Merge branch 'master' of github.com:highfidelity/hifi into 21559-increaseComparisonThreshold 2019-03-07 11:32:12 -08:00
David Back
cea17985ff new jointRotationOffset field 2019-03-06 13:55:20 -08:00
David Back
9cc1a7aaaa CR changes 2019-03-06 13:44:27 -08:00
David Back
d063825269 export unity material data to materialMap in fst 2019-03-06 13:44:27 -08:00
NissimHadar
4e7f558af8 Merge branch 'master' of github.com:highfidelity/hifi into 21507-replaceQNetworkAccessManagerWithPython 2019-03-06 13:02:36 -08:00
Sam Gateau
f203d71159
Merge pull request #15069 from NissimHadar/21482-addSSIMResultsImage
Case 21482: add SSIM results image
2019-03-06 12:01:33 -08:00
NissimHadar
ab227f210d Increased threshold to 0.990 2019-03-05 16:21:32 -08:00
NissimHadar
66125e1f01 Updated version. 2019-03-05 10:21:49 -08:00
Sam Gateau
cc9a3e2541
Merge pull request #15052 from amerhifi/quest-demo
case 21485: removing quest-demo specific changes
2019-03-01 15:03:44 -08:00
NissimHadar
695367a3e2 Updated for Mac. 2019-03-01 14:28:23 -08:00
NissimHadar
fc3b629cfc New name. 2019-03-01 14:02:18 -08:00
NissimHadar
6697d9d49f Use python downloader. 2019-03-01 12:32:55 -08:00
NissimHadar
8dadeb197b Corrected error message. 2019-03-01 11:35:08 -08:00
NissimHadar
d4fa1e25fb Working. 2019-02-28 20:33:21 -08:00
NissimHadar
15989e3a89 WIP. 2019-02-28 11:43:16 -08:00
ingerjm0
761a922951 Fixed per code review 2019-02-25 10:43:14 -08:00
ingerjm0
75000d9a79 Add @signal tag to hifi plugin 2019-02-23 21:28:00 -08:00
ingerjm0
36c66f019d Add @signal tag to jsdoc; use custom jsdoc templates 2019-02-23 21:10:40 -08:00
NissimHadar
7cf79c1108 Now WITH installation of nitpick. 2019-02-22 15:06:42 -08:00
NissimHadar
a6ad53e79e TEST 2019-02-22 11:30:26 -08:00
amantley
87d98e5b85 These are the squashed commits for the ik optimization for the Quest
Implmented using a new AnimSplineIK node in the anim graph

(cherry picked from commit 4fe03ba238659fee7763991f2499a315482b351f)
2019-02-22 11:21:36 -08:00
Anthony Thibault
d4a41770d7
Merge pull request #14957 from hyperlogic/bug-fix/add-jsdoc-out-dir
Add README.md file to tools/jsdoc/out dir to prevent jsdoc build failures
2019-02-21 09:20:13 -08:00
unknown
d7c2231f33 use root bone name from skeleton list 2019-02-20 10:31:30 -08:00
Brad Davis
d60dcb99d2 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-19 12:37:30 -08:00
Anthony Thibault
9a0163f404 Add README.md file to tools/jsdoc/out directory to prevent jsdoc generation failures during build 2019-02-19 10:36:35 -08:00
David Back
59a1e92dd8 fix git ignore for avatar exporter 2019-02-15 16:25:04 -08:00
John Conklin II
3969a0433e
Merge pull request #14920 from NissimHadar/21193-updateNitpickReadme
Case 21193: update nitpick readme
2019-02-15 14:23:13 -08:00
Brad Davis
51884155ee Support Android app-specific extensions in shaders 2019-02-15 14:16:58 -08:00
John Conklin II
c7a6902e93
Merge pull request #14881 from dback2/avatarExporterTextures
Case 20613: Avatar Exporter v0.2 - copy external textures
2019-02-15 14:14:05 -08:00
David Back
348ac3167f move failed bone rules call, add get texture directory 2019-02-15 12:58:30 -08:00
John Conklin II
7008330641
Merge pull request #14921 from NissimHadar/fixMacError
Compilation error on Qt 5.12
2019-02-15 11:28:55 -08:00
NissimHadar
b77f40d300 Revert due to stable build problem on Ubuntu. 2019-02-15 09:52:57 -08:00
NissimHadar
8b2d9c36af Adding client profile combo. 2019-02-15 08:39:29 -08:00
David Back
41abacbc6f always overwrite, tweak warning 2019-02-14 17:51:32 -08:00
David Back
7cffcf2215 error handling, warnings for duplicate textures 2019-02-14 16:09:48 -08:00
NissimHadar
cf2e118c14 Added missing double-quote. 2019-02-14 14:33:49 -08:00
NissimHadar
a1e289cc1c Compilation error on Qt 5.12 2019-02-14 14:17:29 -08:00
NissimHadar
90aff53408 Merge branch 'master' of github.com:highfidelity/hifi into 21193-updateNitpickReadme 2019-02-14 13:47:16 -08:00
NissimHadar
ba68421d0c Completed manual. 2019-02-14 13:46:51 -08:00