Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-07 22:40:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
82839 commits 25 branches 28 tags 1.2 GiB
Commit graph

34142 commits

Author SHA1 Message Date
Andrew Meadows
b231dadba5 add check for local-entity when changing phys properties 2019-11-14 09:59:43 -08:00
Andrew Meadows
28f51f6204 add comments 2019-11-14 09:59:43 -08:00
Andrew Meadows
de44cdaf25 remove unnecessary check in if clause 2019-11-14 09:59:43 -08:00
Andrew Meadows
0f2d9027e1 fix indentation 2019-11-14 09:59:43 -08:00
Andrew Meadows
039f7cae13 avoid Qt container in another spot 2019-11-14 09:59:43 -08:00
Andrew Meadows
3546bab19a use std::vector<> instead of QVector<> 2019-11-14 09:59:43 -08:00
Andrew Meadows
fb090d1388 force delete OtherAvatar entities when necessary 2019-11-14 09:59:43 -08:00
Andrew Meadows
4159bc4862 abide by domain-entity hierarchy deletion rules 2019-11-14 09:59:43 -08:00
Andrew Meadows
4e6a647718 don't restrict edit properties of myAvatarEntity 2019-11-14 09:59:43 -08:00
Andrew Meadows
9d92546a8b revert the revert of PR-16307 2019-11-14 09:59:43 -08:00
David Rowe
ef45a6092f Polishing 2019-11-14 16:07:00 +13:00
David Rowe
c44c7dd85e AudioStats JSDoc 2019-11-14 15:57:51 +13:00
DouglasWilcox
b8e85aedc7 Merge branch 'master' into improve_seated_rotation 2019-11-13 13:11:30 -08:00
Sabrina Shanman
579eb04df9
Merge pull request #16491 from sabrina-shanman/instancing 
Fix code style / remove cruft
 2019-11-13 12:53:10 -08:00
sabrina-shanman
516debdcb2 Fix code style / remove cruft 2019-11-13 12:50:13 -08:00
David Rowe
1145bc8904 Fix Graphics.exportModelToOBJ() JavaScript crash 2019-11-14 08:43:51 +13:00
milad
abf592f533 Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp 2019-11-13 10:14:14 -08:00
Zach Fox
8aea0dd951 Merge in Howard's 'screenshare presence' open PR 2019-11-13 10:11:16 -08:00
DouglasWilcox
a3de25618a Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states. 
(cherry picked from commit f9f28fc286)
 2019-11-13 09:52:56 -08:00
Brad Hefta-Gaub
1f2deed941
Merge pull request #16477 from samcake/zorro 
DEV-2711: Fix crash when highlighting custom pipeline shapes
 2019-11-13 09:50:16 -08:00
ingerjm0
417856fec4 JSDoc updates for PR16399 2019-11-12 20:45:20 -08:00
amerhifi
3939c7e6fd adding qaudio reset on switch. 2019-11-12 17:07:43 -08:00
Anthony Thibault
7736582f3b
Merge pull request #16486 from DouglasWilcox/HMD_strafe_transition_bug 
Fix HMD strafe locomotion animation.
 2019-11-12 15:49:15 -08:00
DouglasWilcox
f9f28fc286 Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states. 2019-11-12 14:15:19 -08:00
Sabrina Shanman
5f99c36bb1
Merge pull request #16484 from sabrina-shanman/instancing_oven 
(DEV-2593) Instancing: Fix model baking to work with new hfm::Shape material definition
 2019-11-12 11:40:40 -08:00
DouglasWilcox
995f5f92cd Do not use turningSpeed when setting seatedTurn vars, and iterate acceleration formula 2019-11-12 11:11:19 -08:00
Andrew Meadows
cf08a4162a add workload job to help debug entity proxies 2019-11-12 10:35:16 -08:00
Sabrina Shanman
769a332d22
Merge pull request #16485 from highfidelity/master 
Merge master into instancing
 2019-11-12 10:07:28 -08:00
sabrina-shanman
f39121c53b Fix build error/warning 2019-11-12 09:52:58 -08:00
sabrina-shanman
2169952613 Remove unused mesh.part.materialID 2019-11-11 17:52:16 -08:00
sabrina-shanman
9a65d78cdf Fix model baking to work with new hfm::Shape material definition (1 
material per mesh part)
 2019-11-11 17:52:00 -08:00
