David Back
3241c18271
first pass cloneables WIP
2018-05-09 18:10:40 -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
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 7378c87ade92bf99f436
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
Oren Hurvitz
de0ea15f0a
Fixed based on PR review
2018-04-18 10:26:55 +03: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
Oren Hurvitz
e610443353
Fixed banning users: it didn't work because we tried to send a Reliable packet using sendUnreliablePacket()
2018-04-16 15:36:37 +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
Simon Walton
f4bd1f5ed7
Add definition for NetworkPeer::NULL_LOCAL_ID to (hopefully) satisfy MacOS
2018-04-02 09:45:46 -07:00
Simon Walton
efb1fdbc0d
Local IDs - add an explicit null value, use it for replicated packets
2018-03-30 18:29:26 -07:00
Simon Walton
734b48eee0
Local IDs - Reviewer's suggested improvements
2018-03-30 17:27:52 -07:00
Gabriel Calero
b123b67134
Merge branch 'master' of https://github.com/highfidelity/hifi into android_goto_splash
2018-03-30 15:38:36 -03:00
Simon Walton
e9ec4df36f
Gcc complained about superfluous const qualifier
2018-03-29 14:10:31 -07:00
Simon Walton
1b0b280f3a
Fix SequenceNumberStats, misc. clean-up
2018-03-29 10:47:11 -07:00
Simon Walton
b409e04734
Handle all case of nodes being deleted from nodelist
...
Delete erased nodes from local ID mapping, as this uses
SharedPointer. Don't keep the mapping from local IDs
to UUIDs in GateKeeper as it isn't used.
2018-03-28 17:42:23 -07:00
Simon Walton
f823f63211
Add domain local ID to DomainServerList
...
Also handle domain local ID for 'domain sourced' packets;
bump packet version.
2018-03-28 13:27:43 -07:00
Simon Walton
bed4033554
Local node IDs now working correctly
...
Move typedef to single location; fixes for replicated packets
(probably still not correct); reserve zero as local ID;
pass domain server's local ID in domain server list;
other tweaks.
2018-03-27 18:18:14 -07:00
Simon Walton
d3464378b7
Short local source IDs - checkpoint
...
DS assigns 16-bit IDs as well as UUIDs; ACs track mappings;
nodes use short IDs in packets. Initial setup works; then
fails prob. due to DS UUID.
2018-03-27 13:46:58 -07:00
Simon Walton
4ec77e3af6
WIP - assign short IDs to nodes and distribute them.
2018-03-26 14:57:59 -07:00
Seth Alves
6948de7e24
default to serverless tutorial
2018-03-26 14:32:40 -07:00
Gabriel Calero
0068e5dc0f
Fix account info persistence after login
2018-03-26 14:56:05 -03:00
Simon Walton
b5f165d481
Store a short ID with the Node on the domain-server side
2018-03-23 16:55:19 -07:00
Gabriel Calero
8558759d41
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-03-23 16:56:53 -03:00
Simon Walton
68ab0eed68
HMACAuth - fix some more spacing issue
2018-03-22 14:44:25 -07:00
Seth Alves
b551b144a7
remove unneeded setIsConnected call
2018-03-21 19:15:27 -07:00
Simon Walton
3e1a333776
Just bump default packet version
2018-03-21 18:40:54 -07:00
Simon Walton
16b0c48b73
HMACAuth - improved syntax for new
2018-03-21 18:32:25 -07:00
Simon Walton
29b4353397
Spacing clean-up
2018-03-21 18:26:32 -07:00
Simon Walton
d58b2acc8c
Use raw pointer for possibly-opaque openssl context type
2018-03-21 18:25:26 -07:00
Simon Walton
3ced1c8923
More Openssl 1.1 (Android) fixes
2018-03-21 17:31:54 -07:00
Simon Walton
ef08770235
Missed reviewer change
2018-03-21 17:17:24 -07:00
Simon Walton
755d89464f
HMAC Auth - reviewer-requested changes
2018-03-21 17:15:49 -07:00
Simon Walton
64973aa334
OpenSSL HMAC changes for Android
...
Looks like Android uses OpenSSL 1.1.0, which provides
an allocator for its HMAC context.
2018-03-21 17:06:15 -07:00
Seth Alves
4f20a87c6d
review
2018-03-21 16:26:02 -07:00
Seth Alves
916ed3a0d4
review
2018-03-21 16:18:31 -07:00
Seth Alves
ae94ab3d67
make sure _sockAddr is cleared if the new url isn't a hifi:// one
2018-03-21 15:28:12 -07:00
Simon Walton
fb16e772ba
Move HMACAuth class to networking lib
...
Also reverts addition of openssl headers to shared lib.
Commit will require rerunning cmake.
2018-03-21 15:25:50 -07:00
Seth Alves
ef52ae13ee
rearrange domain-url-changed signals
2018-03-21 14:30:00 -07:00
Simon Walton
eb04f77c3d
HMAC Auth - code modifications requested by reviewer
2018-03-21 14:04:34 -07:00
Gabriel Calero
11bfc1ca74
Add Goto as splash screen in android
2018-03-21 17:40:14 -03:00
Simon Walton
8ce03d65b7
Only update the connection secret UUID if it changes
...
Rekeying the openssl HMAC context occasionally causes
hash generation errors. It is not clear why. The Node
secret never seems to change to check for this before
rekeying. Also other clean-up for PR.
2018-03-20 18:16:45 -07:00
Seth Alves
585a523823
unmangle merge
2018-03-20 11:17:56 -07:00
Stephen Birarda
cd887b5faf
Merge pull request #12654 from huffman/feat/content-zip-upload
...
Add support for .content.zip content uploads
2018-03-20 10:07:53 -07:00
Simon Walton
2a486a4c14
Bump packet version numbers
2018-03-19 17:48:11 -07:00
Simon Walton
020a6a6585
Take out hash timing code
2018-03-19 15:57:32 -07:00
Simon Walton
da7298b8bd
Support only HMAC - take out passing around of secret UUID
...
Also other clean-up for production use.
2018-03-19 15:28:44 -07:00
Seth Alves
f61504b814
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-19 14:59:18 -07:00
John Conklin II
91db0ab00f
Merge pull request #12650 from ctrlaltdavid/21798
...
Messages API JSDoc
2018-03-19 13:56:57 -07:00
Simon Walton
af21cac0c2
Fixes for gcc
2018-03-19 12:53:16 -07:00
Seth Alves
af42b5e93f
trying to fix expandToLocalDataAbsolutePath
2018-03-19 09:42:03 -07:00
Seth Alves
a144b738e5
fix ACs
2018-03-16 22:39:43 -04:00
Simon Walton
db8a1ccb3e
Set HMAC key once and reuse OpenSSL context
...
Store the HMAC wrapper in Node. Unfortunately requires a
lot of plumbing down to NLPacket. Added a mutex to the
wrapper since suspicious crashes occurred.
Authentication times seem to be comparable to existing MD5.
2018-03-16 18:03:13 -07:00
Seth Alves
7a7a9e9af0
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-16 16:55:47 -04:00
Simon Walton
480f76c21a
Quick trial of HMAC-MD5 auth + timings
2018-03-16 11:50:03 -07:00
Simon Walton
82b68fce8d
Quick attempt at using openssl HMAC in NLPacket
2018-03-15 18:32:48 -07:00
Ryan Huffman
bee8899c46
Add support for uploading .content.zip files
2018-03-15 12:17:21 -07:00
David Rowe
369970f120
Messages API JSDoc
2018-03-15 15:23:02 +13:00
Seth Alves
afcbb6751b
disable loading of serverless-domains over http(s), for now
2018-03-14 15:53:35 -07:00
Seth Alves
e63558dc05
code review
2018-03-14 14:33:17 -07:00
Seth Alves
93978209d8
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-14 13:49:46 -07:00
Ryan Huffman
11a3a86af3
Merge branch 'master' of github.com:highfidelity/hifi into feat/obj-baker-update
2018-03-13 14:49:26 -07:00
John Conklin II
a0e2fc3665
Merge pull request #12564 from SimonWalton-HiFi/record-avatar-pr
...
Fixes for missing avatar on record replays
2018-03-13 14:10:10 -07:00
Seth Alves
274c3224a2
fix going to a dns name or ip address
2018-03-09 16:58:50 -08:00
Seth Alves
e102db109d
unmange merge
2018-03-09 13:04:50 -08:00
Seth Alves
621e6a62d6
merge from upstream
2018-03-09 12:07:24 -08:00
Seth Alves
58bc42990c
merge from upstream
2018-03-09 12:03:26 -08:00
Brad Hefta-Gaub
6b55fa1fcd
Merge pull request #12539 from ctrlaltdavid/21702
...
Remove deprecated Window.location.protocolVersion() function from API
2018-03-09 08:52:55 -08:00
NissimHadar
fda32e4aa4
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-08 12:16:36 -08:00
Sam Gondelman
1e9cfe29f2
Merge pull request #12388 from highfidelity/android
...
Android Tip
2018-03-08 10:18:35 -08:00
Seth Alves
6c831bbc3a
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-08 07:42:30 -08:00
Seth Alves
7d7570798b
oops, forgot to flip booleans along with logic
2018-03-07 18:31:13 -08:00
Seth Alves
4ed0c24a73
use static QStrings rather than functions
2018-03-07 18:25:55 -08:00
Clément Brisset
b7ac07f590
Merge pull request #12589 from highfidelity/RC65
...
merge back RC65 to master after RC hotfixes
2018-03-07 17:22:41 -08:00
Ryan Huffman
004e15d2d9
Update ATP to be optional in ResourceManager for OBJBaker
2018-03-07 16:31:41 -08:00
Seth Alves
12eb0e4109
name emit from AddressManager like an event
2018-03-07 15:36:35 -08:00
Seth Alves
4505fce508
use const QUrls rather than functions
2018-03-07 13:39:44 -08:00
Simon Walton
17c12fde9c
Fix for HandshakeRequest logic
2018-03-06 16:32:04 -08:00
Gabriel Calero
069d3e40bc
Merge branch 'android' into android_bubble_fix
2018-03-06 18:58:49 -03:00
Seth Alves
79aa450332
some code-review induced changes
2018-03-06 13:11:09 -08:00
Simon Walton
547d86a2d5
Improve debugging diagnostic
2018-03-05 18:10:15 -08:00
Simon Walton
8fb3015ec8
Fix for missing avatar on second replay
...
Fixes a logic problem in the handshake request handling; deals with
KillAvatar from the Agent by removing the node-linked data, not
the actual Node; tweaks some of the network debug output.
2018-03-05 16:51:05 -08:00
Brad Davis
8bfc610cfb
Merge remote-tracking branch 'upstream/master' into android
2018-03-05 11:48:58 -08:00
NissimHadar
1eb0dde3d2
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-05 11:36:39 -08:00
Seth Alves
a6c3bcd8d8
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-05 08:51:12 -08:00
Seth Alves
dabdff9b2b
don't add extra entry in history when going 'back' from a serverless domain
2018-03-03 08:33:42 -08:00
Seth Alves
606face7c0
gather together the url scheme constants, name them consistently
2018-03-02 20:39:38 -08:00
Seth Alves
fdb53b6543
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-02 19:27:53 -08:00
Atlante45
85b4c3b422
Protect session UUID from concurrent read/writes
2018-03-02 17:34:18 -08:00
NissimHadar
8536b44c61
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-02 16:09:06 -08:00
Stephen Birarda
4f151a4237
fix ASCII art for packet headers in NLPacket
2018-03-02 12:41:22 -08:00
Seth Alves
507dfa5ec3
more code review response
2018-03-02 11:35:34 -08:00
Seth Alves
45157a16f2
merge from upstream
2018-03-02 09:57:27 -08:00
Seth Alves
82bfd25d8b
fix placename in title-bar, fix domain-spawning-point
2018-03-02 09:54:54 -08:00
NissimHadar
000b08f7c0
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-02 08:07:01 -08:00
David Rowe
7107e1539f
Remove deprecated Window.location.protocolVersion() function from API
2018-03-02 13:45:31 +13:00
NissimHadar
0f2cf8ea85
Re-implemented shadow controls.
2018-03-01 14:24:20 -08:00
Seth Alves
b18993e09f
put serverless domain into history if going to a different serverless domain
2018-03-01 12:19:42 -08:00
Seth Alves
33065fb51c
more consistent variable names. rework DomainManager and AddressManager methods to take a url rather than host and port
2018-03-01 11:07:37 -08:00
Seth Alves
a44ddbbc26
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-27 14:09:05 -08:00
Brad Davis
136ced98c3
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-27 13:44:00 -08:00
John Conklin II
b4000c04bc
Merge pull request #12432 from highfidelity/feat/content-settings
...
Add content archives to domain server web interface
2018-02-27 13:30:53 -08:00
SamGondelman
0fca56eef0
Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"
...
This reverts commit 3201d2ba21c0f20900a0
2018-02-27 11:33:05 -08:00
Gabriel Calero
efba05b9a0
Merge branch 'android' into android_bubble_fix
2018-02-27 16:23:51 -03:00
Seth Alves
9a25128b44
remove some leftover code
2018-02-27 09:39:15 -08:00
Seth Alves
7976a1f95e
make localhost work again
2018-02-27 09:24:48 -08:00
Stephen Birarda
aa7bd2066a
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
2018-02-26 17:02:00 -08:00
Seth Alves
666fa77be2
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-26 13:53:20 -08:00
Ryan Huffman
24da043937
Merge pull request #12437 from sethalves/fix-qt-5-10-udt
...
fix Qt 5.10 udt packet reading
2018-02-26 13:50:41 -08:00
Brad Davis
b9387f2a21
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-26 13:18:14 -08:00
Brad Davis
3e552e5739
Fix warnings
2018-02-26 09:53:35 -08:00
Gabriel Calero
7982d8da58
Set bubble default state off for android.
2018-02-26 13:06:22 -03:00
Seth Alves
5632f9d8fd
clean up debug prints. put filename in window title-bar when connected to a serverless domain
2018-02-23 16:46:42 -08:00
Seth Alves
3be1988260
fix expandToLocalDataAbsolutePath
2018-02-23 14:27:28 -08:00
Brad Davis
0550138609
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-23 12:48:10 -08:00
Atlante45
c106fee659
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration
2018-02-22 19:45:43 -08:00
Brad Davis
aeb29db37d
Merge remote-tracking branch 'upstream/stable' into android_stable
2018-02-22 17:35:00 -08:00
Seth Alves
50cec08efe
look offline when visiting a serverless domain
2018-02-22 13:43:41 -08:00
Seth Alves
d27cbac3f8
loading directly into a serverless domain works. user will have edit permissions
2018-02-21 18:21:45 -08:00
Stephen Birarda
946474c615
do not init caching for asset requests in domain-server
2018-02-21 16:33:58 -08:00
Seth Alves
f44749387a
cleanups
2018-02-21 15:24:54 -08:00
Seth Alves
e36f39781b
remove some debug prints, fix serverless to servered domain transition
2018-02-21 15:06:23 -08:00
Dante Ruiz
268a7026b4
fix history and double loading of serverlessDomain
2018-02-21 13:41:43 -08:00
Seth Alves
6f70b21126
fix include filename
2018-02-20 16:56:46 -08:00
Dante Ruiz
43ce9508ee
better way to handle urls
2018-02-20 14:27:21 -08:00
Dante Ruiz
8fc50222f5
allow json for uses /~/ for file paths
2018-02-20 11:20:42 -08:00
Nissim Hadar
b2a06cdb98
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
...
# Conflicts:
# libraries/entities/src/EntityItemProperties.cpp
# libraries/entities/src/ShapeEntityItem.h
# libraries/networking/src/udt/PacketHeaders.cpp
# libraries/networking/src/udt/PacketHeaders.h
2018-02-19 13:05:57 -08:00
Seth Alves
3b99f8d4da
Merge branch 'fix-qt-5-10-udt' of github.com:sethalves/hifi into serverless-domains
2018-02-19 12:04:13 -08:00
Seth Alves
25c34403db
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-19 11:24:42 -08:00
Seth Alves
0a92596452
don't rely on return value of pendingDatagramSize() when hasPendingDatagrams() is false
2018-02-18 10:04:22 -08:00
Seth Alves
7a5415efbe
working on getting history to work with serverless domains
2018-02-18 07:55:43 -08:00
Seth Alves
3027d3461e
Qt 5.10 seems to indicate pendingDatagramSizes of 0. Reading from these would block and causes an QAbstractSocket::TemporaryError to be thrown
2018-02-17 15:24:50 -08:00
Seth Alves
10935f2cc2
save non hifi domain urls to settings
2018-02-16 17:31:23 -08:00
Seth Alves
ed5b28aa2a
clear octree on any sort of domain change
2018-02-16 17:15:15 -08:00
Dante Ruiz
acaf4f0d1d
fix merge conflict
2018-02-16 15:14:18 -08:00
Seth Alves
367d715ff8
set connected flag when going to serverless domain
2018-02-16 15:08:37 -08:00
Dante Ruiz
aea517ddba
fix merge conflict
2018-02-16 15:00:08 -08:00
Dante Ruiz
e0bbc57f6c
support relative file path from appliaction directory
2018-02-16 14:48:38 -08:00
Seth Alves
de9ac7f4a5
working to integrate serverless domains into history, etc
2018-02-16 13:56:22 -08:00
Seth Alves
b2a4181bc0
working to integrate serverless domains into history, etc
2018-02-16 12:58:50 -08:00
Brad Davis
458b944d2d
Use pikachu for android builds
2018-02-16 09:29:31 -08:00
Seth Alves
abc467b919
load json from indicated file to populate serverless domain
2018-02-15 16:09:03 -08:00
Seth Alves
17e2db96c6
make domain-manager and pals be still when interface is in serverless mode
2018-02-15 15:19:50 -08:00
Atlante45
272f95efa2
Specify wich packet can ignore verification at DS level
2018-02-15 10:09:21 -08:00
Ryan Huffman
cb9327e030
Add entity file sync and domain content backups
2018-02-15 10:09:20 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals
2018-02-14 17:33:01 -08:00
Nissim Hadar
054b2bf3e2
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
...
# Conflicts:
# libraries/networking/src/udt/PacketHeaders.cpp
# scripts/system/html/js/entityProperties.js
2018-02-14 17:10:07 -08:00
Stephen Birarda
6ba2f4b279
Merge pull request #12286 from Atlante45/feat/asset-server-backup
...
Add asset server backups capabilities to the Domain Server
2018-02-13 17:40:11 -07:00
SamGondelman
4500ed17e7
merge from master
2018-02-13 13:58:39 -08:00
Elisa Lupin-Jimenez
a61021f46c
Merge pull request #12272 from elisa-lj11/2d-images
...
2d images (JPG and PNG) are now supported as (quasi) entities
2018-02-13 11:44:02 -08:00
Nissim Hadar
34aab4a9c8
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
...
# Conflicts:
# libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
2018-02-12 17:50:39 -08:00
John Conklin II
d084e58f48
Merge pull request #12328 from Atlante45/fix/misc-bugs
...
Misc bug fixes
2018-02-12 14:31:38 -08:00
Atlante45
e15ab2ca6c
CR
2018-02-12 13:32:48 -08:00
SamGondelman
9e8aa1898c
warnings, load material from URL, shapeID -> parentMaterialID
2018-02-12 12:50:09 -08:00
SamGondelman
5337377ef5
Merge remote-tracking branch 'upstream/master' into decals
2018-02-09 14:40:20 -08:00
Atlante45
87f77b6257
Asset Server Backup
2018-02-09 11:32:42 -08:00
NissimHadar
950a62f3f8
Global graphics flag default to on.
...
Added cast shadows flag to zone/keylight.
Exit the RenderShadowMap job if current keylight doesn't cast shadows.
2018-02-08 15:52:20 -08:00
John Conklin II
0e3bcda859
Merge pull request #12336 from sethalves/bump-av-protocol-more
...
try harder to bump avatar-mixer protocol version
2018-02-06 09:12:03 -08:00
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets
...
Remove some unneeded Qt dependencies
2018-02-05 15:32:54 -08:00
Seth Alves
14d8259a5e
try harder to bump avatar-mixer protocol version
2018-02-05 11:54:48 -08:00
SamGondelman
4d4294dd6a
Merge remote-tracking branch 'upstream/master' into decals
2018-02-02 16:50:01 -08:00
SamGondelman
d7f4b033e8
wip finish adding material entity
2018-02-02 16:49:33 -08:00
Stephen Birarda
eb9d100fc8
reset count on conn refusal, soft reset DH in Interface on limit reached
2018-02-02 13:47:48 -08:00
Stephen Birarda
e16a3859c2
reset silent check in packet check on domain connection reset
2018-02-02 13:47:48 -08:00
Atlante45
8ebb3e52d8
Misc bug fixes
2018-02-02 13:10:49 -08:00
Elisa Lupin-Jimenez
3d000d3d01
changed packet number
2018-02-02 10:08:39 -08:00
David Rowe
f46362906d
Bump avatar mixer packet version
2018-02-02 10:02:20 +13:00
Brad Hefta-Gaub
f5614618b9
Merge pull request #12288 from ctrlaltdavid/21729
...
Add location.domainID as a synonym for location.domainId
2018-01-31 13:50:48 -08:00
Sam Gateau
9a131cfab6
Merge pull request #12265 from SamGondelman/resourceCache
...
Remove unnecessary invokeMethod from ResourceCache::getResource
2018-01-31 09:35:05 -08:00
David Rowe
280264d7ed
Add location.domainID as a synonym for location.domainId
...
And deprecate location.domainId.
2018-01-30 20:46:27 +13:00
MiladNazeri
9baf02b7a1
Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request
...
Leopoly_Phase1_003_Asset-Request
2018-01-29 11:40:41 -08:00
Brad Davis
0781d8eaf0
Remove some unneeded Qt dependencies
2018-01-28 22:18:24 -08:00
SamGondelman
78d72a1703
remove unnecessary invokeMethod from ResourceCache::getResource
2018-01-25 16:07:26 -08:00
humbletim
e8f0df4363
switch to bool per CR feedback
2018-01-24 14:28:22 -05:00
humbletim
3ebf322fcf
switch to foreach per CR feeddback
2018-01-24 14:13:34 -05:00
humbletim
c2ee13931e
changes per CR feedback; additional jsdoc
2018-01-24 13:38:10 -05:00
Brad Davis
fb559f3e4a
Use custom default location for android and GLES/Windows
2018-01-23 13:30:36 -08:00
Brad Davis
5bf2bda96d
Merge branch 'android' into android_new
2018-01-23 08:17:46 -08:00
humbletim
97889b30d5
remove unnecessary lambda capture
2018-01-23 03:21:19 -05:00
humbletim
3a735c1fc7
CR feedback and code cleanup
2018-01-23 03:12:26 -05:00
Brad Davis
8ae0b09ea2
Merge remote-tracking branch 'upstream/master' into android
2018-01-22 15:07:30 -08:00
Brad Davis
8f993e5a68
Merge branch 'android' into android_new
2018-01-22 12:48:38 -08:00
John Conklin II
4697c5f92c
Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar
...
Fix for avatars with crooked spine/head when exiting HMD mode
2018-01-22 11:50:44 -08:00
Brad Davis
d2fe9e2710
PR feedback
2018-01-19 20:24:34 -08:00
Anthony J. Thibault
cd4d9255bd
Added defaultPoseFlags to avatar protocol
...
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation. Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
2018-01-19 15:34:27 -08:00
humbletim
395cc663dd
reuse same disk cache as AssetClient
2018-01-19 15:10:36 -05:00
Brad Davis
3dba928b72
Merge remote-tracking branch 'upstream/android' into android_new
2018-01-19 10:36:46 -08:00
humbletim
dfb1619dc6
CR feedback; using namespace AssetUtils => inline AssetUtils::
2018-01-18 21:49:53 -05:00
Brad Davis
bdfa1273ba
Merge remote-tracking branch 'upstream/master' into android
2018-01-18 17:33:10 -08:00
Brad Davis
a4572f3f8f
Log when the file selector chooses a different file than asked for
2018-01-18 16:48:09 -08:00
Clément Brisset
37504eca15
Merge pull request #12186 from ctrlaltdavid/21702
...
Add Window.protocolSignature() as a replacement for location.protocolVersion()
2018-01-18 15:20:03 -08:00
David Rowe
8c2427dd58
Rename Window.protocolVersion() to Window.protocolSignature()
2018-01-19 09:06:16 +13:00
Atlante45
482ca3f038
Make type name hash static const
2018-01-18 10:28:43 -08:00
Brad Davis
cbb2d9d854
Merge remote-tracking branch 'upstream/master' into android
2018-01-17 17:51:39 -08:00
humbletim
49bb9420cc
Merge branch 'master' into Leopoly_Phase1_003_Asset-Request
2018-01-17 17:11:33 -05:00
