Commit graph

71252 commits

Author SHA1 Message Date
luiscuenca
04e6225a95 Threshold back 2018-09-14 11:22:47 -07:00
luiscuenca
8c9173b639 Safe landing for discrepancies 2018-09-14 11:06:30 -07:00
luiscuenca
fb37e13aae fix hat stand fail 2018-09-13 18:21:22 -07:00
luiscuenca
c5669ef1f5 better property names 2018-09-13 15:22:18 -07:00
luiscuenca
6a9a898b62 make updateCollisionCapsule private 2018-09-13 15:07:34 -07:00
luiscuenca
ceccc6d6ec make getCollisionCapsule thread safe 2018-09-13 14:49:35 -07:00
luiscuenca
b517808bc2 Fix smaller size avatar capsule and land on detailed mesh 2018-09-12 21:24:19 -07:00
luiscuenca
fa3c6932c6 Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip 2018-09-12 11:47:18 -07:00
sabrina-shanman
d2c41f02e5 Avoid unnecessary type conversion in CollisionPick::getHUDIntersection 2018-09-12 10:36:00 -07:00
sabrina-shanman
87b5605d69 Add normalOnPick to CollisionPickResult 2018-09-12 10:36:00 -07:00
luiscuenca
fedea6e84d Comply with review comments 2018-09-11 12:23:25 -07:00
luiscuenca
82b662d08e Add pick offset 2018-09-11 09:34:36 -07:00
luiscuenca
13de22adb3 Fix radius scale 2018-09-11 07:22:59 -07:00
luiscuenca
9c6ee18db5 Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip 2018-09-10 15:18:15 -07:00
sabrina-shanman
3b7dac9058 Account for collisionGroup in CollisionRegion implementation 2018-09-10 15:14:48 -07:00
luiscuenca
6f4e9ded09 Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip 2018-09-10 14:42:02 -07:00
sabrina-shanman
9a86b7451b Add collision group parameter to collision pick and set my avatar as the default 2018-09-10 14:35:04 -07:00
luiscuenca
a9f676354b Only invisible pointers and scale fix 2018-09-10 08:54:53 -07:00
luiscuenca
d09391faa5 Fix invisible error 2018-09-07 12:17:40 -07:00
luiscuenca
02065518cb Merge branch 'master' of https://github.com/highfidelity/hifi into stt_teleport_wip 2018-09-07 11:57:48 -07:00
John Conklin II
405e2da91e
Merge pull request #13949 from sabrina-shanman/stt_parenting_scale
Scale Collision Pick to match parent
2018-09-07 11:54:02 -07:00
John Conklin II
e578b047b0
Merge pull request #13838 from danteruiz/fix-hmd-debug-window
fixing scripting window visiblity and size issues
2018-09-07 11:47:44 -07:00
John Conklin II
2ac0377a6e
Merge pull request #13952 from amantley/steppingReboot
Fix for lurching walk(case 16945), when walking in hmd.
2018-09-07 11:43:03 -07:00
Zach Fox
d8c30ff769
Merge pull request #13955 from zfox23/MS17877_connectionsSort
Fix MS17877: Persist Connections table sort choice
2018-09-07 09:17:15 -07:00
sabrina-shanman
8d4c47cf8e Make template specialization of BaseNestableTransformNode explicit 2018-09-07 08:49:44 -07:00
sabrina-shanman
52bc09cd2a Add override qualifier to BaseNestableTransformNode::getTransform 2018-09-06 17:44:06 -07:00
sabrina-shanman
f40f40e135 Use more reasonable value for BaseNestableTransformNode::_baseScale when given bad value 2018-09-06 17:35:12 -07:00
sabrina-shanman
7a9480723e Remove unused variable in PickScriptingInterface::createTransformNode 2018-09-06 17:30:29 -07:00
sabrina-shanman
23a6abbaca Update jsdocs to reflect new collision pick scaling behavior 2018-09-06 16:47:09 -07:00
sabrina-shanman
836f810c41 Have OverlayTransformNode and similar define scale relative to nestable scale on creation time, and refactor code 2018-09-06 16:33:29 -07:00
Zach Fox
0e785f9bdb Fix MS17877: Persist Connections table sort choice 2018-09-06 15:35:26 -07:00
John Conklin II
7bbedf65c7
Merge pull request #13950 from sethalves/overlay-set-name-crash
fix a crash related to setting an overlay's name
2018-09-06 14:28:11 -07:00
John Conklin II
8c77749fb6
Merge pull request #13947 from SamGondelman/perf
Fix blendshapes crash one last time, one last time
2018-09-06 14:21:18 -07:00
John Conklin II
b486b6d148
Merge pull request #13928 from AndrewMeadows/enable-workload-feedback
enable workload regulation by default
2018-09-06 14:20:40 -07:00
amantley
c986d55d8b removed step script from repo 2018-09-06 13:18:54 -07:00
amantley
90a51e6181 added walk velocity threshold, this determines if we are in the walk state. when we are then we don't do cg leaning calculation. this will smooth out the walking in a large tracked area 2018-09-06 13:12:48 -07:00
John Conklin II
152ec3d631
Merge pull request #13945 from davidkelly/dk/17915
volume slider on individual users in PAL remembers setting now
2018-09-06 12:55:46 -07:00
sabrina-shanman
714cfc5ef1 Add scaling information to CollisionRegion jsdoc and missing info to CollisionPickProperties jsdoc 2018-09-06 12:14:50 -07:00
sabrina-shanman
727b62144f Fix MyAvatarHeadTransformNode not using avatar scale 2018-09-06 12:03:13 -07:00
sabrina-shanman
7839ba42db Make the Collision Pick threshold scale with the largest dimension of the parent 2018-09-06 11:02:07 -07:00
sabrina-shanman
3f7a7fb11a Return early from AvatarTransformNode and similar when getTransform fails 2018-09-06 10:29:01 -07:00
sabrina-shanman
e8ea95e375 Use elseifs in PickScriptingInterface::createTransformNode 2018-09-06 10:21:48 -07:00
sabrina-shanman
390e89a64d Fix missing NestableTransformNode import 2018-09-06 10:20:26 -07:00
Ryan Huffman
80b5f90160
Merge pull request #13857 from thoys/fix/interactiveWindows/onlyOnTopWhileMainWindowActive
MS17463: only show InteractiveWindow on top of interface window
2018-09-06 10:15:20 -07:00
sabrina-shanman
f7226757ad Just import TransformNode in AvatarTransformNode.h and similar 2018-09-06 10:03:05 -07:00
luiscuenca
01424b8179 Head Collision Pick added 2018-09-06 09:39:33 -07:00
Seth Alves
042044ceaf dammit 2018-09-06 09:38:12 -07:00
Seth Alves
5a0a259c21 dammit 2018-09-06 09:37:01 -07:00
Seth Alves
69ae04ab09 protect Base3DOverlay::_name with a mutex 2018-09-06 09:03:28 -07:00
amantley
6fb335429d starting to re-implement the walking state detection for smoothwalking 2018-09-05 17:55:27 -07:00