Simon Walton
|
695fabf4f5
|
Merge commit 'd01b438cb320a7ccc0aa8a0085e86940bb73c09c' into avatar-mixer-scaling
|
2018-09-04 15:27:18 -07:00 |
|
Simon Walton
|
6ae2ca1576
|
Merge commit '5f08ed5027a8904242a47b17e994ab4f309e3930' into avatar-mixer-scaling
Merge of Samuel's change to use simple sort instead of priority queue
|
2018-09-04 15:26:26 -07:00 |
|
Simon Walton
|
058115b791
|
Add guard for sentJointDataOut
|
2018-09-04 10:38:18 -07:00 |
|
Simon Walton
|
c2ea05b026
|
Merge remote-tracking branch 'upstream/master' into avatar-mixer-scaling
|
2018-09-04 09:31:05 -07:00 |
|
Simon Walton
|
11a563cb38
|
Don't use temp vector for outgoing joint status - doesn't seem to be necessary
|
2018-08-31 17:40:57 -07:00 |
|
John Conklin II
|
b94dd526b9
|
Merge pull request #13919 from SamGondelman/avatarmanager2
Fix blendshapes crash one last time
|
2018-08-31 17:12:42 -07:00 |
|
Simon Walton
|
cf5f81ab95
|
Don't memcpy quaternions as we don't use same component order on wire!
|
2018-08-31 17:04:23 -07:00 |
|
Simon Walton
|
5a0de0f103
|
Small fixes for joint logic
|
2018-08-31 16:45:39 -07:00 |
|
Simon Walton
|
2da5338574
|
Fix couple of gcc issues
|
2018-08-31 15:24:51 -07:00 |
|
Simon Walton
|
e1d51a6c42
|
Avatar serializing: use memcpy where possible, take copy of joint data to avoid holding lock, etc
|
2018-08-31 15:06:33 -07:00 |
|
Sam Gondelman
|
7cdc7dcc66
|
Merge pull request #13873 from sabrina-shanman/stt_parenting
Collision Pick Parenting
|
2018-08-31 14:43:55 -07:00 |
|
SamGondelman
|
028092f803
|
fix blendshapes one last time
|
2018-08-31 13:33:45 -07:00 |
|
SamGondelman
|
d01b438cb3
|
CR
|
2018-08-31 11:25:17 -07:00 |
|
sabrina-shanman
|
62344c106d
|
Make render states a map when returned from PointerScriptingInterface::getPointerProperties
|
2018-08-31 11:19:53 -07:00 |
|
sabrina-shanman
|
b5862aca2a
|
Use bracket initialization for CollisionRegion.loaded
|
2018-08-31 10:53:20 -07:00 |
|
sabrina-shanman
|
2e290ea798
|
Only create a NestableTransformNode if the spatially nestable exists
|
2018-08-31 10:52:00 -07:00 |
|
sabrina-shanman
|
f71fc83309
|
Remove PickResult::needsToCompareResults
|
2018-08-31 10:48:48 -07:00 |
|
sabrina-shanman
|
4d85cb17f3
|
Include full transform in CollisionPick::getResultTransform
|
2018-08-31 10:46:17 -07:00 |
|
sabrina-shanman
|
9bf088d32b
|
Just assign mathPick.loaded in CollisionPick::getMathematicalPick
|
2018-08-31 10:28:45 -07:00 |
|
sabrina-shanman
|
e94d7de99a
|
Add JS API hook for getting overlay IDs from a pointer via
Pointer.getPointerProperties
|
2018-08-31 09:18:07 -07:00 |
|
Sam Gateau
|
a7fd35747d
|
Merge pull request #13896 from AndrewMeadows/workload-feedback
Filter timings used in feedback logic for workload region sizes
|
2018-08-30 19:11:49 -07:00 |
|
Simon Walton
|
33db1394e6
|
Use system_clock in usecTimestampNow for cross-platform goodness
|
2018-08-30 17:12:42 -07:00 |
|
Sam Gondelman
|
067d7b280d
|
Merge pull request #13900 from SamGondelman/blendshapeCrash
Fix blendshape crash
|
2018-08-30 17:10:24 -07:00 |
|
SamGondelman
|
5f08ed5027
|
misc perf improvements
|
2018-08-30 16:55:15 -07:00 |
|
Anthony Thibault
|
78d7c321b8
|
Merge pull request #13796 from amantley/noNeckFix
Avatar without Neck Joint bug 14620
|
2018-08-30 14:52:44 -07:00 |
|
John Conklin II
|
8fa4a2855e
|
Merge pull request #13641 from amantley/rotateFilterChange
Hand Azimuth Controls Shoulder Rotation
|
2018-08-30 13:59:00 -07:00 |
|
David Back
|
cee270780b
|
Merge pull request #13908 from dback2/androidCrashStateVariables
Fix Android StateController assert
|
2018-08-30 13:37:13 -07:00 |
|
Simon Walton
|
b45b0f54e4
|
Move unfilteredHandlers processing back into main loop
|
2018-08-30 11:59:53 -07:00 |
|
John Conklin II
|
f5ebdfa233
|
Merge pull request #13905 from zfox23/fixPr13870
Fixup PR13870: Make the feature work in Master
|
2018-08-30 11:08:23 -07:00 |
|
Simon Walton
|
c2ac2b9ab0
|
Various tweaks; fix clang warning
|
2018-08-30 10:59:55 -07:00 |
|
John Conklin II
|
bf0ab865bb
|
Merge pull request #13903 from birarda/bug/av-entity-delete-master
send MyAvatar avatar entity updates through entity tree
|
2018-08-30 10:25:31 -07:00 |
|
David Back
|
8b1fcfcce9
|
fix double windows platform
|
2018-08-30 10:16:27 -07:00 |
|
Andrew Meadows
|
6c4862910e
|
smoother edges for workload region feedback response
|
2018-08-30 10:13:35 -07:00 |
|
Sam Gateau
|
12ec56875e
|
Merge pull request #13867 from SamGondelman/recurse
findRayIntersection/findParabolaIntersection performance improvements
|
2018-08-30 09:49:16 -07:00 |
|
sabrina-shanman
|
a4bb8cb622
|
Add comment on future of PickTransformNodes
|
2018-08-30 09:08:02 -07:00 |
|
Simon Walton
|
7b7f369c39
|
Further reductions in shared pointers, getWorldPosition().
|
2018-08-29 18:25:10 -07:00 |
|
SamGondelman
|
248c2621a4
|
fix blendshapes crash
|
2018-08-29 17:57:54 -07:00 |
|
Simon Walton
|
a186be014d
|
Use std::chrono for usecTimestampNow()
|
2018-08-29 17:35:28 -07:00 |
|
Zach Fox
|
b8cd5dd8b9
|
Fixup PR13870: Make the feature work in Master
|
2018-08-29 16:58:19 -07:00 |
|
Sam Gondelman
|
cfffa65819
|
Merge pull request #13899 from SamGondelman/pointerPerf
Improve Pointer performance
|
2018-08-29 16:57:43 -07:00 |
|
sabrina-shanman
|
1fe909f9ad
|
Make CollisionPick::getResultTransform() always return a valid transform
|
2018-08-29 16:33:51 -07:00 |
|
Stephen Birarda
|
aaf5f593c5
|
send MyAvatar avatar entity updates through entity tree
|
2018-08-29 16:30:24 -07:00 |
|
sabrina-shanman
|
0926968e2b
|
Do not have depth as a parameter in getTransform(..) when called in NestableTransformNode
|
2018-08-29 16:30:06 -07:00 |
|
sabrina-shanman
|
686f9fb18a
|
Move load state flag from CollisionPickResult to CollisionRegion and make it a boolean
|
2018-08-29 16:29:59 -07:00 |
|
Angus Antley
|
9fb0f8b7c0
|
added condition to prevent overwriting tracker input with estimated orientation for spine2 joint
|
2018-08-30 00:25:53 +01:00 |
|
John Conklin II
|
7298cb4654
|
Merge pull request #13888 from dback2/editControllerMapping
Edit mode controller mapping using new platform state variables
|
2018-08-29 16:06:47 -07:00 |
|
sabrina-shanman
|
2d73b7845e
|
Code style fixes
|
2018-08-29 15:00:01 -07:00 |
|
sabrina-shanman
|
78a438d89a
|
Correct CollisionRegion jsdoc for 'joint' parameter
|
2018-08-29 14:55:14 -07:00 |
|
sabrina-shanman
|
0981f08b22
|
Do not propagate avatar scale in AvatarHeadTransformNode
|
2018-08-29 14:48:27 -07:00 |
|
Zach Fox
|
67e57a9487
|
Merge pull request #13849 from zfox23/MS16003_backCloses
Fix MS16003: In PAL/GoTo WebView, 'BACK' closes app when you can't go back
|
2018-08-29 14:29:12 -07:00 |
|