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 |
|
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
|
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 Gondelman
|
067d7b280d
|
Merge pull request #13900 from SamGondelman/blendshapeCrash
Fix blendshape crash
|
2018-08-30 17:10:24 -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 |
|
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 |
|
sabrina-shanman
|
a4bb8cb622
|
Add comment on future of PickTransformNodes
|
2018-08-30 09:08:02 -07:00 |
|
SamGondelman
|
248c2621a4
|
fix blendshapes crash
|
2018-08-29 17:57:54 -07:00 |
|
Zach Fox
|
b8cd5dd8b9
|
Fixup PR13870: Make the feature work in Master
|
2018-08-29 16:58:19 -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 |
|
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
|
78a438d89a
|
Correct CollisionRegion jsdoc for 'joint' parameter
|
2018-08-29 14:55:14 -07:00 |
|
John Conklin II
|
47ce8be526
|
Merge pull request #13854 from wayne-chen/fixTabletButton-case-16847
MS16847: Tablet button doesn't load in HMD mode
|
2018-08-29 13:20:04 -07:00 |
|
John Conklin II
|
26f76081e6
|
Merge pull request #13843 from luiscuenca/fixGLTFLoadTexFromDir
Read glTF resources from other than the main directory
|
2018-08-29 12:31:41 -07:00 |
|
David Back
|
96d2ba660c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping
|
2018-08-29 12:05:51 -07:00 |
|
David Back
|
dcf2074d7e
|
remove [ camera key, allow F to enter camera without selection
|
2018-08-29 11:56:37 -07:00 |
|
Andrew Meadows
|
a134357489
|
fix compile typo
|
2018-08-29 11:37:19 -07:00 |
|
Andrew Meadows
|
f9d14e1351
|
filter time-cost drivers for region regulation
|
2018-08-29 11:17:59 -07:00 |
|
SamGondelman
|
0c8a4cc81e
|
merge with master
|
2018-08-28 17:31:51 -07:00 |
|
Anthony Thibault
|
f281afa71f
|
Merge pull request #13874 from amantley/phaseWalkFix
Phase walk fix bug 17770
|
2018-08-28 11:29:29 -07:00 |
|
Sam Gateau
|
d9d23e7fcf
|
Merge pull request #13877 from luiscuenca/multiplyOtherAvatars
Create N replicas of each other-avatar on the client side
|
2018-08-28 09:02:13 -07:00 |
|
sabrina-shanman
|
6f6e70a470
|
Re-order variable initialization in CollisionRegion copy contructor
|
2018-08-28 08:45:47 -07:00 |
|
David Back
|
990638fd95
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping
|
2018-08-27 18:04:23 -07:00 |
|
luiscuenca
|
c19bd8968a
|
Fix mixer crash
|
2018-08-27 16:48:47 -07:00 |
|
David Back
|
f81fe6b29f
|
add more inputs to controller mapping
|
2018-08-27 16:35:36 -07:00 |
|
SamGondelman
|
aae06e8f49
|
faster aabox ray intersection and pre-computed inverse direction
|
2018-08-27 15:40:33 -07:00 |
|
David Back
|
75d7bf0424
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping
|
2018-08-27 14:53:28 -07:00 |
|
David Back
|
b6edb2c9d6
|
platform states, edit controller mapping, separate mac/win delete
|
2018-08-27 14:53:13 -07:00 |
|
amantley
|
055f03878e
|
made changes to add roll to the spine2 rotation. also only the shoulders control the rotation recenter now
|
2018-08-27 14:44:27 -07:00 |
|
sabrina-shanman
|
397b03d5d5
|
Add threshold parameter to collision pick with minimum of 0
|
2018-08-27 14:12:24 -07:00 |
|
Brad Davis
|
945982b1bd
|
Working on pauses in tomb domain
|
2018-08-27 13:28:49 -07:00 |
|
Stephen Birarda
|
7ddd70a84a
|
Merge pull request #13871 from birarda/bug/double-domain-connect
force NodeList reset if DS changes session or local ID
|
2018-08-27 11:59:24 -07:00 |
|
sabrina-shanman
|
51683b0b53
|
Remove storage of parenting information from CollisionRegion
|
2018-08-27 10:16:09 -07:00 |
|
John Conklin II
|
467fe56103
|
Merge pull request #13845 from SamGondelman/perf
Move blendshape packing to worker thread
|
2018-08-27 09:40:03 -07:00 |
|
luiscuenca
|
8ede6f1cd0
|
Fix removing my avatar and code standards
|
2018-08-27 06:55:52 -07:00 |
|
amantley
|
dd8a00983c
|
Merge remote-tracking branch 'upstream/master' into rotateFilterChange
|
2018-08-24 16:29:20 -07:00 |
|
sabrina-shanman
|
cce62f4d92
|
Do not assume picks with doesIntersect()==false have no results to compare. Fixes CollisionPickResult 'loaded' value always evaluating to false when not colliding
|
2018-08-24 15:47:52 -07:00 |
|
sabrina-shanman
|
6e160ad22f
|
Add TransformNode-based parenting and implement for CollisionPicks
|
2018-08-24 15:47:52 -07:00 |
|
sabrina-shanman
|
68b86963d4
|
Add CollisionRegion copy constructor
|
2018-08-24 15:47:52 -07:00 |
|
sabrina-shanman
|
b0f8d3e427
|
Add PickTransformNode
|
2018-08-24 15:47:52 -07:00 |
|
sabrina-shanman
|
3167d3c0c7
|
Create TransformNodes for SpatiallyNestables, the mouse, and MyAvatar head
|
2018-08-24 15:47:52 -07:00 |
|
SamGondelman
|
ff6020e0ef
|
fix compile errors, maybe
|
2018-08-24 15:41:25 -07:00 |
|