Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-12 14:34:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
84580 commits 76 branches 59 tags 1.2 GiB
Commit graph

4774 commits

Author SHA1 Message Date
Kalila
58fde3c159
Merge pull request #1090 from digisomni/feature/expand-kick-functionality 
Add improved functionality for `Users.kick` API.
 2021-03-28 21:05:59 -04:00
Kalila L
fd592dfb06 CR. 2021-03-19 04:11:26 -04:00
Kalila
9dadc44f6c
Update UserActivityLoggerScriptingInterface.h 2021-03-18 17:57:49 -04:00
Kalila
da7bcf1584
Update NodeList.cpp 2021-03-18 17:53:21 -04:00
Kalila L
0216b34681 State of refactoring 2021-03-17 19:37:06 -04:00
Dale Glass
1ed767df41 Implement Linux machine fingerprints 
We do this by using either /etc/machine-id, or hashing the MACs of all
non-virtual networking devices.

We make this fingerpint unique to our platform by adding our own string
to the hash, and add some stretching for good measure. This way Vircadia's
fingerprint isn't going to match the system's ID or anything another
application generates.
 2021-03-14 21:15:33 +01:00
Kalila
5e2cc4c4bf
Merge pull request #1068 from daleglass/fix_resource_totals 
Set resource total size to content size when using a qrc:// resource
 2021-03-11 18:30:56 -05:00
Kalila L
78cc98bc7b Add improved functionality for Users.kick API. 
Add banByUsername, banByFingerprint, and banByIP parameters.
 2021-03-11 01:03:54 -05:00
Kalila L
b5d89c44bf Rename "INITIAL_STARTUP_LOCATION" -> "PRELOADED_STARTUP_LOCATION". 2021-03-08 02:01:53 -05:00
Kalila L
3ed98d0f3e Add "ScriptGatekeeper" class and "PRELOADED_SCRIPT_WHITELIST" variable. 2021-03-08 02:00:34 -05:00
Dale Glass
b102b3477a Set resource total size to content size when using a qrc:// resource 
When a Resource is requested from qrc://, the Resource::handleDownloadProgress
event is never called, and therefore _bytesTotal remains at zero. This confuses
ResourceCache later, which has a sanity check that doesn't pass when resources
are retrieved, yet no data accumulates.

Fixes #1065
 2021-02-26 20:04:53 +01:00
Kalila
ba54dd755c
Merge pull request #1034 from vircadia/v2021.1.0-rc 
merge V2021.1.0 rc into master
 2021-02-22 00:16:36 -05:00
HifiExperiments
30c4779eeb name all the threads 2021-02-13 20:17:28 -08:00
HifiExperiments
f46f1b2219 Merge branch 'master' into alignment 2021-02-11 18:07:23 -08:00
HifiExperiments
b296fff197 add text alignment property 2021-02-10 21:45:53 -08:00
HifiExperiments
0645866549
Merge branch 'master' into billboard 2021-02-09 23:28:58 -08:00
HifiExperiments
ae26416c59
Merge branch 'master' into billboard 2021-02-09 22:57:10 -08:00
HifiExperiments
f1d6a4e3d4
Merge branch 'master' into feature/web-entity-user-agent 2021-02-09 22:47:46 -08:00
Kalila L
c57b1a92f3 CR + update user agent. 2021-01-30 02:16:53 -05:00
Kalila L
82313eccbf Add userAgent property for web entities. 2021-01-21 01:51:37 -05:00
HifiExperiments
030524c3ee CR and actually send property over wire 2021-01-03 21:03:43 -08:00
HifiExperiments
6e0bad814e working on billboard mode for all entity types 2021-01-03 20:33:08 -08:00
daleglass
f894a0a141
Merge pull request #877 from vircadia/feature/domain-server-reporting-socket 
Send address and port with each metaverse heartbeat.
 2020-12-26 20:40:58 +01:00