Kalila R
7c1b9e79ae Setting ModelBaker.cpp back to main. 2019-11-11 20:28:16 -05:00
Kalila R
fd7ac223b0 activitylogger still disabled but does not output to console 2019-11-11 20:08:03 -05:00
amer cerkic
35065cf4d8 Merge branch 'master' of https://github.com/highfidelity/hifi 2019-11-11 16:15:41 -08:00
Shannon Romano
5f2f647dfb
Merge pull request #16480 from kencooke/audio-hrtf-attn-improved 
DEV-2330: Improved attenuation zones
 2019-11-11 13:17:36 -08:00
DouglasWilcox
64634f51b1 Merge branch 'master' into improve_seated_rotation 2019-11-11 11:31:56 -08:00
DouglasWilcox
c36c4a17b1 first pass hookup of seated rotation with acceleration and animation response 2019-11-11 11:31:34 -08:00
amer cerkic
3a764169ba adding new device to list if default not found 2019-11-11 11:13:44 -08:00
amer cerkic
549e181be0 adding safeguard in case device list is empty 2019-11-11 11:00:33 -08:00
Ken Cooke
ddd11305de Improved HRTF algorithm to expose parametric occlusion/lowpass effect 2019-11-09 09:57:16 -08:00
sabrina-shanman
b7da5d0d72 Update Model::calculateTriangleSets to use hfm::Shapes 2019-11-08 13:56:49 -08:00
dooglifeSF
055d5cdf9b Simplify boolean statements, revise several settle anims 2019-11-08 13:46:38 -08:00
Sam Gateau
8175b9486f Fix crash when highlighting custom pipeline shapes 2019-11-08 11:18:02 -08:00
Sabrina Shanman
eebb9ad51f
Merge pull request #16475 from highfidelity/master 
Merge master into instancing
 2019-11-08 10:10:50 -08:00
sabrina-shanman
a42e09aef8 Fix unused variables/implicit type conversions 2019-11-08 10:04:34 -08:00
Sam Gateau
269289412e Same fix for highlight effects 2019-11-08 09:11:58 -08:00
Sam Gateau
5682e8ee2f Fixing bug with custom pipeline and deformed shape renderItems in shadow pass 2019-11-07 15:16:11 -08:00
dooglifeSF
8e11d91c03 Merge branch 'master' into rand_settles_and_by_momentum 2019-11-07 15:09:10 -08:00
Maia Hansen
7855747386
Merge pull request #16470 from samcake/zorro 
Procedural Material crashes in shadow pass  on deformed shape renderItems
 2019-11-07 15:00:06 -08:00
Sam Gateau
86b62f921d Now that avatars can potentially have their own custom pipeline, shadow pass needs to support it 2019-11-07 14:01:50 -08:00
Shannon Romano
176b463f16
Merge pull request #16458 from hyperlogic/bug-fix/anim-blend-directional-assert 
Fix for assert in AnimBlendDirectional on startup
 2019-11-07 13:11:11 -08:00
dooglifeSF
73202b9caf Different settle transition depending on momentum 2019-11-07 09:52:26 -08:00
Shannon Romano
d30f30191f
Merge pull request #16457 from jennaingersoll/doc-193 
DOC-193 Clarified legacy vs current camera modes
 2019-11-06 10:59:32 -08:00
Shannon Romano
668061e154
Merge pull request #16445 from hyperlogic/bug-fix/remove-last-legacy-blendshapes 
Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy blendshapes
 2019-11-06 10:35:53 -08:00
sabrina-shanman
33bb0e2b19 Change RenderableModelEntityItem::computeShapeInfo to support new HFM format 2019-11-05 14:44:23 -08:00
Anthony J. Thibault
6e7f222608 Fix for assert in AnimBlendDirectional on startup 
Specifically, std::vector subscript out of range.
 2019-11-05 14:16:10 -08:00
