Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-14 00:31:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
68372 commits 74 branches 59 tags 1.2 GiB
Commit graph

3918 commits

Author SHA1 Message Date
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
John Conklin II
dd32ca33a5
Merge pull request #12957 from sethalves/quiet-logging 
Quiet logging
 2018-04-27 14:59:38 -07:00
Stephen Birarda
5324ea6d5d
Merge pull request #13038 from highfidelity/stable 
Merge stable to RC66.2
 2018-04-27 14:42:28 -07:00
Simon Walton
1448f3959e Add a utility function to dump ConnectionStats 2018-04-26 17:11:17 -07:00
MiladNazeri
098b432fd9
Merge pull request #13011 from ctrlaltdavid/21856-a 
Docs to JSDoc review updates
 2018-04-26 13:29:48 -07:00
Stephen Birarda
c8d7dc9b91 hide default port from addresses, fix localhost scheme 2018-04-26 13:29:26 -07:00
Stephen Birarda
97d793f867 hide default port from addresses, fix localhost scheme 2018-04-26 13:25:56 -07:00
Stephen Birarda
9f25103b09
Merge pull request #12972 from sethalves/fix-linux-clang-build 
fix linux clang build
 2018-04-26 10:46:51 -07:00
David Rowe
08dc9b133f Docs to JSDoc review 2018-04-26 21:10:28 +12:00
Simon Walton
9ef56c44a3 Merge PR12964 to not use verification if not keyed 
https://github.com/highfidelity/hifi/pull/12964
 2018-04-25 17:08:08 -07:00
Simon Walton
66bd424ae4 Bump default packet version for new HMAC 2018-04-25 14:51:11 -07:00
Simon Walton
4fa11f116f Add & use HMACAuth method that calculates hash atomically 
To avoid issues with race conditions involving separate
addData() and result() calls use a method that does
both in the lock.
 2018-04-25 14:41:16 -07:00
Stephen Birarda
956cc411d5 Merge branch 'RC66.1' of github.com:highfidelity/hifi into sixty-six-one-mergeback 2018-04-25 14:33:23 -07:00
MiladNazeri
0f87e53902
Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate 
Docs/docs to js docs update
 2018-04-25 12:26:19 -07:00
Simon Walton
21a9525a73 Version of HMACAuth with exposed lock 
Client is responsible for locking between adding and
retrieving. Fixes a likely race.
 2018-04-24 17:52:12 -07:00
Brad Hefta-Gaub
e6f15c720f
Merge pull request #12973 from birarda/bug/no-node-stats 
66.1: fix connection to start stats sending for assignments
 2018-04-24 13:23:39 -07:00
milad nazeri
23d07fa292 fixed spacing issue 2018-04-24 13:14:55 -07:00
Stephen Birarda
63491588cb Revert "Merge pull request #12690 from SimonWalton-HiFi/hmac-auth" 
This reverts commit 7378c87ade, reversing
changes made to 92bf99f436.
 2018-04-24 12:44:51 -07:00
milad nazeri
1121fe8da0 fix tabs 2018-04-23 21:47:53 -07:00
John Conklin II
91197cadcf
Merge pull request #12967 from SimonWalton-HiFi/hmac-shortid-merge-fix 
Fix for null sourceNode use
 2018-04-23 14:11:06 -07:00
Stephen Birarda
a6509f5ea7 fix connection to start stats sending for assignments 2018-04-23 13:25:18 -07:00
Seth Alves
6d8f769cf8 fix linux clang build 2018-04-23 13:18:36 -07:00
Stephen Birarda
779386fbc4 fix setting of domain local ID from domain list 2018-04-23 12:29:02 -07:00
Simon Walton
f849d6f937 Change packetSourceAndHashMatchAndTrackBandwidth logging in same manner 2018-04-23 12:26:02 -07:00
Gabriel Calero
001cd5e937 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-23 14:25:26 -03:00
milad nazeri
4ac06fe99f Updating previous jsdocs 2018-04-22 22:22:33 -07:00
milad nazeri
e9b9c05b5d removed cruft 2018-04-22 08:51:47 -07:00
Seth Alves
6fc02638d7 control verbose logging with a menu-item in developer menu 2018-04-20 16:08:57 -07:00
Simon Walton
9f9a68188d Merge remote-tracking branch 'upstream/master' into short-id 2018-04-20 11:10:21 -07:00
Seth Alves
512b1911eb
Merge pull request #12858 from ctrlaltdavid/21836 
Update location.hostname JSDoc per serverless domains
 2018-04-20 10:27:09 -07:00
John Conklin II
7378c87ade
Merge pull request #12690 from SimonWalton-HiFi/hmac-auth 
Change packet authentication to use HMAC
 2018-04-20 09:54:25 -07:00
John Conklin II
92bf99f436
Merge pull request #12786 from huffman/fix/node-list-connections 
Fix avatars not coming back when briefly disconnected from avatar mixer
 2018-04-20 09:53:50 -07:00
Ryan Huffman
9cf133cff2 Increase packet version for Ping 2018-04-20 08:25:57 -07:00
Ryan Huffman
5bd89159dd Update variable naming in NodeList from Id to ID 2018-04-20 08:25:52 -07:00
Ryan Huffman
a930e39bd4 Fix nodelist connections not resetting on both ends 
This change adds a connection ID to ping packets. Each node keeps a
connection id for each other node that it has connected to. When a node
is removed the connection id is incremented. If a node sees another node
with a higher connection id, it will reset its connection with the new
connection id, ensuring that local state is reset on both ends when
nodes lose contact.
 2018-04-20 08:25:45 -07:00
