Commit graph

67360 commits

Author SHA1 Message Date
Stephen Birarda
ec354620db
Merge pull request from huffman/feat/client-texture-selection-baking
Add support for client texture selection
2018-05-04 16:14:43 -07:00
Clément Brisset
39e2a78b1a
Merge pull request from Atlante45/fix/spec-cam-punchlist
Multifrustum queries punchlist
2018-05-04 15:50:44 -07:00
John Conklin II
7699a19267
Merge pull request from Zvork/procedural
Fixed procedural shaders
2018-05-04 15:35:57 -07:00
John Conklin II
b314d496ec
Merge pull request from zfox23/MS14699_clearCachedPasscode
MS14699: Prevent Wallet passcode from being sticky in certain cases
2018-05-04 15:22:41 -07:00
Clément Brisset
e1efd30143
Merge pull request from birarda/bug/update-hoek-for-CVE
update server-console dependency hook
2018-05-04 15:04:12 -07:00
Clement
ad60a79180 Fix for android builds 2018-05-04 14:43:28 -07:00
Clement
b04c5bd0db CR 2018-05-04 14:43:16 -07:00
Liv
e4b6686e1c
Merge pull request from ctrlaltdavid/21862
Clear entity selection handles and update list when entities are deleted
2018-05-04 14:23:37 -07:00
Zach Fox
53fe0bc616 MS14699: Prevent Wallet passcode from being sticky in certain cases 2018-05-04 14:08:21 -07:00
John Conklin II
c7bc479c60
Merge pull request from hyperlogic/bug-fix/case-14639
Fix for crash deep in QML after useFullAvatarURL
2018-05-04 11:33:28 -07:00
Ryan Huffman
e1d218bb57 Bump asset packet version for texture meta 2018-05-04 11:25:11 -07:00
Ryan Huffman
fc3fd75100 Fix TextureMeta::deserialize not handling json parse errors 2018-05-04 11:13:24 -07:00
Howard Stearns
1733d867ba
Merge pull request from zfox23/MS14758_fixAvatarGiftingSwitch
MS14758: Fix avatar reset when gifting worn avatar
2018-05-04 11:01:27 -07:00
Ryan Huffman
ac0fe62086 Make ModelBaker ktx extension check case-insensitive 2018-05-04 10:53:10 -07:00
Stephen Birarda
a922471b9a
Merge pull request from huffman/fix/logging-size-limit
Fix old log files not being cleaned up
2018-05-04 10:46:13 -07:00
Stephen Birarda
8ded6c76ec
Merge pull request from ctrlaltdavid/21729-a
Remove deprecated location.domainId from API
2018-05-04 10:35:41 -07:00
John Conklin II
32086def18
Merge pull request from samcake/blue
Master: Fixing the strobing light effect, aka Translucent lighting by ponctual lights
2018-05-04 10:25:57 -07:00
Stephen Birarda
8c6d83ad67
Merge pull request from SimonWalton-HiFi/connection-stats-dump
Add a utility function to dump ConnectionStats
2018-05-04 10:19:25 -07:00
Zach Fox
e48d39ec38 MS14758: Fix avatar reset when gifting worn avatar 2018-05-04 10:10:48 -07:00
Ken Cooke
b657c28a9b
Merge pull request from kencooke/glm-asan-warnings
Fix asan warnings
2018-05-04 09:24:51 -07:00
Ken Cooke
73ce02ce75 Fix asan warnings in byte-unpacking functions 2018-05-04 07:56:44 -07:00
Clement
487a63025f Fix warning 2018-05-03 18:19:52 -07:00
Clement
d87cd2af6e Update avatar query names 2018-05-03 18:19:30 -07:00
Clement
d7e9fdc6a4 Bump Avatar Query packet version 2018-05-03 18:19:29 -07:00
Clement
27c471ee97 Move all wire frustums to conical frustums 2018-05-03 18:19:29 -07:00
Clement
3283c5eaec Fix inverted comparaison 2018-05-03 18:19:29 -07:00
Clement
b4ea32bbb6 Correctly compute conical frustum for irregular ones 2018-05-03 18:19:29 -07:00
Clement
67c119cd2e Send Entity Query via conical frustums 2018-05-03 18:19:29 -07:00
Clement
e400eb4ed2 Rename ViewFrustum packets to AvatarQuery 2018-05-03 18:19:29 -07:00
Clement
d774dc2060 WIP Only use conical frustums on the server 2018-05-03 18:19:29 -07:00
Stephen Birarda
21396287a4
Merge pull request from Atlante45/fix/spec-cam-av
Add support for multifrustum avatar queries
2018-05-03 18:18:51 -07:00
Stephen Birarda
31d5633b4a
Merge pull request from Atlante45/fix/spec-cam
Add support for multifrustum entity queries
2018-05-03 18:13:51 -07:00
Stephen Birarda
79576e0f48 update request and dependency hoek for CVE 2018-05-03 17:16:35 -07:00
Clement
7fe16f82fb Move variables to Agent.cpp 2018-05-03 17:08:17 -07:00
Stephen Birarda
48aeebdd50
Merge pull request from Atlante45/fix/crashes-hotfix
Keep CrashpadClient around for application lifetime
2018-05-03 16:48:29 -07:00
Stephen Birarda
e9c3fb914f
Merge pull request from Atlante45/fix/wizard-wording
Fix wizard wording
2018-05-03 16:47:16 -07:00
John Conklin II
7d424edd9b
Merge pull request from Atlante45/fix/asan-warning
Fix uninitialized boolean (asan warning)
2018-05-03 15:46:37 -07:00
MiladNazeri
6efb710222
Merge pull request from ctrlaltdavid/21856-g
JSDoc fixes
2018-05-03 14:06:23 -07:00
Anthony J. Thibault
fc9bd7f905 Fix for crash deep in QML after useFullAvatarURL
Here we avoid calling FSTReader::downloadMapping() from within MyAvatar::useFullAvatarURL().
This prevents the error case where a QEventLoop is entered during QML execution.
2018-05-03 14:06:06 -07:00
samcake
767e6b15f3 Fixing the local lighting on translucents bug 2018-05-03 11:42:06 -07:00
Clement
cefb8457ea Fix uninitialized boolean 2018-05-03 11:17:31 -07:00
Ken Cooke
028ea11405
Merge pull request from kencooke/audio-asan-warnings
Fix asan warnings
2018-05-03 10:32:59 -07:00
Howard Stearns
d4a562ee47
Merge pull request from zfox23/MS14741_fixAppUninstallation
Fix MS14741, allowing uninstall of apps whose scripts are no longer running
2018-05-03 10:02:20 -07:00
Ken Cooke
9e7fceccc3
Merge pull request from kencooke/audio-meter-default
Fix MS14640: Default audio meter overlay to "on"
2018-05-03 09:29:30 -07:00
Ken Cooke
2a7e8c6f89 Default audio meter overlay to "on" 2018-05-03 07:15:18 -07:00
David Rowe
e95c38d939 Merge branch 'master' into 21856-g
# Conflicts:
#	libraries/model-networking/src/model-networking/TextureCache.h
2018-05-03 21:03:14 +12:00
MiladNazeri
8e214d8ee8
Merge pull request from ctrlaltdavid/21856-d
List which contexts each namespace and class is available in
2018-05-03 01:29:14 -07:00
Seth Alves
b68d9ecd68
Merge pull request from druiz17/attachments-disappearing
fixing avatr attachments not being visible when coming out of first person
2018-05-02 18:50:41 -07:00
Ken Cooke
3e77d946ea Silence warnings of unused functions 2018-05-02 17:48:04 -07:00
Sam Gateau
361fe75dc3
Merge pull request from jherico/fix/14638
Make resource swapchains immutable
2018-05-02 17:21:45 -07:00