ingerjm0
499a0a8067 Clean up code per review 2019-11-05 14:14:46 -08:00
ingerjm0
faa4c97f8a Revisions per review 2019-11-05 14:04:01 -08:00
amerhifi
bc41087ea9 removing lock from WASAPI initialization 2019-11-05 12:50:59 -08:00
ingerjm0
27d4bfdd01 DOC-193 #comment Documented legacy vs current camera modes, along with code samples to re-enable legacy code 2019-11-05 12:20:51 -08:00
sabrina-shanman
88b6472ced Fix build warning 2019-11-05 10:57:55 -08:00
sabrina-shanman
da5f80c139 Use std::vector types in ShapeInfo 2019-11-05 10:57:55 -08:00
Sam Gateau
7af0940846 getting coision to work 2019-11-05 10:57:54 -08:00
sabrina-shanman
27643023a3 Make shape extent calculations use slim mesh extents, and rename task to CalculateTransformedExtentsTask 2019-11-05 10:57:54 -08:00
sabrina-shanman
c3af8b5da7 Remove unused cluster fields from hfm 2019-11-05 10:57:54 -08:00
sabrina-shanman
ba257634f2 Introduce extents for TriangleListMesh and calculate them 2019-11-05 10:57:54 -08:00
sabrina-shanman
67e05a70d4 Fix build error with _drawTransform 2019-11-05 10:56:29 -08:00
sabrina-shanman
7b14c00540 Merge branch 'master' into instancing 2019-11-05 10:22:24 -08:00
amerhifi
343807a9f5 Merge branch 'master' of https://github.com/highfidelity/hifi 2019-11-05 10:17:04 -08:00
amer cerkic
b2ab33116f removing double calls to switch devices, handling default changes from scripting interface instead 2019-11-04 15:03:53 -08:00
Brad Hefta-Gaub
f5873e6f76
Merge pull request #16446 from samcake/zorro 
Renaming the env variable to enable Material Procedural Shaders
 2019-11-04 14:32:54 -08:00
Zach Fox
c39dbc600d
Merge pull request #16441 from zfox23/enableHashMapSignalsForESS 
Implement DEV-2654: Allow ESS to make use of signals like `avatarRemovedEvent`
 2019-11-04 11:59:15 -08:00
Sam Gateau
a4696992e8 Renaming the env variable to enable Material Proecural Shaders 2019-11-04 11:15:37 -08:00
Anthony J. Thibault
821a46697a Update fixUpLegacyBlendshapes as well 2019-11-04 10:55:05 -08:00
Anthony J. Thibault
101ec9d753 Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy faceshift blendshapes 
These blendshapes are not present in ARKit and are not used by any of our procedural
face animations (talking, blinking etc).  This change should have been part of #16400 but
was accidently left out.
 2019-11-04 09:49: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
Zach Fox
8d07d401c3 Add a line of JSDoc 2019-11-01 14:45:07 -07:00
RebeccaStankus
b50fb47a95
Merge pull request #16438 from RebeccaStankus/macWindowSize 
Changed default interface window size on mac
 2019-11-01 13:40:18 -07:00
Rebecca Stankus
3f19bbfcac Changed variable to not be magic number 2019-11-01 11:46:01 -07:00
Rebecca Stankus
e5fcc577f0 Changed default interface window size on mac 2019-11-01 10:47:12 -07:00
Shannon Romano
295c37aea9
Merge pull request #16434 from kencooke/audio-webrtc-warning-spam 
DEV-2619: WebRTC spamming logs
 2019-11-01 10:22:35 -07:00
Ken Cooke
3cdf25f2bc Fix compiler warning (unused variable in Release build) 2019-11-01 07:36:35 -07:00
Sabrina Shanman
05ac16536e
Merge pull request #16436 from highfidelity/master 
Merge master into instancing
 2019-10-31 17:39:15 -07:00
Ken Cooke
30564a67ef Only log a single "AEC not supported" warning per audio device configuration 2019-10-31 14:50:52 -07:00
sabrina-shanman
6666df6137 Fix build warnings/errors 2019-10-31 14:49:28 -07:00
sabrina-shanman
297ce9d88b Remove debug 2019-10-31 13:47:00 -07:00
sabrina-shanman
023d73a25d Finish TriangleListMesh generation, rename some things 2019-10-31 13:47:00 -07:00
sabrina-shanman
7d37a064f2 Fix crash 2019-10-31 13:46:53 -07:00
Sam Gateau
e9ce467eb9 Crahs because of ? 2019-10-31 13:04:11 -07:00
Sam Gateau
465e8c3e18 Prototyping the slim mesh generation 2019-10-31 12:58:15 -07:00
Sam Gateau
24e6a966a8 Keep exploring 2019-10-31 12:58:08 -07:00
Sam Gateau
927e08acdb Explore the simple mesh pure pos triangle list idea 2019-10-31 12:57:29 -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
Maia Hansen
de5570ced8
Merge pull request #16421 from amerhifi/dev-2571new 
case DEV-2771: Audio client shutdown lock
 2019-10-31 09:50:56 -07:00
