sabrina-shanman
8f2d3b17d3
Fix parabola scaling issues and raypick velocity denormalization due to transform affecting direction scale
2018-09-28 09:27:38 -07:00
sabrina-shanman
e7c70705b2
Actually make the result transform of a collision pick just a position, as documented
2018-09-27 17:33:52 -07:00
sabrina-shanman
44efe648e0
Add scaleWithParent option to collision pick creation
2018-09-27 17:29:42 -07:00
sabrina-shanman
e176143025
Make scaleWithParent true by default for parabola picks
2018-09-27 17:29:42 -07:00
sabrina-shanman
2dd8140158
Make scaleWithAvatar an alias for scaleWithParent in PointerScriptingInterface and make true the default for parabola pointers
2018-09-27 17:29:42 -07:00
sabrina-shanman
bc861c1368
Make path pointers use scaleWithParent behind the scenes instead of scaleWithAvatar
2018-09-27 17:29:37 -07:00
sabrina-shanman
bfa270375a
Simplify PickRay calculations in RayPick::getMathematicalPick
2018-09-27 14:33:29 -07:00
sabrina-shanman
9e0d35e40d
Combine PickScriptingInterface::getPickJointState and createTransformNode into one function
2018-09-27 14:28:10 -07:00
sabrina-shanman
ed987ffe9e
Improve style/compatibility for default position/direction when creating parabola pick
2018-09-27 11:42:19 -07:00
sabrina-shanman
12a755310f
Fix wrong velocity in ParabolaPick::getMathematicalPick
2018-09-27 11:37:30 -07:00
sabrina-shanman
3ac9478101
Assign _mathPick in the Pick constructor
2018-09-27 11:30:57 -07:00
sabrina-shanman
bb38efa061
Set joint state for the mouse RayPick of the EntityTreeRenderer
2018-09-27 10:58:28 -07:00
sabrina-shanman
b68031b969
Add simpler RayPick constructor with position/direction values set to default
2018-09-27 10:53:10 -07:00
sabrina-shanman
4011660435
Merge branch 'master' into stt_parenting2
2018-09-26 10:17:45 -07:00
John Conklin II
0de433c7c7
Merge pull request #14018 from birarda/bug/avatar-hash-map-deadlock-master
...
fix for deadlock in other avatar entity removal from tree
2018-09-26 09:58:26 -07:00
John Conklin II
c5ff72bd20
Merge pull request #14024 from wayne-chen/toggle404Redirect
...
Toggle going to 404 redirect domain
2018-09-25 20:44:57 -07:00
John Conklin II
19438d143e
Merge pull request #14073 from jherico/fix/18069_test
...
Working on Vive shutdown issues
2018-09-25 15:41:32 -07:00
John Conklin II
be23d07621
Merge pull request #14010 from sethalves/thread-safe-settings
...
make settings thread safe
2018-09-24 17:24:50 -07:00
Wayne Chen
69d5299362
patching fix for previous commits
2018-09-24 15:22:46 -07:00
Brad Davis
72fc686ec1
Fix timer managmement during shutdown
2018-09-24 14:52:13 -07:00
Wayne Chen
ac5814a1f8
Merge branch 'master' of https://github.com/highfidelity/hifi into toggle404Redirect
2018-09-24 13:57:23 -07:00
John Conklin II
a602bff217
Merge pull request #13981 from gcalero/android_settings
...
Android settings (AEC)
2018-09-24 13:55:30 -07:00
John Conklin II
d520152a95
Merge pull request #14004 from hyperlogic/feature/anim-stat-improvements
...
Small Improvements to Anim Stats
2018-09-24 11:56:01 -07:00
Stephen Birarda
b31837168d
fix bad lock, optimize some operations, clarify comment
2018-09-24 11:27:20 -07:00
Seth Alves
86e502637e
Make Settings thread safe
2018-09-21 15:46:35 -07:00
Wayne Chen
7e796f7e7f
committing requested changes
2018-09-19 14:26:30 -07:00
John Conklin II
3b1e0dc7d9
Merge pull request #13987 from zfox23/discovery_appUi
...
Discovery Notifications Project Checkpoint: Discovery apps now use AppUI module; PEOPLE app notifications
2018-09-19 12:38:28 -07:00
John Conklin II
60c07280f8
Merge pull request #13971 from SamGondelman/parabola
...
Correct transparent parabola shader
2018-09-19 11:46:24 -07:00
Wayne Chen
a43799fffa
moving settings check within slotted functions
2018-09-19 10:40:49 -07:00
Wayne Chen
795580f4e1
adding 404 redirect toggle with interstitial
2018-09-19 09:55:15 -07:00
Stephen Birarda
3a7785d10f
fix for deadlock in other avatar entity removal
2018-09-18 17:52:24 -07:00
Anthony Thibault
8229c14c44
Fix for type in AnimStats.qml
2018-09-17 15:17:43 -07:00
Zach Fox
23fab0985b
Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi
2018-09-17 11:11:21 -07:00
Anthony Thibault
11fe657c05
Swaped AnimVar and StatMachine panels
2018-09-17 10:33:04 -07:00
John Conklin II
be76c43aec
Merge pull request #13999 from gcalero/dont_popup_login_android
...
Don't popup login dialog in android
2018-09-14 16:06:03 -07:00
John Conklin II
cb8e3c6452
Merge pull request #14003 from danteruiz/snap-fix
...
Fix snapshot settings issue in HMD
2018-09-14 15:34:22 -07:00
John Conklin II
65ef04ae75
Merge pull request #13937 from luiscuenca/stt_teleport_wip
...
Safe Teleport Target
2018-09-14 15:11:18 -07:00
Anthony Thibault
b0cde2afcc
Small addition to Anim Stats
...
* During a state machine interp the previous state now shows up in AlphaValues panel, with parentheses around the name.
* Added 3 new fields
* Position - in world coordinate frame.
* Heading - the facing angle in the world corrdinate frame.
* Local Vel - the velocity of the character in the local coordinate frame. (left, forward, up).
2018-09-14 15:05:17 -07:00
Zach Fox
9c5544af39
Merge in big work from appui_notifications branch
2018-09-14 14:37:04 -07:00
Zach Fox
9e50904376
Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi
2018-09-14 14:36:22 -07:00
Dante Ruiz
ff52639bc3
fix update
2018-09-14 14:10:36 -07:00
Dante Ruiz
4eb5c9714b
fix snapshot settings
2018-09-14 12:59:28 -07:00
Gabriel Calero
72eeeac2ba
Don't popup login dialog in android
2018-09-14 14:40:30 -03:00
sabrina-shanman
237022d304
Refactor new pick parenting system for use with RayPick, ParabolaPick
2018-09-14 10:28:15 -07:00
sam gateau
b35f09fead
Address review comments
2018-09-14 08:43:35 -07:00
Sam Gateau
eccca053f9
Clean changes
2018-09-13 23:58:40 -07:00
Sam Gateau
1438643a5f
Adding extra sanity checks on all time dependant values to avoid bad behavior maybe
2018-09-13 23:48:50 -07:00
Wayne Chen
bf7dd94db7
button was clipped; adding higher res img
2018-09-13 17:25:33 -07:00
Wayne Chen
2b8aebdb6b
Revert "Merge branch 'master' into fixGoToButtonInterstitial"
...
This reverts commit b4b0c519f3aef3ed3e01
2018-09-13 17:21:29 -07:00
Wayne Chen
40451a1fc1
Revert "Revert "Merge branch 'master' into fixGoToButtonInterstitial""
...
This reverts commit c5468fd8e9
2018-09-13 17:21:07 -07:00
