sam gateau
0e614ad578
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-09-05 11:35:08 -07:00
sam gateau
ce86e94e6f
Add simple optim and instrumentation for tthe number of input buffer changes per frame"
2018-09-05 11:34:33 -07:00
sam gateau
8344cb9aff
REfactor the FBXReader_Mesh for different vertex formats
2018-09-05 11:07:04 -07:00
Anthony Thibault
584d39744f
Merge pull request #13918 from hyperlogic/bug-fix/avatars-with-no-eyes-in-hmd-mode
...
HMD mode bug fix for avatars with no eyes
2018-09-05 10:57:21 -07:00
Anthony Thibault
536de03637
Merge pull request #13935 from hyperlogic/bug-fix/takeoff-to-in-air-glitch
...
Fix for glitch when entering in-air state from takeoff.
2018-09-05 10:56:34 -07:00
Andrew Meadows
4a1bd98584
Merge pull request #13914 from SamGondelman/avatarmanager
...
Miscellaneous low-level performance improvements
2018-09-05 10:12:05 -07:00
sam gateau
7de8f4867e
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-09-05 08:38:04 -07:00
sam gateau
adcabf52c5
Refactoring the FBXReader_MEsh.cpp for better interleaving
2018-09-04 17:33:18 -07:00
SamGondelman
9e76c164ac
fix aabox operator+=
2018-09-04 16:25:47 -07:00
Anthony Thibault
e210fadc7c
Fix for glitch when entering inAir state from takeoff.
...
This was due to a frame lag of blend factor used for inAir blending. So the first frame the upward velocity would be 0, followed by 3.5 m/s the next frame.
This is fixed by using the workingVelocity instead of _lastVelocity to drive the blend.
2018-09-04 14:36:56 -07:00
John Conklin II
476887a224
Merge pull request #13909 from NissimHadar/fixFileUtils
...
Create correct folder.
2018-09-04 14:20:20 -07:00
Sam Gateau
b92d1061c4
Merge pull request #13920 from AndrewMeadows/dont-bid-for-locked
...
don't bid for simulation ownership of locked entities
2018-09-04 13:26:21 -07:00
John Conklin II
eaa5e2ea9a
Merge pull request #13927 from kencooke/audio-hrtf-avx2-more
...
Low-level performance improvements to audio-mixer
2018-09-04 12:06:32 -07:00
Anthony Thibault
b21fa1037f
Code review feedback and bug fixes for calibraiton matrices
2018-09-04 11:55:52 -07:00
SamGondelman
ade58a52cc
reserve priority sort util vectors
2018-09-04 11:21:43 -07:00
Anthony Thibault
3a034fdf66
HMD mode bug fix for avatars with no eyes
...
Previously getCenterEyeCalibrationMat() would return the average eye position for an avatar, if the eyes are missing.
Now we fall back to using the HeadCalibrationMat() and adding an offset from the head to the center of the eyes.
This is more accurate for characters that don't quite have human proportions.
2018-09-04 10:13:57 -07:00
Sam Gateau
a328528642
Merge pull request #13883 from NissimHadar/addMap_d
...
Added read of map_d from MTL files
2018-09-04 09:38:07 -07:00
sam gateau
761e8a3f95
fixing warnings
2018-09-04 09:19:24 -07:00
Ken Cooke
f5b7232f58
Cleanup
2018-09-03 14:00:30 -07:00
Ken Cooke
94e8ee99f5
AVX2 implementation of interpolate()
2018-09-03 13:06:49 -07:00
Sam Gateau
e8d922a56c
Interleaving the attributes and relying on just 3 input buffers
2018-09-03 02:48:07 -07:00
Ken Cooke
96aa0549be
AVX2 implementation of crossfade_4x2()
2018-09-01 12:08:49 -07:00
sam gateau
0fe13ea5ee
Merge branch 'black' of github.com:samcake/hifi into black-bis
2018-08-31 17:58:04 -07:00
Sam Gateau
bd9136812d
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-08-31 17:53:49 -07:00
sam gateau
8c23ecce8f
Merge branch 'black' of github.com:samcake/hifi into black-bis
2018-08-31 17:45:10 -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
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
Andrew Meadows
727bd6b05a
don't bid for simulation ownership of locked things
2018-08-31 13:31:26 -07:00
SamGondelman
d01b438cb3
CR
2018-08-31 11:25:17 -07:00
sabrina-shanman
b5862aca2a
Use bracket initialization for CollisionRegion.loaded
2018-08-31 10:53:20 -07:00
sabrina-shanman
f71fc83309
Remove PickResult::needsToCompareResults
2018-08-31 10:48:48 -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
e0f4c8239e
Merge branch 'master' of https://github.com/highfidelity/hifi into black
2018-08-30 19:16:53 -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
Sam Gateau
dc852bf906
Merge branch 'master' of https://github.com/highfidelity/hifi into black
2018-08-30 19:00:56 -07:00
sam gateau
194903692e
clening up the code in LODmanager and the associated js/qml
2018-08-30 18:09:11 -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
NissimHadar
d99cd2a42c
Merge branch 'master' of https://github.com/highfidelity/hifi into addMap_d
2018-08-30 15:07:45 -07:00
NissimHadar
0f6fdef928
Fixed compilation error (within #ifdef)
2018-08-30 15:06:05 -07:00
NissimHadar
eeb63bd16a
Merge branch 'addMap_d' of https://github.com/NissimHadar/hifi into addMap_d
2018-08-30 15:04:39 -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
sam gateau
8179de35b0
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-08-30 14:46:40 -07:00
NissimHadar
4b7ca76ebd
Create correct folder.
2018-08-30 14:15:57 -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
Sam Gateau
9e2a540bab
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-08-30 12:12:24 -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
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