amer cerkic
4b4b722875 fixed issues related to context switching and selection with hmd 2019-10-30 16:27:19 -07:00
sabrina-shanman
4ecd25c8bb Add TODO for joint.geometricOffset 2019-10-30 14:32:36 -07:00
sabrina-shanman
ecdca05679 Do not apply geometric offset to loaded FBX. Proper fix TBD 2019-10-30 14:28:55 -07:00
sabrina-shanman
9b41fa20c6 Clean up hfm joint geometric offset definition 2019-10-30 14:08:02 -07:00
Shannon Romano
faa192a337
Merge pull request #16338 from ctrlaltdavid/DOC-126 
DOC-126: Toolbars JSDoc
 2019-10-30 13:46:16 -07:00
Shannon Romano
161de1478b
Merge pull request #16335 from ctrlaltdavid/DOC-191 
DOC-191: Recording JSDoc
 2019-10-30 13:46:04 -07:00
sabrina-shanman
0d1bd6afbf Fix wrong transformForCluster for non-root joints with Z up axis 2019-10-30 13:32:30 -07:00
sabrina-shanman
296cd4a47b Rename globalTransformForCluster(s) -> transformForCluster(s) 2019-10-30 12:05:50 -07:00
sabrina-shanman
c8bf1ddfea Only recalculate globalTransformForCluster if needed 2019-10-30 12:01:25 -07:00
sabrina-shanman
61825f2e06 Remove joint.transform self-assignment 2019-10-30 11:50:10 -07:00
sabrina-shanman
ff908a36d6 Define separately globalTransformForCluster and localTransformForCluster for clarity 2019-10-30 11:49:28 -07:00
Shannon Romano
9948a181dc
Merge pull request #16392 from kitely/load-avatar-entities-after-skeleton 
In Bookmarks, attach avatar entities after the skeleton is loaded
 2019-10-30 09:29:51 -07:00
sabrina-shanman
6f5c9924c0 Merge branch 'instancing' into instancing_serializers_conservative 2019-10-30 09:17:09 -07:00
Sabrina Shanman
e8b963b59a
Merge pull request #16425 from highfidelity/master 
Merge master into instancing
 2019-10-30 09:16:04 -07:00
sabrina-shanman
fe1fe6aa83 Fix build warnings 2019-10-30 09:09:17 -07:00
sabrina-shanman
3c078eeef6 It makes more sense for joint.globalTransform to have the hfmModel.offset applied 2019-10-29 17:37:26 -07:00
sabrina-shanman
28e3fd4bc4 Refactor joint transform definition 2019-10-29 17:37:25 -07:00
sabrina-shanman
27b30a9646 Move hfm debug dump to hfm::Model 2019-10-29 16:49:55 -07:00
Brad Hefta-Gaub
206e519b5e
Merge pull request #16390 from kitely/fix-walk-speed 
Fixed the sprint speeds of Desktop vs HMD
 2019-10-29 13:04:45 -07:00
Anthony Thibault
4341da03c5
Merge pull request #16419 from luiscuenca/lookAtFixes 
DEV-2285: Fix look at update and allow to release control
 2019-10-29 12:56:22 -07:00
amerhifi
7d5dcbfc77 space cleanup 2019-10-29 11:58:04 -07:00
sabrina-shanman
8686dcac13 Remove FBXSerializer debug 2019-10-29 11:26:19 -07:00
amerhifi
77f5b985a1 added read/write lock to hmd name 2019-10-29 11:19:59 -07:00
sabrina-shanman
a70f0f2791 (WIP, has debug) Fix FBXSerializer applying geometric transform inconsistently, let HFM prep calculate FBX extents 2019-10-29 10:47:27 -07:00
amerhifi
9370ce9b76 removed items 2019-10-29 10:24:30 -07:00
amerhifi
884cbd7de9 working on moving display plugin lookup to audiodevices 2019-10-29 09:26:48 -07:00
sabrina-shanman
f8017d28ff Separate cluster-related transform from joint.globalTransform 2019-10-29 09:20:17 -07:00
amerhifi
57302dd223 fixing build warning on mac/linux 2019-10-29 08:34:35 -07:00
amerhifi
37ba50992c temp reverting the call to display plugin 2019-10-29 07:16:58 -07:00
luiscuenca
ab6631fae3
Fix look at update and allow to release control 2019-10-28 17:51:29 -07:00
sabrina-shanman
d961c4a892 Use safeMaterialID in FBXSerializer_Mesh.cpp 2019-10-28 15:32:45 -07:00
sabrina-shanman
993aa06301 Let hfm prep calculate OBJ model extents 2019-10-28 13:05:27 -07:00
sabrina-shanman
9fd76cac84 Fix FBX UpAxis transform not being applied to skinned models 2019-10-28 11:50:53 -07:00
Amer
e61d9f3091
Merge pull request #16409 from amerhifi/dev-2450 
case dev 2286: Wireless headphones crash due to missing device
 2019-10-28 11:39:04 -07:00
