Commit graph

3890 commits

Author SHA1 Message Date
David Rowe
2669a39e0f Deprecate Agent API items that shouldn't be exposed in the API 2018-05-18 07:32:25 +12:00
David Rowe
6db4dd8673 Merge branch 'master' into 21872-b
# Conflicts:
#	interface/src/ui/Snapshot.h
2018-05-17 20:11:14 +12:00
John Conklin II
aca261af3e
Merge pull request #12939 from Cristo86/android_places_goto
Android Search & Go To
2018-05-15 16:43:38 -07:00
David Rowe
1ca6bd2f0b location getter/setter JSDoc 2018-05-15 17:37:45 +12:00
David Rowe
8ea3a733ca Resource API JSDoc stub 2018-05-15 10:32:36 +12:00
David Rowe
b445371ad8 Resources API JSDoc stubs 2018-05-12 16:24:34 +12:00
David Rowe
cf9053c873 Merge branch 'master' into 21872-b 2018-05-12 10:50:31 +12:00
Gabriel Calero
9b5da09dc7 Fix connection issue syncing two AccountManagers 2018-05-11 18:08:56 -03:00
Stephen Birarda
4f7ce7345d
Merge pull request #13045 from SimonWalton-HiFi/domain-checkins-tweak
Reset pending domain check-in count more frequently
2018-05-11 13:31:03 -07:00
David Rowe
3891ebe703 Agent API JSDoc stubs 2018-05-11 20:20:07 +12:00
John Conklin II
bc9e403ab9
Merge pull request #13005 from SimonWalton-HiFi/hmac-auth2
Use HMAC authentication for network packets - 2nd attempt
2018-05-10 14:38:18 -07:00
Simon Walton
9b6225db40 Bump default packet version 20 -> 21 2018-05-09 14:29:10 -07:00
Simon Walton
0349847857 Add comment re threading issues 2018-05-08 17:46:25 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
Stephen Birarda
ec354620db
Merge pull request #12956 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 #13074 from Atlante45/fix/spec-cam-punchlist
Multifrustum queries punchlist
2018-05-04 15:50:44 -07:00
Simon Walton
00d2f9494b Change HMACAuth::calculateHash to just call existing methods 2018-05-04 15:07:20 -07:00
Ryan Huffman
e1d218bb57 Bump asset packet version for texture meta 2018-05-04 11:25:11 -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
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
Clement
d7e9fdc6a4 Bump Avatar Query packet version 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
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
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
Clement
cefb8457ea Fix uninitialized boolean 2018-05-03 11:17:31 -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 #13049 from ctrlaltdavid/21856-d
List which contexts each namespace and class is available in
2018-05-03 01:29:14 -07:00
Ryan Huffman
697fde4a1a Cleanup meta texture related changes 2018-05-02 13:31:32 -07:00
Gabriel Calero
c15ef56d90 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-05-02 14:38:10 -03:00
Ken Cooke
a4105f1081
Merge pull request #13052 from kitely/fix-gcc-warnings
Eliminated warnings in gcc
2018-05-02 06:43:32 -07:00
Oren Hurvitz
26ffb3213c Changed "[[gnu::fallthrough]]" to "// FALLTHRU" 2018-05-02 07:06:47 +01:00
David Rowe
48632be3c2 Fix up cache APIs' JSDoc 2018-05-02 16:12:48 +12:00
Clement
2ad948c462 Bump ViewFrustum packet version 2018-05-01 18:03:21 -07:00
Clement
30d14dcd45 Push packet version 2018-05-01 18:02:29 -07:00
Stephen Birarda
12f7dd93dc
Merge pull request #13068 from birarda/67-to-master
merge RC67 back to master
2018-05-01 17:24:46 -07:00
Simon Walton
bbcb07d9ab Brute force it with isDomainServer() 2018-05-01 15:07:44 -07:00
Simon Walton
0627099667 In packetSourceAndHashMatchAndTrackBandwidth() check LocalID after check for DS source
Makes check more robust in case domain server itself reaches this point,
since LimitedNodeList::getDomainLocalID() debug-asserts.
2018-05-01 14:33:48 -07:00
David Rowe
0653f49efe Remove deprecated location.domainId from API
location.domainID is available, instead.
2018-05-02 09:31:24 +12:00
Stephen Birarda
f5441c05b3 Merge branch 'master' of github.com:highfidelity/hifi into 67-to-master 2018-05-01 14:18:24 -07:00
Ryan Huffman
24ac342c6b Add support for client texture selection 2018-05-01 14:11:31 -07:00
David Rowe
1aa28b7f54 Merge remote-tracking branch 'upstream/master' into 21856-d
# Conflicts:
#	interface/src/LODManager.h
2018-05-02 07:50:55 +12:00
Stephen Birarda
24dc1c930e Merge branch 'RC66.2' of github.com:highfidelity/hifi into 66-2-to-67 2018-05-01 10:54:35 -07:00
Simon Walton
cfc5892d63 Only clear check-in count on Domain Query related responses 2018-04-30 13:41:56 -07:00
Stephen Birarda
ed47cd8458 add a missing unsafe_erase for local node ID map 2018-04-30 12:35:48 -07:00
John Conklin II
ed39b4f63e
Merge pull request #13014 from druiz17/fix-localhost-port
hide default port from addresses, fix localhost scheme
2018-04-30 10:10:06 -07:00
Oren Hurvitz
a226790295 Eliminated warnings in gcc
Note that the call to encodeNode() in FBXWriter.cpp can never be reached, so it's safe to remove it.
2018-04-30 15:05:27 +03:00
David Rowe
2cc3ed6287 List which contexts each namespace and object is available in 2018-04-28 20:00:28 +12:00
Simon Walton
bfbded7bec Reset pending domain checkins in more locations 2018-04-27 16:57:24 -07:00