Commit graph

67516 commits

Author SHA1 Message Date
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 #13101 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 #13018 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 #13069 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 #13091 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 #13023 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 #13099 from kencooke/glm-asan-warnings
Fix asan warnings
2018-05-04 09:24:51 -07:00
Dante Ruiz
d44882e6dc fix entity highlighting during edit mode 2018-05-04 09:01:24 -07:00
Dante Ruiz
a57c72df6e fix entity highlighting during edit mode 2018-05-04 08:53:49 -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 #12990 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 #12930 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
NissimHadar
1f691edf0d Removed platform code (was used for MD files). 2018-05-03 17:04:17 -07:00
NissimHadar
da621d99d3 Removed unneeded pragma. 2018-05-03 16:52:03 -07:00
Stephen Birarda
48aeebdd50
Merge pull request #13007 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 #13084 from Atlante45/fix/wizard-wording
Fix wizard wording
2018-05-03 16:47:16 -07:00
NissimHadar
e07039266d Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-03 16:44:57 -07:00
NissimHadar
887b8285cd Removed unneeded pragma. 2018-05-03 16:44:04 -07:00
John Conklin II
ef997e647a
Merge pull request #13088 from samcake/rc67
RC67: Fixing the strobing light effect, aka Translucent lighting by ponctual lights
2018-05-03 16:21:14 -07:00
John Conklin II
182e7c4b5f
Merge pull request #13086 from samcake/rc66.2
RC 66.2: Fixing the strobing light effect, aka Translucent lighting by ponctual lights
2018-05-03 15:48:41 -07:00
John Conklin II
7d424edd9b
Merge pull request #13092 from Atlante45/fix/asan-warning
Fix uninitialized boolean (asan warning)
2018-05-03 15:46:37 -07:00
John Conklin II
b426c4e85d
Merge pull request #13089 from druiz17/RC-67-fix-highlighting
RC 67 fix entity highlighting
2018-05-03 15:34:21 -07:00
NissimHadar
2c6c0a25fc Add testSnapshotLocation parameter to takeSnapshot. 2018-05-03 15:15:30 -07:00
NissimHadar
fe9c6052f7 Added quitWhenFinished parameter to the command line. 2018-05-03 15:02:11 -07:00
NissimHadar
beb19c53fa Added date and time to auto-generated scripts. 2018-05-03 15:00:14 -07:00
NissimHadar
3b566332c6 Shutdown interface when test script finishes. 2018-05-03 14:34:12 -07:00
NissimHadar
3a5425122b Shutdown interface when test script finishes. 2018-05-03 14:31:01 -07:00
MiladNazeri
6efb710222
Merge pull request #13076 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
Dante Ruiz
a6eab29b14 fixing edge case 2018-05-03 13:09:45 -07:00
Dante Ruiz
cffb008c31 fixing edge case 2018-05-03 13:07:32 -07:00
samcake
767e6b15f3 Fixing the local lighting on translucents bug 2018-05-03 11:42:06 -07:00
Dante Ruiz
c258e8c248 fix highlighting issues 2018-05-03 11:38:59 -07:00
Dante Ruiz
4793cddde6 fix highlighting issues 2018-05-03 11:27:07 -07:00
NissimHadar
46f461dcdb Don't display crash message if running from command line with a test script. 2018-05-03 11:20:37 -07:00
Clement
cefb8457ea Fix uninitialized boolean 2018-05-03 11:17:31 -07:00
samcake
60a49c3f7c applying the local lights on translucent fix 2018-05-03 10:37:29 -07:00