sabrina-shanman
3de61b4a18 Properly calculate shape extents for FBX aside from geometricTransform/upAxis, speed up model extents calculation 2019-10-28 10:59:44 -07:00
amer cerkic
f1f67f1996 android build fix 2019-10-28 10:42:25 -07:00
Oren Hurvitz
70c3bb2748 Emit an event when failing to load an avatar. 
Previously, MyAvatar only emitted an event (onLoadComplete) if the load succeeded.
Now it also emits an event (onLoadFailed) if the load failed.
 2019-10-27 10:55:31 +02:00
Oren Hurvitz
35082a730e Changed the desktop sprint speed to 2.0. 
This change will not actually be felt by users, because the speed was already effectively 2.0
(because the sprint speeds for Desktop and HMD were reversed).
 2019-10-27 09:35:16 +02:00
HifiExperiments
deb5aacfad fix materialcachescriptinginterface 2019-10-25 18:16:08 -07:00
amerhifi
8dc13ec242 fixed mac param spacing 2019-10-25 16:01:24 -07:00
amerhifi
397586bd19 setting defauld device code for mac to use QT with optional backup to platform code on failure 2019-10-25 15:19:24 -07:00
Anthony J. Thibault
8cf58f2034 Fix for unused avatar transit warnings on mac and linux 
This was introduced by PR #16403

https://github.com/highfidelity/hifi/pull/16403
 2019-10-25 13:56:12 -07:00
amerhifi
6860ac9693 fix missing default device 2019-10-25 13:09:13 -07:00
amerhifi
3e1f341225 typo fix 2019-10-25 12:50:13 -07:00
amerhifi
52637320f0 mac build fix 2019-10-25 12:49:03 -07:00
amerhifi
358f042f32 Merge branch 'master' into dev-2450 2019-10-25 12:12:10 -07:00
amerhifi
49465b1b96 null default device 2019-10-25 12:10:26 -07:00
Sabrina Shanman
c5884fd585
Merge pull request #16405 from highfidelity/master 
Merge master into instancing
 2019-10-25 10:28:57 -07:00
Shannon Romano
c650ca6544
Merge pull request #16403 from hyperlogic/bug-fix/remove-avatar-transit-log-spam 
Remove AvatarTransit log spam
 2019-10-25 10:12:17 -07:00
sabrina-shanman
77dcad21db Fix OBJSerializer crash with empty groupMaterialName 2019-10-25 09:56:27 -07:00
sabrina-shanman
fa51ec3daf (WIP) (has debug) Fix baked FBX materials 2019-10-25 09:56:27 -07:00
Sabrina Shanman
e74de214e2
Merge pull request #16404 from highfidelity/master 
Merge master into instancing
 2019-10-25 09:55:44 -07:00
Amer
42234b119f
Merge pull request #16381 from amerhifi/amer-dev471-re 
case Dev 471: HMD default audio behavior
 2019-10-24 16:23:14 -07:00
Anthony J. Thibault
a67904212d Remove AvatarTransit log spam 2019-10-24 15:52:44 -07:00
sabrina-shanman
4e0db5d641 Fix build warnings 2019-10-24 15:49:03 -07:00
sabrina-shanman
83229db458 Fix GLTFSerializer not reading tangents 2019-10-24 15:49:03 -07:00
sabrina-shanman
1fe1321b6c Disable GLTF skinning 2019-10-24 15:48:59 -07:00
amerhifi
5dd5447095 moved call to hmd device name prior to locking device mutex 2019-10-24 15:03:55 -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
Anthony Thibault
edb181bd16
Merge pull request #16317 from luiscuenca/setAvatarLookAtAPI 
DEV-2285: Improve eyes look at
 2019-10-23 20:42:27 -07:00
sabrina-shanman
d497052505 Fix GLTF claiming to have no cluster weights when it is skinned 2019-10-23 17:13:38 -07:00
Anthony J. Thibault
f28d317914 Clean up reamining issues 2019-10-23 16:43:10 -07:00
Sabrina Shanman
6db993fe05
Merge pull request #16397 from sabrina-shanman/instancing_skinning 
(DEV-561) First pass at skinning for GLTF
 2019-10-23 15:41:12 -07:00
