Commit graph

33341 commits

Author SHA1 Message Date
luiscuenca
1054e8fcde
Selfie camera and updated camera menus 2019-09-17 17:15:16 -07:00
luiscuenca
7c7c3cd223
merge master 2019-09-11 14:07:19 -07:00
Shannon Romano
65d0bb1342
Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc
Kasen Plugin Infrastructure v½ Codename "Modkit Mini"
2019-09-11 13:04:01 -07:00
luiscuenca
2f33e37eb6
Angles instead dot product and fix API 2019-09-10 18:10:02 -07:00
Zach Fox
b39e527b5b DEV-555: Ensure 'href' entity property supports relative paths (coordinates and named paths) 2019-09-10 11:57:02 -07:00
Sam Gateau
a290723583 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-09 13:43:52 -07:00
Sam Gateau
3c34443f24 where possible (in OpenGLDisplayPLugin) remove the need for the eye specific function and keep it in the HMD display plugin for the case of the POinter drawcall 2019-09-09 13:43:32 -07:00
Sabrina Shanman
3c35433f86
Merge pull request #16159 from sabrina-shanman/oven_stall
(BUGZ-143) Fix Oven not finishing when Re-bake originals checked
2019-09-09 13:12:49 -07:00
Shannon Romano
826fb061a4
Merge pull request #16158 from luiscuenca/offsetRotationMMDFix
BUGZ-1394: Fix avatars with rotation offsets
2019-09-09 11:47:43 -07:00
Sam Gateau
760eac6f83 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-09 11:33:27 -07:00
Sam Gateau
3509a797a1 Avoiding to rely on the display plugin resource in the getHUDOperator to avoid a case of unallocated resource 2019-09-09 11:33:05 -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
Shannon Romano
e1dac580b6
Merge pull request #16121 from luiscuenca/audioPosesSyncFix
BUGZ-1234: Mitigate the effect of audio noise on talking animations
2019-09-09 10:37:07 -07:00
luiscuenca
94e1707ab9
Fix avatars with rotation offsets 2019-09-09 10:33:51 -07:00
sabrina-shanman
0a97f2535b Fix missing return on handling TextureBaker error 2019-09-06 17:46:59 -07:00
Andrew Meadows
7a5cb0d555 fix typo 2019-09-06 17:23:38 -07:00
Andrew Meadows
e97d3df637 bump version number 2019-09-06 17:23:38 -07:00
Andrew Meadows
e546ef23a8 don't bid for sim ownership of kinematic unless grabbed 2019-09-06 17:23:38 -07:00
Andrew Meadows
227b99859d fix api for checking EntityItem grab status 2019-09-06 17:23:38 -07:00
Andrew Meadows
580b6a3b2c small optimization: check before lock 2019-09-06 17:23:38 -07:00
luiscuenca
0e4e09acb5
Add blending 2019-09-06 14:30:10 -07:00
luiscuenca
189ddf39e2
Merge branch 'master' into addLookAtThirdCamera 2019-09-06 14:29:51 -07:00
Sam Gateau
9c14838443 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-06 12:41:11 -07:00
Anthony Thibault
2857086861
Merge pull request #16136 from hyperlogic/feature/3x3-blend
Directional Blending Support
2019-09-06 11:10:56 -07:00
Sam Gateau
bc0f719b71 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-06 10:58:35 -07:00
Sam Gateau
85c18f1033 Adding a clamp to 0 to the computed y coordinate while unpacking the normal map 2019-09-06 10:57:54 -07:00
Sam Gateau
acf51ad217
Merge pull request #16137 from jherico/fix/bugz-1398
BUGZ-1398: Tablet access to local HTML
2019-09-06 09:59:22 -07:00
Anthony J. Thibault
aa848df227 warning fixes 2019-09-05 17:43:07 -07:00
luiscuenca
ff8f2c5c16
Add new LookAt camera 2019-09-05 17:04:39 -07:00
Anthony J. Thibault
c35640f739 Warning fixes and small bug fix to anim stats 2019-09-05 14:54:19 -07:00
Brad Davis
0511f87bad BUGZ-1398: Tablet access to local HTML https://youtu.be/7EWQOeQf32U 2019-09-05 11:43:43 -07:00
Anthony J. Thibault
29de8a8d9f remove ajt comment 2019-09-05 11:11:10 -07:00
Anthony J. Thibault
b6f28a6732 Switch additive animation deltas from a pre multiply to a post multiply. 2019-09-05 11:09:03 -07:00
Anthony J. Thibault
92df5cccdc AnimBlendDirectional node 2019-09-05 11:09:02 -07:00
Anthony J. Thibault
6274ab4aa7 3x3 blend wip 2019-09-05 11:09:00 -07:00
Seth Alves
404b42c41e remove unneeded call to tellNeighborsToRecopyEdges 2019-09-05 08:04:09 -07:00
humbletim
271fac4bca Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge 2019-09-05 09:46:21 -04:00
Seth Alves
d86944baf4 rework polyvox state-machine 2019-09-04 20:14:11 -07:00
Shannon Romano
96f6793a87
Merge pull request #16118 from hyperlogic/feature/aim-offset-blend
Additive animation support
2019-09-04 16:55:50 -07:00
jennaingersoll
afad148894
Merge pull request #16134 from ctrlaltdavid/DOC-134
DOC-134: Fix some miscellaneous JSDoc issues
2019-09-04 15:21:14 -07:00
David Rowe
672e61c49d Fix typo in Entities.EntityProperties-Material example 2019-09-04 21:06:49 +12:00
David Rowe
6474705ca2 Reformat "supported script types" in Entities and Scripts signals 2019-09-04 21:06:30 +12:00
David Rowe
4e274347b4 Fix typo in Entities.getAbsoluteJointRotationInObjectFrame() JSDoc 2019-09-04 21:05:36 +12:00
David Rowe
cf01d9f1af Script.require() JSDoc fixes 2019-09-04 21:04:03 +12:00
Sam Gateau
df0eb901a2 REverting the change in the jittering sequence length 2019-09-03 17:01:03 -07:00
Sam Gateau
03c5dfad3d propagating the Bloom on off correctly and fixing the problem where Luci prevents from seeing the zone and finally, update the luci.js with the newer version 2019-09-03 16:28:32 -07:00
Sam Gateau
cda2943b9a Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-03 12:01:12 -07:00
Shannon Romano
5f4b2a0080
Merge pull request #16109 from sethalves/fix-saccade-override
apply fake eye saccades if eye joints aren't overridden
2019-09-03 11:34:02 -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
Bradley Austin Davis
8e3b337a6e
Merge pull request #16120 from jherico/fix/bugz-1365
BUGZ-1365: prevent server scripts from accessing local files in HTML controls
2019-08-30 13:10:09 -07:00