Simon Walton
377fc6d6c6 Revert to old packet version for ICE packets 
Some ICE (& STUN) packets were using the default version,
which we bumped for the HMAC change. This commit breaks
out the switch for them and reverts to 17.
 2018-04-19 16:55:32 -07:00
Gabriel Calero
adfbaac18f Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-19 19:40:00 -03:00
David Rowe
8ade4f34f4 Tweak wording 2018-04-20 10:11:01 +12:00
David Rowe
0552a7242a Further JSDoc updates for serverless domains 2018-04-20 09:52:35 +12:00
David Rowe
08defea755 Merge branch 'master' into 21836 2018-04-20 09:20:56 +12:00
Ryan Huffman
bef4eb1d05 Increase packet version for Ping 2018-04-19 14:04:17 -07:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp 
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
 2018-04-18 17:28:48 -07:00
Clément Brisset
482f8ddbff
Merge pull request #12913 from birarda/bug/login-no-perms 
delay NL reset on login until new username is known
 2018-04-18 13:31:56 -07:00
Simon Walton
01c39d4310 Use NULL_LOCAL_ID in more places, as requested by review 2018-04-18 11:53:47 -07:00
Stephen Birarda
95c172f418 Merge branch 'stable' of github.com:highfidelity/hifi into merge-back-stable-66 2018-04-17 15:34:46 -07:00
Seth Alves
515c185887 don't call setPort on hifi urls when port is 0 (unset) 2018-04-16 19:10:16 -07:00
Stephen Birarda
898d61fcf7 delay NL reset on login until new username known 2018-04-16 17:45:05 -07:00
Ryan Huffman
e9d2912576 Update variable naming in NodeList from Id to ID 2018-04-16 12:03:58 -07:00
Gabriel Calero
e3b94b163c Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-16 14:55:16 -03:00
Seth Alves
426d18ed2a code review 2018-04-13 13:20:06 -07:00
Seth Alves
a56f3f4a10 code review 2018-04-12 19:06:12 -07:00
John Conklin II
98f6899c3d
Merge pull request #12839 from SamGondelman/matMigrate 
Migrate materials from userData to materialData
 2018-04-12 18:24:33 -07:00
David Rowe
b82f2510f2 Fix location.protocol value for serverless domains 2018-04-12 08:55:47 +12:00
Gabriel Calero
578012b662 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-11 16:30:53 -03:00
David Rowe
e37655ecdc Update location.hostname JSDoc per serverless domains 2018-04-11 16:35:49 +12:00
Seth Alves
f81836c830 support specification of named landing-points in serverless-domain json files 2018-04-10 14:25:59 -07:00
SamGondelman
9b07880aab migrate materials from userData to materialData 2018-04-09 12:49:03 -07:00
John Conklin II
d281d7b2cb
Merge pull request #12819 from Atlante45/fix/location-hostname 
Fix location.hostname
 2018-04-09 09:42:41 -07:00
Gabriel Calero
b30cb25a3f Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-09 12:20:35 -03:00
Clement
dea5382991 Fix location.hostname 2018-04-06 13:19:07 -07:00
Stephen Birarda
1ff7939735 move file ~ expansion from AddressManager to DomainHandler 2018-04-06 11:05:17 -07:00
Seth Alves
8de545acdf add new address accessor for 'public' addresses, use it for snapshot and stream 2018-04-05 13:39:51 -07:00
Seth Alves
148007435e update comment 2018-04-05 13:01:31 -07:00
Seth Alves
1de878eb9c fix logic 2018-04-05 12:43:03 -07:00
Seth Alves
81ba875ad2 currentShareableAddress wont return file: urls. copy-current-address menu item uses non-shareable version 2018-04-05 12:39:49 -07:00
Ryan Huffman
2546ff91ca Fix nodelist connections not resetting on both ends 
This change adds a connection ID to ping packets. Each node keeps a
connection id for each other node that it has connected to. When a node
is removed the connection id is incremented. If a node sees another node
with a higher connection id, it will reset its connection with the new
connection id, ensuring that local state is reset on both ends when
nodes lose contact.
 2018-04-04 11:53:05 -07:00
Simon Walton
692ccfc09b Create HIFI_FCDEBUG(_ID) variants that require a category 
Original macros use default settings.
 2018-04-04 09:49:15 -07:00
Simon Walton
7d16ca9c1c Remove uses of addRepeatedMessageRegex() and its implementation 
Change to new log-message ID scheme.
 2018-04-03 17:54:01 -07:00
Simon Walton
d4ab06b1d4 Move HIFI_FDEBUG macro to LogHandler.h 
Not all uses of repeated log messages include NetworkLogging.h,
but if they use addRepeatedMessageRegex() they must include
LogHandler.h. Also add second macro for client-supplied
message ID.
 2018-04-03 15:53:12 -07:00
Simon Walton
5b0bcd76e3 Repeated logging - Fixes and clean-up 2018-04-03 12:23:21 -07:00
Simon Walton
a7fc6a2991 Repeated logs - use #define to replace qCDebug 2018-04-03 10:44:53 -07:00
Simon Walton
6d078f41e7 Use unique IDs for log strings that should have repeats supressed 2018-04-02 17:32:18 -07:00
Simon Walton
2ba64e1115 LocalID - Use tbb hash map instead of std one for better concurrency 2018-04-02 10:46:38 -07:00