amer cerkic
ac8b664537 addresing pr comments 2019-10-23 15:39:38 -07:00
amer cerkic
ed4df09a26 updated logging added clarifying comment for emit 2019-10-23 15:15:41 -07:00
amer cerkic
d7996c77f4 android build fix 2019-10-23 14:48:25 -07:00
luiscuenca
9432a37567
Undo changes in HeadData.cpp 2019-10-23 14:26:53 -07:00
luiscuenca
bb0849d3a0
Move changes to Head and remove leftover code 2019-10-23 14:23:29 -07:00
David Rowe
116510225a Typo 2019-10-24 09:10:26 +13:00
David Rowe
9d905dbec4 Merge branch 'master' into DOC-126 2019-10-24 09:05:41 +13:00
David Rowe
777f969919 Typo 2019-10-24 09:00:29 +13:00
amer cerkic
179f5e0873 fixed context switching issue with hmd. included additional output info for other audio crash issues 2019-10-23 12:56:43 -07:00
David Rowe
fffb81b474 Merge branch 'master' into DOC-191 2019-10-24 08:23:27 +13:00
sabrina-shanman
ca164375f1 New skinning for GLTF 2019-10-23 10:41:36 -07:00
Anthony J. Thibault
61b9f08fec Blendshapes for OtherAvatars should update even if no joints have changes. 2019-10-22 22:19:03 -07:00
amer cerkic
0410a45da1 fixed selection issue 2019-10-22 11:11:13 -07:00
amerhifi
a8602195d4 addressing comments 2019-10-22 07:17:57 -07:00
amerhifi
68681fdb2e Merge branch 'master' into amer-dev471-re 2019-10-21 21:04:24 -07:00
Anthony J. Thibault
03f88f696d Renamed LipsTogether to MouthClose and bug fixes. 2019-10-21 19:37:57 -07:00
amerhifi
ec7c8ce13c updated default changes check to account for multiple devicetypes 2019-10-18 16:50:36 -07:00
Anthony J. Thibault
92f1b59cc8 Full legacy API and FST support 2019-10-18 16:30:32 -07:00
amerhifi
421cff1cb2 fixed naming to match standards 2019-10-18 15:30:32 -07:00
amerhifi
c7e1fdaeac adding hmd audio device info to deviceslist 
changing locations

one more

merge

working on the threading issue

changing offices, working on qml

simple qml filtering

fixed spacing problem when item is removed
 2019-10-18 15:29:10 -07:00
Sabrina Shanman
68e39eee2e
Merge pull request #16377 from samcake/instancing 
Instancing: Clean ups, simpler Skin Cluster(s) updates
 2019-10-18 11:46:27 -07:00
Sam Gateau
a95a4b5aa2 Address warnings and comments from review 2019-10-18 11:43:25 -07:00
sabrina-shanman
ad6720240f Introduce hfm::Mesh.clusterWeightsPerVertex 2019-10-18 11:30:48 -07:00
Sabrina Shanman
5d91d22314
Merge pull request #16379 from highfidelity/master 
Merge master into instancing
 2019-10-18 10:24:35 -07:00
Sam Gateau
0321e2c2c3 Merge branch 'instancing' of github.com:highfidelity/hifi into instancing 2019-10-18 10:22:20 -07:00
Sam Gateau
c93ac05994
Merge pull request #16378 from sabrina-shanman/instancing_skinning 
(DEV-559) Move skinning reweighting code out of model prep
 2019-10-18 10:21:26 -07:00
sabrina-shanman
be9931bcab Move skinning reweighting code out of model prep to hfm library; use in FBXSerializer. 2019-10-18 10:08:45 -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
Sam Gateau
c89e682b77 address warning 2019-10-17 16:24:21 -07:00
Sam Gateau
bd57cc7b14 Fixing bad indexing 2019-10-17 15:56:41 -07:00
luiscuenca
33ea63c708
Fix warnings and update controls 2019-10-17 15:06:12 -07:00
Sam Gateau
55ed7d9a53 Add support for shape generation for obj serializer 2019-10-17 14:53:32 -07:00
luiscuenca
63c2b41929
Restate legacy first person camera mode 2019-10-17 13:26:42 -07:00
Sam Gateau
01bb8fa601 Merge branch 'instancing' of github.com:highfidelity/hifi into instancing 2019-10-17 09:55:50 -07:00
Sam Gateau
9159258b50 clean ups 2019-10-16 17:42:36 -07:00
sabrina-shanman
acbdd2b3b5 Fix not building due to removed shape.transform 2019-10-16 17:04:19 -07:00
Brad Hefta-Gaub
6d895942f3
Merge pull request #16350 from ctrlaltdavid/DEV-2391 
DEV-2391: Fix Recording.stopRecording() crash
 2019-10-16 15:33:13 -07:00
