David Rowe
|
a205d2a00c
|
Use animation for pointing index finger instead of setting joint angles
|
2017-02-25 11:36:06 +13:00 |
|
samcake
|
9e23670b83
|
Merge pull request #9752 from jherico/smarter_textures
Add pending texture transfer size to tracked stats
|
2017-02-24 14:04:59 -08:00 |
|
Seth Alves
|
1287beb3a2
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
|
2017-02-24 13:58:03 -08:00 |
|
Chris Collins
|
8e91fc3dde
|
Merge pull request #9748 from ZappoMan/avatarBandwidthBudgetImprovements
fix avatars slightly out of view in large audience from freezing
|
2017-02-24 13:57:56 -08:00 |
|
Seth Alves
|
34755dd75d
|
notify children of an overlay when the parent overlay moves
|
2017-02-24 13:57:49 -08:00 |
|
Seth Alves
|
b2a35f45db
|
when tablet is an overlay, use the model-fbx from the distribution (local disk copy) rather than the one on s3
|
2017-02-24 13:04:43 -08:00 |
|
Seth Alves
|
6e9854cad0
|
don't crash if geometry fails to load
|
2017-02-24 13:01:01 -08:00 |
|
Brad Davis
|
cd8bba47cf
|
Add pending texture transfer size to tracked stats
|
2017-02-24 12:39:38 -08:00 |
|
Seth Alves
|
eedc5c1647
|
don't allow tablet to get stuck to a hand when passing it back and forth between hands
|
2017-02-24 12:10:52 -08:00 |
|
samcake
|
3c21f340e7
|
Merge pull request #9751 from jherico/smarter_textures
Ensure complete population of allocated mip levels
|
2017-02-24 12:10:25 -08:00 |
|
Brad Davis
|
3d2e6713ee
|
Ensure complete population of allocated mip levels
|
2017-02-24 12:04:17 -08:00 |
|
David Kelly
|
d6f0d8c960
|
styling changes, first pass
|
2017-02-24 11:45:03 -08:00 |
|
Seth Alves
|
71ab6a1a84
|
fix a couple of problems related to grabbing tablet while edit.js is active
Conflicts:
scripts/system/controllers/handControllerGrab.js
|
2017-02-24 11:38:42 -08:00 |
|
Seth Alves
|
70060eb464
|
in 2d mode, clicks on tablet don't get used for other things
Conflicts:
scripts/system/libraries/entitySelectionTool.js
|
2017-02-24 11:37:04 -08:00 |
|
Seth Alves
|
73774a6590
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
|
2017-02-24 11:34:59 -08:00 |
|
Howard Stearns
|
a9b8045697
|
Merge pull request #9720 from howard-stearns/filter-pal-by-view-distance
Filter pal by view distance
|
2017-02-24 11:10:13 -08:00 |
|
David Kelly
|
d399f648d5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting
|
2017-02-24 10:32:43 -08:00 |
|
David Kelly
|
2458f95c42
|
more of a peak loudness with decay, now
|
2017-02-24 10:31:55 -08:00 |
|
Brad Davis
|
b06768d379
|
Merge pull request #9750 from jherico/smarter_textures
Use hashes of URLs for filenames, due to length constraints
|
2017-02-24 08:44:52 -08:00 |
|
Menithal
|
10151c3f5b
|
Added Multi-userdata field updater
|
2017-02-24 08:04:03 +02:00 |
|
Brad Davis
|
594fe9b1be
|
Use hashes of URLs for filenames, due to length constraints
|
2017-02-23 22:01:53 -08:00 |
|
Menithal
|
bdf241bafd
|
Merge branch 'master' into grab-clone
|
2017-02-24 05:43:25 +02:00 |
|
David Kelly
|
4a4c914ca8
|
First cut at new styling
|
2017-02-23 18:53:22 -08:00 |
|
Brad Hefta-Gaub
|
60fd4afc4d
|
don't count NoData avatars as having been broadcast, fix avatars slightly out of view from freezing
|
2017-02-23 18:52:10 -08:00 |
|
Andrew Meadows
|
faa272c67c
|
don't blend animations for otherAvatars
|
2017-02-23 17:36:45 -08:00 |
|
Andrew Meadows
|
4bbbcb61be
|
expand avatar update time budget
|
2017-02-23 17:36:45 -08:00 |
|
Andrew Meadows
|
14e7392a89
|
minor cleanup
|
2017-02-23 17:36:45 -08:00 |
|
Andrew Meadows
|
0657ca1e5e
|
remove unnecessary context brackets
|
2017-02-23 17:36:45 -08:00 |
|
Andrew Meadows
|
92a32b4651
|
remove unused variable
|
2017-02-23 17:36:45 -08:00 |
|
Andrew Meadows
|
e54812430e
|
avoid unnecessary copy of priority_queue
|
2017-02-23 17:36:45 -08:00 |
|
Andrew Meadows
|
ee5971c39e
|
no need to calc length of normalized vector
|
2017-02-23 17:36:45 -08:00 |
|
Brad Davis
|
61e341db75
|
Merge remote-tracking branch 'upstream/master' into smarter_textures
|
2017-02-23 17:22:03 -08:00 |
|
Chris Collins
|
e723385df2
|
Merge pull request #9726 from ZappoMan/avatarBandwidthBudgetImprovements
Avatar bandwidth budget improvements
|
2017-02-23 17:12:18 -08:00 |
|
Ryan Huffman
|
efd1a5c600
|
Update parameter name in getPropertiesForEntities
|
2017-02-23 16:38:28 -08:00 |
|
samcake
|
1960db5d2b
|
Merge pull request #9744 from jherico/smarter_textures
Enable threaded texture buffering
|
2017-02-23 16:11:14 -08:00 |
|
Brad Davis
|
b8e1340a0d
|
Enable threaded texture buffering
|
2017-02-23 16:08:29 -08:00 |
|
Ryan Huffman
|
0da9f72c42
|
Update spawn position/rotation of bows in shortbow
|
2017-02-23 16:05:12 -08:00 |
|
Ryan Huffman
|
4c310e1048
|
Update shortbow to use spawner entities to specify position/rotation at runtime
|
2017-02-23 16:02:56 -08:00 |
|
Seth Alves
|
0a2a1b1637
|
include visible_to_others in UserActivityLoggerScriptingInterface::openedTablet
|
2017-02-23 15:25:09 -08:00 |
|
Seth Alves
|
a286c72b3b
|
cleanups
|
2017-02-23 15:12:45 -08:00 |
|
Seth Alves
|
4600d546c0
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
|
2017-02-23 14:56:06 -08:00 |
|
Seth Alves
|
9c0104a060
|
don't use Entities.getEntityProperties on tablet when it's an overlay
|
2017-02-23 14:55:52 -08:00 |
|
Brad Hefta-Gaub
|
1b7ec7d61e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements
Conflicts:
libraries/avatars/src/AvatarData.cpp
|
2017-02-23 13:50:16 -08:00 |
|
Brad Hefta-Gaub
|
1e91f74ce7
|
clean up some uneedded nullptr checks, make them asserts
|
2017-02-23 13:32:35 -08:00 |
|
Seth Alves
|
2c42309aaa
|
perfer tablet over other overlays for mouse-clicks
|
2017-02-23 13:32:24 -08:00 |
|
Andrew Meadows
|
ed932fead5
|
Merge pull request #9611 from kunalgosar/AvatarEntityMapMetaObj
Add QMetaObject for AvatarEntityMap
|
2017-02-23 13:27:55 -08:00 |
|
Menithal
|
4d98cc436b
|
Finished up Edit.js
|
2017-02-23 23:20:21 +02:00 |
|
Ryan Huffman
|
c8ec5cbf5d
|
Fix coding standard issues in shortbow
|
2017-02-23 13:15:14 -08:00 |
|
Brad Hefta-Gaub
|
8cb8d686ec
|
more cleanup and some CR feedback fixes
|
2017-02-23 13:09:39 -08:00 |
|
Chris Collins
|
57beeeefb9
|
Merge pull request #9739 from sethalves/stable-to-master-update
Stable -> Master update
|
2017-02-23 13:09:00 -08:00 |
|