Alexia Mandeville
|
190a335c71
|
Adding more margin to forgotten links
|
2018-09-07 00:01:00 -07:00 |
|
Alexia Mandeville
|
92f218ae29
|
Adding margins to forgotten link text
|
2018-09-06 22:59:19 -07:00 |
|
Alexia Mandeville
|
2443723a2b
|
Removing margins, adding width attribute
|
2018-09-06 21:14:04 -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 |
|
Wayne Chen
|
45b2098346
|
Merge branch 'interstitial-final-page' of https://github.com/danteruiz/hifi into interstitalMerged
|
2018-09-06 17:58:04 -07:00 |
|
Dante Ruiz
|
45a99a9244
|
fixing some bugs
|
2018-09-06 17:55:10 -07:00 |
|
sabrina-shanman
|
52bc09cd2a
|
Add override qualifier to BaseNestableTransformNode::getTransform
|
2018-09-06 17:44:06 -07:00 |
|
Wayne Chen
|
72818f3729
|
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitalMerged
|
2018-09-06 17:37:36 -07:00 |
|
Wayne Chen
|
ef3449f96d
|
Merge branch 'interstitial-final-page' of https://github.com/danteruiz/hifi into interstitalMerged
|
2018-09-06 17:36:47 -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 |
|
Wayne Chen
|
e76ebf7a0b
|
changing location of shortcuts
|
2018-09-06 17:29:16 -07:00 |
|
Ryan Huffman
|
22df1b3bc6
|
Add comment to Assets.sendFakeHandshake about excluding jsdoc
|
2018-09-06 17:19:41 -07:00 |
|
Dante Ruiz
|
2f9119529a
|
editing the interstitial page
|
2018-09-06 17:06:17 -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 |
|
Alexia Mandeville
|
8e5f5cc796
|
Moving forgotten links
|
2018-09-06 16:16:43 -07:00 |
|
David Back
|
3d75d4726a
|
scale invertly once passing minimum
|
2018-09-06 16:04:59 -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 |
|
David Back
|
434e840167
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleScaleImprovements
|
2018-09-06 15:27:02 -07:00 |
|
Dante Ruiz
|
98dafa3b67
|
fix overlayParentID
|
2018-09-06 14:31:49 -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 |
|
Alexia Mandeville
|
aabfda6eb5
|
Adding descriptive text
|
2018-09-06 14:16:42 -07:00 |
|
Alexia Mandeville
|
00e10ad684
|
Updating sign up text, moving forgotten info links
|
2018-09-06 14:05:51 -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 |
|
David Back
|
6ac38190c1
|
tweak scaling multiple
|
2018-09-06 12:23:38 -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 |
|
David Back
|
92ff522862
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleScaleImprovements
|
2018-09-06 11:54:05 -07:00 |
|
Wayne Chen
|
a5038850f1
|
right align forgot user/pw shortcuts
|
2018-09-06 11:37:35 -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 |
|
Wayne Chen
|
385027321b
|
fixing the eye open/closed pw image
|
2018-09-06 11:18:35 -07:00 |
|
Dante Ruiz
|
ec2d89fd25
|
fixing toolbar disappering
|
2018-09-06 11:16:58 -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 |
|