luiscuenca
9f0e82e1e6
Improve eye's look at and blinking. Fix look at update 2019-10-16 15:29:28 -07:00
sabrina-shanman
0c3e81f52f Merge branch 'instancing' of github.com:highfidelity/hifi into instancing_gltf 2019-10-16 14:03:01 -07:00
sabrina-shanman
5df4092f67 Merge branch 'instancing_gtlf_wip' into instancing_gltf 2019-10-16 13:40:23 -07:00
Sam Gateau
e9e9d1cdfe Merge branch 'instancing' of github.com:highfidelity/hifi into instancing 2019-10-16 13:15:40 -07:00
Sam Gateau
af269a4720 Merge branch 'master' of github.com:highfidelity/hifi into upstream-instancing 2019-10-16 11:57:15 -07:00
Anthony J. Thibault
389f5a1d33 ARKit Blendshape hookup work 2019-10-16 10:36:39 -07:00
Anthony J. Thibault
6efd74a339 WIP adding blendshapes to input system 2019-10-16 10:36:38 -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
Anthony J. Thibault
8411e6b033 Blendshape script API work 
* Moved hasScriptedBlendshapes, hasProceduralBlinkFaceMovement, hasProceduralEyeFaceMovement, hasAudioEnabledFaceMovement to AvatarData
  so they are accessable via agent scripts.
* Marked setForceFaceTrackerConnected as depricated.
* Updated jsdoc comments
 2019-10-16 10:36:35 -07:00
Shannon Romano
71ef645781
Merge pull request #16351 from dooglifeSF/transition-locomotion-to-idle-based-on-input-and-speed 
Fix sliding when stopping from run.
 2019-10-16 09:03:00 -07:00
Sam Gateau
0a9c389641 last issue 2019-10-16 08:06:35 -07:00
Sam Gateau
fc4a314fd3 Merge branch 'instancing' of https://github.com/highfidelity/hifi into instancing 2019-10-16 04:08:58 -07:00
Sam Gateau
eecaeb1155 FOund the issue why the skinning was incorrect, removed unecessary data structures in the newly added objects and renamed Deformer to SkinCluster and DYnamicTransform to SkinDeformer 2019-10-16 04:02:05 -07:00
Sam Gateau
f049ab7887 Understanding that CLuster can be just one for a mesh and we need the bindingMatrix to be applied correctly, differenciating intentionnally the transform for bound evaluation and the one used for render in the case of SKinned mesh because the clusterMatrices contain the extra offset from rig to model 2019-10-15 18:12:09 -07:00
dooglifeSF
0510215240 Move magic number to constant for SLOW_SPEED_THRESHOLD. 2019-10-15 17:48:06 -07:00
Shannon Romano
bebb21fa9e
Merge pull request #16352 from hyperlogic/bug-fix/legacy-sit-script 
Bugfix for legacy sit scripts
 2019-10-15 16:19:49 -07:00
Anthony J. Thibault
14e5962675 Bugfix for legacy sit scripts 
Don't return additive clip nodes as valid "roles" for users to override.
 2019-10-15 15:29:24 -07:00
Zach Fox
1527bf2e11
Merge pull request #16294 from RebeccaStankus/friction 
First Time User Experience Project
 2019-10-15 14:56:25 -07:00
dooglifeSF
a043f0a17e Create isNotInputSlow var for stategraph switch when no input and speed less than 1.5 m/s 2019-10-15 14:51:42 -07:00
David Rowe
185d6990eb Add missing threading checks to Recording API methods 2019-10-16 09:17:29 +13:00
Seth Alves
1f8a7cfea7 fix step translate actions 2019-10-15 09:23:35 -07:00
Sam Gateau
108d331d86 more 2019-10-14 17:45:07 -07:00
sabrina-shanman
acca22e2d6 Remove unused primitive reference in GLTFSerializer 2019-10-14 15:30:03 -07:00
David Rowe
e708cb98bb Fix crash in Recorder.stopRecording() when no recording is being made 2019-10-15 11:29:49 +13:00
sabrina-shanman
2c99ab5e54 Merge branch 'instancing' of github.com:highfidelity/hifi into instancing_gltf 2019-10-14 15:05:13 -07:00
Sabrina Shanman
c38462bf6d
Merge pull request #16345 from highfidelity/master 
Merge master into instancing
 2019-10-14 14:54:22 -07:00
