Sam Gateau
|
81a542982b
|
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
|
2018-09-07 12:02:20 -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 |
|
sam gateau
|
fa72910ac1
|
fixing fuckeries
|
2018-09-07 11:14:12 -07:00 |
|
Thijs Wenker
|
dd6801219b
|
Create entities from avatar a bit lower to be able to transform them away from the user easier
|
2018-09-07 19:54:26 +02:00 |
|
SamGondelman
|
f9ec53a2e6
|
fix bloom on edges
|
2018-09-07 10:25:26 -07:00 |
|
Wayne Chen
|
fc4c728181
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192
|
2018-09-07 10:11:34 -07:00 |
|
sam gateau
|
d979d02139
|
why did i do that?
|
2018-09-07 10:03:55 -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 |
|
Alexander Ivash
|
7058b07aea
|
FB18024: 2 users report that while in VR and in GoTo menu, keyboard is unable to be minimized
|
2018-09-07 12:41:39 +03: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 |
|
sam gateau
|
7349562111
|
Removing commented code
|
2018-09-06 15:50:31 -07:00 |
|
sam gateau
|
5ecbdb50c7
|
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
|
2018-09-06 15:36:32 -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 |
|
sam gateau
|
6544e9f0b0
|
Removing the commented debug code
|
2018-09-06 13:58:03 -07:00 |
|
sam gateau
|
38bfee7b72
|
Fix compilation on android and add the simple getBufferIDUnsynced in bindUniformBuffer
|
2018-09-06 13:54:21 -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 |
|
sam gateau
|
e428248472
|
Adressing build warnings
|
2018-09-06 11:33:26 -07:00 |
|
sam gateau
|
5aa45b64d2
|
Adressing build warnings
|
2018-09-06 11:24: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 |
|
Roxanne Skelly
|
8a20969103
|
Fix typo
|
2018-09-06 10:38:10 -07:00 |
|
sam gateau
|
129e2ce188
|
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
|
2018-09-06 10:30:41 -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 |
|
Bradley Austin Davis
|
fade3a8de0
|
Fixing shader implicit type conversions
|
2018-09-06 09:08:36 -07:00 |
|