Commit graph

71352 commits

Author SHA1 Message Date
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
Brad Davis
650f112f16 Fix keyword in shader layout 2018-09-06 09:08:36 -07:00
Brad Davis
50f4932d9c PR feedback: structure alignement and size 2018-09-06 09:07:53 -07:00
Seth Alves
69ae04ab09 protect Base3DOverlay::_name with a mutex 2018-09-06 09:03:28 -07:00
Brad Davis
9a28e04e37 Remove all tabs from shaders 2018-09-06 08:59:07 -07:00
Brad Davis
2df2bbef46 Adding missing locations 2018-09-06 08:59:07 -07:00
Brad Davis
87b9594bd0 Fix warnings 2018-09-06 08:59:06 -07:00
Brad Davis
730cdb4257 Remove uniforms from unused shaders 2018-09-06 08:59:06 -07:00
Brad Davis
f704ddc11c Remove uniform from SDF text rendering 2018-09-06 08:59:06 -07:00
Brad Davis
a4cd56532e Removing uniforms from antialiasing 2018-09-06 08:59:06 -07:00
Brad Davis
07fba89f0f Remove uniforms from item status 2018-09-06 08:59:06 -07:00
Brad Davis
271651737b Cleanup gpu shader constants 2018-09-06 08:59:06 -07:00
Brad Davis
5a5e1ad498 Remove uniforms from polyvox 2018-09-06 08:59:06 -07:00
Brad Davis
cafd981744 Remove uniforms from bloom debug effect 2018-09-06 08:59:06 -07:00
Brad Davis
719ae25adb Remove uniforms from drawCellBounds 2018-09-06 08:59:05 -07:00
Brad Davis
c8eb4da6b6 Remove simple draw task uniforms 2018-09-06 08:59:05 -07:00
Brad Davis
ac84a498b3 Cleanup dead declarations 2018-09-06 08:59:05 -07:00
Brad Davis
35d86dd798 Fail unit test on non-compiling pipelines 2018-09-06 08:59:05 -07:00