Kalila L
16eca5d855 Get most 'project-athena' -> 'vircadia' references. 2020-12-13 04:42:34 -05:00
Kalila L
5d4612e400 Update 'kasenvr' -> 'vircadia' 2020-12-10 18:56:57 -05:00
Kalila L
97681786cd Potentially fix STUN IP+Port init for heartbeat issue? 2020-11-25 04:54:47 -05:00
kasenvr
b091557cb5
Merge pull request #848 from humbletim/smarter-scriptcache 
ScriptCache: add local file change detection
 2020-11-05 17:20:04 -05:00
humbletim
a7fb294a1b
Update libraries/networking/src/ResourceRequest.cpp 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-10-31 13:39:29 -04:00
kasenvr
2b511d8c45
Merge pull request #613 from odysseus654/pr/registerListener 
[enhancement] transition listener registration from member string name to member string pointer
 2020-10-29 17:13:05 -04:00
humbletim
ae7aa3eb88 update ScriptCache to detect local script modifications 2020-10-29 11:30:33 -04:00
humbletim
f012772fa3 add toHttpDateString helper method 2020-10-29 11:29:26 -04:00
Kalila L
413c21f482 Append Vircadia to the environment variable for the metadata exporter port. 2020-10-19 01:07:07 -04:00
kasenvr
87d4fddb40
Merge branch 'master' into feature/transparent-web-entities 2020-09-26 01:25:02 -04:00
Dale Glass
9b4d115a5d Review fixes 
Make it ignore a // at the beginning of the URL
 2020-09-24 19:37:14 +02:00
Dale Glass
1d58ac4d79 Sanitize the URL further by removing leading slashes and any duplicated ones 2020-09-23 23:33:22 +02:00
David Rowe
1cb1c63228 Tidying 2020-09-23 23:08:02 +12:00
David Rowe
c6ba42b7d6 Fix calculating external resource paths 2020-09-23 22:15:13 +12:00
David Rowe
ba7242f4dc Script.getExternalPath() and related JSDoc 2020-09-23 17:23:40 +12:00
David Rowe
3344c7423d Fix up types 2020-09-22 20:52:15 +12:00
Kalila L
9db333a555 Update CDN URLs in NetworkingConstants.h 2020-09-21 16:07:56 -04:00
Kalila L
7b7038fae1 Bunch of URL updates later... 2020-09-21 00:54:49 -04:00
Kalila L
0d08254a07 Some updates to URLs in C++ 2020-09-20 23:37:29 -04:00
Kalila L
b1f32dd9ac Merge branch 'pr/691' into fix/URL-migrations 2020-09-20 17:58:26 -04:00
Kalila L
f465ecb53b Update STUN server 2020-09-20 17:56:54 -04:00
Dale Glass
929f395503 Spend more less time in the lock, do a sanity check, normalize path 2020-09-20 02:09:54 +02:00
Dale Glass
2de0934598 Some missed review fixes 2020-09-20 01:57:44 +02:00
David Rowe
2c84478dc1 Register metatype 2020-09-20 01:29:32 +02:00
Dale Glass
89aa89e9d3 Review fixes (non-working) 
Trouble with:

> Script.getExternalPath(Script.ExternalPaths.Assets, "hi")

[UncaughtException evaluate] Error: cannot call getExternalPath(): argument 1 has unknown type `ExternalResource::Bucket' (register the type with qScriptRegisterMetaType()) in about:console:1 [Backtrace] <global>() at about:console:1
TypeError: cannot call getExternalPath(): argument 1 has unknown type `ExternalResource::Bucket' (register the type with qScriptRegisterMetaType())
 2020-09-20 01:29:32 +02:00
Dale Glass
792854ccb7 Applied code formatter 2020-09-20 01:29:32 +02:00
Dale Glass
84e01630ee Make base URLs for external resources modifiable 2020-09-20 01:29:32 +02:00