sabrina-shanman
82247072de Create new mesh if GLTF primitive has different vertex attributes 2019-10-14 14:51:57 -07:00
Zach Fox
341abb8185 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-14 12:36:35 -07:00
Zach Fox
a1b6b0af35
Merge pull request #16336 from ctrlaltdavid/DEV-1867 
DEV-1867: Fix toolbarTest.js
 2019-10-14 11:50:59 -07:00
luiscuenca
505813b3c3
Fix blink async and other is talking bug 2019-10-14 10:44:55 -07:00
Sam Gateau
95cabb7597 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-14 10:04:25 -07:00
Shannon Romano
83875089e4
Merge pull request #16328 from Atlante45/fix/account-settings 
DEV-2376: Don't post account settings after pull
 2019-10-14 08:49:22 -07:00
Sam Gateau
05ac9aefa8 the clusterMatrices should be working, but n skin index and weights are assigned yet 2019-10-14 02:21:01 -07:00
Sam Gateau
8af507571c Merge branch 'master' of https://github.com/highfidelity/hifi into instancing 2019-10-12 20:04:20 -07:00
Sam Gateau
8a1f3648f9 fooling around to get the cluster working 2019-10-11 18:06:44 -07:00
David Rowe
d4c5a20c4f Tablet JSDoc fixes 2019-10-12 11:42:49 +13:00
David Rowe
94f9e35704 Toolbars JSDoc 2019-10-12 11:41:53 +13:00
sabrina-shanman
6b46f8e6c4 Remove empty for loop 2019-10-11 14:51:48 -07:00
sabrina-shanman
99a2fedd5f Quick fix for non-matching vertex attributes in GLTF mesh primitives 2019-10-11 14:16:30 -07:00
David Rowe
f944604120 Deprecate Toolbar API's addButton() and removeButton() methods 2019-10-12 10:10:27 +13:00
David Rowe
1715a86dba Fix typo in Assets JSDoc 2019-10-12 07:58:26 +13:00
David Rowe
e4bc3a7d9d Recording JSDoc 2019-10-12 07:58:13 +13:00
Brad Hefta-Gaub
51669e1ac3
Revert "DEV-1811: apply deletion rules to linked entities" 2019-10-11 11:06:10 -07:00
Sam Gateau
336f16e634 Merge branch 'master' of https://github.com/highfidelity/hifi into instancing 2019-10-10 19:27:17 -07:00
Clement
3b21dfcd0a CR 2019-10-10 17:49:51 -07:00
Sam Gateau
a995f2c09f in the middle of something 2019-10-10 17:09:54 -07:00
sabrina-shanman
8e69905e0e Merge branch 'instancing' of github.com:highfidelity/hifi into instancing_gltf 2019-10-10 16:16:37 -07:00
Clement
390c7b14c9 Don't post account settings after pull 
Account settings would always get pushed after a pull even if they
hadn't changed
 2019-10-10 15:55:19 -07:00
Zach Fox
19acd76854 Modify InteractiveWindow positions in C++ instead of JS, resulting in huge speedup 2019-10-10 15:48:40 -07:00
Ken Cooke
8325ee2c8e
Merge pull request #16327 from kencooke/audio-device-sleep-wake 
DEV-1901: No audio in Interface when restoring from sleep
 2019-10-10 15:12:07 -07:00
Ken Cooke
ec67b67966 On waking from sleep/hibernate, restart the audio devices 2019-10-10 14:10:47 -07:00
Maia Hansen
07b916f0b7
Merge pull request #16307 from AndrewMeadows/colossal-cave 
DEV-1811: apply deletion rules to linked entities
 2019-10-10 13:24:43 -07:00
sabrina-shanman
bf65711e04 Fix build warning with cluster.jointIndex in FBXSerializer 2019-10-10 11:14:58 -07:00
sabrina-shanman
f9dd3a9aec Merge branch 'instancing' of github.com:highfidelity/hifi into instancing_gltf 2019-10-10 10:16:01 -07:00