Dante Ruiz
200f6d540a
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-09-06 09:59:51 -07:00
Sam Gateau
912e0abb0a
Merge pull request #13891 from samcake/black
...
Improving the LOD manager behavior for better scaling
2018-09-05 16:01:09 -07:00
John Conklin II
dc02ff66f5
Merge pull request #13907 from birarda/feat/mixer-trait-state-reset
...
mark and cycle trait instances needing to be sent on mixer reconnect
2018-09-05 12:43:27 -07:00
Sam Gateau
2ced6d9681
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-09-05 11:35:59 -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
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
d2dcf6a3eb
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-09-05 08:40:30 -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
Zach Fox
24cf4adb44
Fix MS17902: Prevent case where My Purchases says Open instead of Uninstall
2018-09-04 09:08:42 -07:00
Sam Gateau
bd9136812d
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-08-31 17:53:49 -07:00
Stephen Birarda
20912349a4
cycle avatar entity IDs for new avatar mixer
2018-08-31 16:53:58 -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
sam gateau
5067047e52
warnings on ubuntu
2018-08-31 14:24:52 -07:00
sam gateau
ec18806546
INtegrating in the algorithm, not in the public values the overshoot for the target FPS to make it simpler to understand
2018-08-31 12:15:28 -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
sam gateau
84ad5c79f9
fixing a no op
2018-08-31 11:09:16 -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
sam gateau
6bd1ab5ae0
fixing a bad constant
2018-08-31 09:18:33 -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
262fdb3c28
ardressing coding standard
2018-08-31 09:09:22 -07:00
sam gateau
eb5f6c8eb3
ardressing coding standard
2018-08-31 09:07:34 -07:00
Sam Gateau
764f75c340
including review feedback
2018-08-30 22:26:45 -07:00
Sam Gateau
371105d0c4
Removing cruft and warnings
2018-08-30 22:18:34 -07:00
Sam Gateau
0ae18febc7
Removing cruft and warnings
2018-08-30 22:09:48 -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
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
sam gateau
8179de35b0
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-08-30 14:46:40 -07:00
Dante Ruiz
03ede9371e
cleaning code
2018-08-30 14:26:39 -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
Sam Gateau
9e2a540bab
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-08-30 12:12:24 -07:00
Sam Gateau
78c7948ebc
fine tuning the noise coef ramp and documenting the algorithm
2018-08-30 12:11:43 -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
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
Sam Gateau
12ec56875e
Merge pull request #13867 from SamGondelman/recurse
...
findRayIntersection/findParabolaIntersection performance improvements
2018-08-30 09:49:16 -07:00
Dante Ruiz
8c77820e30
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-08-30 09:45:41 -07:00
Sam Gateau
6c502e79e3
Fine tuning a LOD regulator PV that works
2018-08-29 22:56:44 -07:00
Sam Gateau
8f4419de30
Merge branch 'master' of https://github.com/highfidelity/hifi into black
2018-08-29 19:11:03 -07:00
Sam Gateau
4844f06e5e
brain freeze
2018-08-29 17:33:39 -07:00
