Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 13:31:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67288 commits 75 branches 59 tags 1.2 GiB
Commit graph

3847 commits

Author SHA1 Message Date
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 3201d2ba21, reversing
changes made to c0f20900a0.
 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