Commit graph

33838 commits

Author SHA1 Message Date
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
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
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