Simon Walton
|
2a0ee1c532
|
Cherry-pick of commit cde2dc2e to fix merge issue
|
2018-09-11 16:58:21 -07:00 |
|
Simon Walton
|
80b7e04bc6
|
Revert change to chrono<system_clock> for usecTimestampNow()
|
2018-09-11 10:51:36 -07:00 |
|
Simon Walton
|
9628615c44
|
Fix bandwidth quota calculation now we're dropping excess
|
2018-09-10 17:16:16 -07:00 |
|
Simon Walton
|
d12376187c
|
Merge branch 'master' into avatar-mixer-scaling
|
2018-09-10 10:15:49 -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 |
|
Simon Walton
|
6bb143da42
|
Make maxAvatarBytesPerFrame int rather than float; other clean-up
|
2018-09-07 18:14:39 -07:00 |
|
Simon Walton
|
c2fe2b60b3
|
Use std::vector for ignored avatars since the list will be small
|
2018-09-07 15:49:47 -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 |
|
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 |
|
Simon Walton
|
1a67176819
|
Fix a dangling merge conflict
|
2018-09-07 11:29:30 -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 |
|
Simon Walton
|
3dc993c841
|
Fix small error in translation delta
|
2018-09-07 09:46:21 -07:00 |
|
Anthony Thibault
|
5a059e9318
|
Fix for build failure on linux and android.
|
2018-09-07 09:44:19 -07:00 |
|
Simon Walton
|
741d4ba998
|
Merge branch 'master' into avatar-mixer-scaling
|
2018-09-07 09:30:39 -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 |
|
Simon Walton
|
22cfad2483
|
Squelch (false) warning from gcc
|
2018-09-06 18:32:37 -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 |
|
Simon Walton
|
e11d93a497
|
Merge pull request #2 from SamGondelman/otherAvatars
Avatar mixer and manager perf improvements and cleanup
|
2018-09-06 17:47:16 -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 |
|
SamGondelman
|
ed7f993c0d
|
avatar mixer and manager perf improvements and cleanup
|
2018-09-06 16:57:20 -07:00 |
|
sabrina-shanman
|
23a6abbaca
|
Update jsdocs to reflect new collision pick scaling behavior
|
2018-09-06 16:47:09 -07:00 |
|
Simon Walton
|
f6fd27a76b
|
Merge pull request #1 from AndrewMeadows/avatar-mixer-scaling-2
tweak avatar sort coefficients and fix bad avatar bounding box calculations
|
2018-09-06 16:39:20 -07:00 |
|
Andrew Meadows
|
92210f28b5
|
cleanup and use correct avatar bounding box
|
2018-09-06 16:33:30 -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 |
|
Simon Walton
|
f59168e1c8
|
make sure ignoredNode is available before sending packet
|
2018-09-06 16:31:31 -07:00 |
|
Simon Walton
|
9e0c21065e
|
Stop sending avatars when over bandwidth quota
|
2018-09-06 16:20:46 -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 |
|
Andrew Meadows
|
229e9624e6
|
remove bad bounding box calculations in avatar-mixer
|
2018-09-06 15:34:28 -07:00 |
|
Andrew Meadows
|
021146e4f0
|
minor tweak to default avatar-update sort coefficients
|
2018-09-06 15:33:52 -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 |
|