Commit graph

71264 commits

Author SHA1 Message Date
Anthony Thibault
1570ae6424 Merge branch 'master' into bug-fix/recorded-blendshapes-2x 2018-09-10 12:58:53 -07:00
Stephen Birarda
19a9fb00c6
Merge pull request #13967 from huffman/fix/jsdoc-note-for-send-fake-handshake
Add comment to Assets.sendFakeHandshake about excluding jsdoc
2018-09-10 11:47:30 -07:00
Seth Alves
cb33222fea
Merge pull request #13886 from ctrlaltdavid/M17901
Improve HMD Menu page navigation
2018-09-10 11:34:21 -07:00
John Conklin II
3b0f37c6f7
Merge pull request #13885 from birarda/bug/recording-scripting-stuck
fix Agent teardown of recording and ScriptEngine(s)
2018-09-10 10:51:52 -07:00
Sam Gondelman
ae8eea32d6
Merge pull request #13960 from SamGondelman/profileUnpacking
Add detailed profile range for avatar unpacking
2018-09-10 10:04:08 -07:00
Sam Gateau
983badf80a
Merge pull request #13663 from SamGondelman/lod
Enable LOD manager on android
2018-09-08 13:43:36 -07:00
John Conklin II
bafdd06c91
Merge pull request #13934 from SimonWalton-HiFi/assigned-port-check
Check that a requested listening port is able to be used
2018-09-07 15:48:12 -07:00
John Conklin II
01cace694f
Merge pull request #13916 from birarda/bug/ignore-freeze-master
send ignoring avatar removal to ignored avatar
2018-09-07 15:40:32 -07:00
Stephen Birarda
be57789ad8
Merge pull request #13931 from SimonWalton-HiFi/safe-landing-cleanup
Remove some debug logging left in the safe landing module
2018-09-07 14:58:00 -07:00
John Conklin II
472675f9a8
Merge pull request #13956 from hyperlogic/feature/improve-anim-stats
Move animation stats into its own Menu
2018-09-07 14:51:46 -07:00
Sam Gondelman
19fe40abe7
Merge pull request #13958 from SamGondelman/bloom
Fix bloom on edges
2018-09-07 14:50:31 -07:00
Anthony Thibault
949efff439 Fix blendshapes playing back in recordings at 2x their proper values 2018-09-07 13:21:17 -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
SamGondelman
32e2a244a1 detailed profile range for avatar unpacking 2018-09-07 11:44:35 -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
SamGondelman
f9ec53a2e6 fix bloom on edges 2018-09-07 10:25:26 -07:00
Sam Gondelman
57275422f2
Merge branch 'master' into lod 2018-09-07 10:01:26 -07:00
Anthony Thibault
5a059e9318 Fix for build failure on linux and android. 2018-09-07 09:44:19 -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
Anthony Thibault
6508533a15 Remove anim stats from plain ole stats.
There are still present in anim stats tho.
2018-09-06 17:58:40 -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
Ryan Huffman
22df1b3bc6 Add comment to Assets.sendFakeHandshake about excluding jsdoc 2018-09-06 17:19:41 -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
Anthony Thibault
acc7f1f168 Moved AnimStats into its own qml panels.
Added state machine tracking as well.
2018-09-06 16:18:58 -07:00
Stephen Birarda
a908c1554f make sure ignoredNode is available before sending packet 2018-09-06 16:04:54 -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
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
David Rowe
ab47e16be1 Fix up titles and leading white space of some dev menu tablet dialogs 2018-09-06 14:35:08 +12:00
David Rowe
8420afd143 Fix title not not going back to "Settings" upon Save or Cancel 2018-09-06 14:00:33 +12:00