Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-11 17:14:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
87467 commits 67 branches 56 tags 1.2 GiB
Commit graph

4994 commits

Author SHA1 Message Date
Heather Anderson
9f5e06503a begin identifying Packet Type ID=1 as "domain connect" for a future version of the protocol, so we can detect protocol breaks when we shift to using this as our domain connect packet. 2021-04-24 23:28:53 -07:00
Julian Groß
1cadfcc284
Merge branch 'master' into feature/qt-update 2021-04-16 01:55:51 +02:00
Kalila
a35b9c4563
Merge pull request #1126 from daleglass/hash_all_fingerprints 
Hash Windows and Mac machine fingerprints.
 2021-04-15 17:46:17 -04:00
David Rowe
312dc9ccb7 Update Chrome browser version 2021-04-12 15:30:23 +12:00
Kalila
333e3d49c6
Merge pull request #1143 from daleglass/add-missing-override 
Add missing override keywords.
 2021-04-02 16:24:12 -04:00
Dale Glass
6e9e11993c Add missing override keywords. 
Fixes warnings like:

/libraries/entities-renderer/src/RenderableTextEntityItem.h:47:18: warning: ‘virtual bool render::entities::TextEntityRenderer::needsRenderUpdate() const’ can be marked override [-Wsuggest-override]
   47 |     virtual bool needsRenderUpdate() const;
      |                  ^~~~~~~~~~~~~~~~~
 2021-04-02 00:04:46 +02:00
Dale Glass
2de61898e1 Review style fixes 2021-04-01 23:41:37 +02:00
David Rowe
6a7f4a0426 Redisplay "continue without avatar entities" when re-enter address 2021-03-29 21:14:00 +13:00
David Rowe
c45007d038 Merge branch 'master' into fix/can-rez-attachment 
# Conflicts:
#	interface/src/Application.h
 2021-03-29 15:28:08 +13:00
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
Dale Glass
e02daae267 Hash Windows and Mac machine fingerprints. 
Now all the fingerprints are hashed. This has the following benefits:

* It doesn't expose raw system IDs. The actual ID is hashed with a
  value unique to Vircadia, so that it doesn't match any other identifier.

* It should be more future-proof. Apple doesn't promise that the platform
  ID will have any particular format. The hashing means it doesn't matter
  if it stops being a valid UUID at some point.
 2021-03-28 17:08:26 +02:00
David Rowe
41bd3c10c0 Fix up node permissions debug order 2021-03-23 15:22:08 +13: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
David Rowe
ddcfe6351b Tidying 2021-03-18 12:13:41 +13:00
David Rowe
2030d24523 Tidying 2021-03-16 14:37:16 +13:00
David Rowe
0c1f775dc5 Don't warn user if permission removed while they're connected 2021-03-15 20:55:42 +13:00
David Rowe
0adfd8b806 Ask user whether to continue to a domain if their wearables won't rez 2021-03-15 16:30:46 +13: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
David Rowe
db0f7a9884 Fix flash of avatar entity when domain restarts 2021-03-11 20:14:03 +13: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
David Rowe
091efaee60 Don't rez own avatar entities if don't have permission 2021-03-09 11:15:26 +13: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
David Rowe
dd674c395e Default canRezAvatarEntities on domains without new permission 2021-03-05 16:27:32 +13:00
David Rowe
8b6182e756 Misc fixes 2021-03-01 15:24:13 +13: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 L
6b5cffa5e4 Initial pass at adding canRezAvatarEntities. 2021-02-26 06:14:06 -05: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
Dale Glass
e0e4ffb214 Review fixes 2020-09-20 01:29:32 +02:00
Dale Glass
cd901f9e32 Move enum into ExternalResources namespace 2020-09-20 01:29:32 +02:00
Dale Glass
c65cc9570d Prototype for moving content away from hifi infrastructure 2020-09-20 01:29:32 +02:00
Kalila L
8a71c66fcc Added comments. 2020-09-16 20:01:47 -04:00
kasenvr
fd5b84b6eb
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-09-16 19:57:58 -04:00
Kalila L
4224c8120f Set metaverse and ice to Vircadia again. 2020-09-15 21:06:27 -04:00
Kalila L
9b0ac9d75f Update endpoints to be consistent and work with the updates. 2020-09-15 21:05:00 -04:00
Kalila L
e3a6dc18af Add support for metaverse API's with paths. 2020-09-15 20:07:00 -04:00
Kalila L
d5f5c76878 Update NetworkingConstants.h URLs to Vircadia Metaverse. 2020-09-15 19:57:30 -04:00
kasenvr
370c2700be
Merge pull request #640 from kasenvr/feature/package-startup-interface 
Add ability to package Interface with a custom startup location (also tacks on some build docs updates)
 2020-09-12 22:17:25 -04:00
kasenvr
bbc5044451
Merge pull request #639 from ctrlaltdavid/enhancement/domain-login-items 
Don't display domain log-in items unless relevant
 2020-09-02 18:51:14 -04:00
kasenvr
60e6d99aff
Merge branch 'master' into feature/package-startup-interface 2020-09-01 17:40:37 -04:00
Kalila L
58c1518d0b Updating some .cpp and .h URLs. 2020-08-31 01:00:05 -04:00
Kalila L
6e39e048be First pass at centralizing some URLs. 2020-08-31 00:43:30 -04:00
Kalila L
26d4eb8e67 Updates per CR. 
Co-Authored-By: David Rowe <david@ctrlaltstudio.com>
 2020-08-24 18:43:03 -04:00
Kalila L
a2bd06993f Add option to build an Interface to go to specified address by default. 2020-08-23 01:49:32 -04:00
David Rowe
eb8ae74245 Tidying 2020-08-23 16:06:16 +12:00
David Rowe
67100b5a20 Display domain login menu item only on domains that have domain login 2020-08-23 15:56:27 +12:00
David Rowe
29e5bfdb94 Ignore residual "connection denied" packets from previous domain 2020-08-23 14:34:10 +12:00
Kalila L
a032ac66b1 Update AddressManager links to NetworkingConstants. 2020-08-22 20:03:57 -04:00
David Rowe
6926cd205a Ignore residual "connection denied" packets from previous domain 2020-08-20 17:12:57 +12:00
David Rowe
662b2bfc5e Handle log in for multiple domains with domain login 2020-08-20 12:32:03 +12:00
Kasen IO
c70a041490 Merge branch 'master' into feature/domain-metadata-exporter 2020-08-18 21:35:51 -04:00
Kasen IO
fe1ea6ca72 Bump protocol. 2020-08-18 02:22:56 -04:00
David Rowe
bf60cf5b4c Tidying 2020-08-18 16:33:47 +12:00
David Rowe
9bb5add1ca Don't display domain login status in title bar unless relevant 2020-08-18 11:42:35 +12:00
Kasen IO
ca97450464 Centralizing some more networking constants. 2020-08-17 02:44:26 -04:00
Heather Anderson
34e3d9dd2b improved listener lifetime controls (in case a deferred invoke takes longer than expected) 2020-08-09 15:44:41 -07:00
Heather Anderson
2e5244663e transition listener registration from member string name to member string pointer 2020-08-09 14:57:00 -07:00
David Rowe
8f0b33b54d Miscellaneous tidying 2020-08-06 00:04:22 +12:00
Kasen IO
6b0fc8fd66 Titlebar now responds correctly to domain logged in state. 2020-08-05 02:18:01 -04:00
Kasen IO
0e8f019b8a Further things kinda working. 2020-08-04 20:00:24 -04:00
David Rowe
3a43283e7b Provide domain name to domain login dialog 2020-08-04 19:42:02 +12:00
David Rowe
bc56eb5ac7 Update to work with WordPress plugin 2020-08-04 17:12:31 +12:00
David Rowe
257eadc99f "Unable connect to this domain" message box after login if can't connect 2020-08-03 16:12:13 +12:00
David Rowe
26e6ce07d7 Further networking tidying 2020-08-03 11:26:11 +12:00
David Rowe
43b6e77235 Tidy networking code 2020-08-03 09:17:12 +12:00
David Rowe
c3769a5f74 Get WordPress API path from domain server settings 2020-08-02 17:33:13 +12:00
David Rowe
8cdd76a42e Verify user at domain server 2020-08-02 16:17:04 +12:00
David Rowe
15c6baceb8 Send OAuth2 username and tokens to domain server 2020-08-01 18:57:21 +12:00
David Rowe
aff3275207 Initial OAuth2 login working 2020-08-01 10:17:27 +12:00
David Rowe
56ba137ee3 Get OAuth2 URL from server settings 2020-07-31 20:48:27 +12:00
David Rowe
c3d248a404 Merge branch 'oauth2-wordpress' into feature/oauth2-login 2020-07-31 15:20:32 +12:00
Kasen IO
5706a42b56 Implement further handling of Interface OAuth2 
This is preliminary, needs to be revisited in a more dynamic and clean fashion with time.
 2020-07-29 01:53:21 -04:00
David Rowe
429b4ceefa Flesh out domain groups code 2020-07-28 21:23:55 +12:00
David Rowe
ed44438387 Fix domain login dialog disappearing when teleport to domain 2020-07-25 21:46:18 +12:00
David Rowe
34eb74ac00 Update copyrights 2020-07-25 16:26:57 +12:00
David Rowe
82252cdc08 Get basics working 2020-07-25 16:22:52 +12:00
David Rowe
9bb913983d Stub out basics for displaying the domain login dialog 2020-07-25 15:31:17 +12:00
David Rowe
d923936854 Merge branch 'master' into feature/oauth2-master-update 2020-07-25 10:06:18 +12:00
David Rowe
0b667e34a2 Regularize naming 2020-07-24 22:02:23 +12:00
David Rowe
6d310eb999 Generate "NotAuthorizedDomain" condition 2020-07-24 21:22:00 +12:00
David Rowe
9b13f0bebb Merge branch 'feature/oauth2-groups' into feature/oauth2-login-required 2020-07-24 11:14:47 +12:00
David Rowe
2e9355da58 Distinguish not logged into metaverse vs domain 2020-07-24 11:13:41 +12:00
David Rowe
07504232a9 Move new connection refused reason to end to maintain compatability 2020-07-24 08:43:40 +12:00
Kasen IO
a5d0c80c87 Revert "Remove supposedly unused logic?" 
This reverts commit 9fd3f764ec.
 2020-07-23 00:37:50 -04:00
Kasen IO
9fd3f764ec Remove supposedly unused logic? 2020-07-23 00:18:11 -04:00
Kasen IO
d3320ab17b Separate domain vs metaverse login denials for Interface. 2020-07-23 00:18:04 -04:00
David Rowe
e4c9657ab9 Initial auxiliary groups code 2020-07-23 16:08:09 +12:00
Kasen IO
ad2c3f08e6 Update further links. 2020-07-10 18:50:58 -04:00
Kasen IO
629b3c084c Update user agent to use "Vircadia" + update getUserAgent function to use the same. 2020-07-10 00:08:46 -04:00
Kasen IO
4b1e82fc0b Move user agent to networking constants. 2020-07-08 14:18:24 -04:00
kasenvr
b7b902b755
Merge pull request #459 from ctrlaltdavid/feature/tutorial-menu-item 
Add Help > Tutorial menu item
 2020-07-02 17:10:38 -04:00
Kasen IO
6129981459 Merge branch 'master' into feature/domain-metadata-exporter 2020-06-29 23:26:14 -04:00
kasenvr
32ef399302
Merge pull request #447 from ctrlaltdavid/fix/reloading-serverless 
Fix reloading content in serverless domain
 2020-06-18 17:29:31 -04:00
kasenvr
63e3c001c3
Merge pull request #411 from Misterblue/fix/central-metaverse-urls 
Move metaverse server URL info into central files for easier updating
 2020-06-18 17:23:05 -04:00
kasenvr
13451bd275
Merge pull request #384 from JulianGro/rebrand 
Rebranding stuff
 2020-06-18 17:12:47 -04:00
kasenvr
953ade0e98
Merge pull request #280 from daleglass/prometheus_exporter 
Add Prometheus exporter
 2020-06-18 17:08:39 -04:00
Julian Groß
18318fdf71
Merge branch 'v2020.2.2-rc' into rebrand 2020-06-18 09:16:47 +02:00
Kasen IO
7be55e19a7 Merge branch 'master' into feature/domain-metadata-exporter 2020-06-15 22:51:56 -04:00
Kasen IO
7c264e7d85 First pass at adding domain metadata exporter. 2020-06-15 22:51:51 -04:00
David Rowe
9367ea9e7f "file:///" is valid address in AddressManager.handleLookupString() JSDoc 2020-06-16 12:25:59 +12:00
Robert Adams
3878ad6df6 Move metaverse server URL info into NetworkingConstants.h (for C++ 
code) and into shared.js (for JS code).
Modify references to the metaverse server from constants to
    references to the new central definitions.
 2020-06-13 07:04:58 -07:00
David Rowe
2bc3047db1 Fix reloading content in serverless domain 2020-06-13 11:03:19 +12:00
Dale Glass
b681f99d21 Rename the crash reporting settings to force new default value 
Doing this ensures the new default applies to all clients, without
having to reset the configuration.
 2020-06-11 20:00:47 +02:00
Dale Glass
02eb4ccd33 Disable crash logger by default 2020-06-11 01:26:21 +02:00
motofckr9k
3d05cdd61e Merge remote-tracking branch 'refs/remotes/kasen/master' 
Conflicts:
	BUILD_WIN.md
	CODING_STANDARD.md
	LICENSE
	cmake/installer/installer-header.bmp
	cmake/installer/installer.ico
	cmake/installer/uninstaller-header.bmp
	interface/resources/images/about-vircadia.png
	interface/resources/images/vircadia-logo.svg
	interface/resources/qml/LoginDialog.qml
	interface/resources/qml/dialogs/TabletLoginDialog.qml
	interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
	interface/src/Application.cpp
	pkg-scripts/athena-server.spec
	scripts/system/more/app-more.js
	scripts/system/more/css/styles.css
	scripts/system/more/more.html
 2020-06-10 02:49:13 +02:00
Dale Glass
a8bd627cda Add Prometheus exporter 
Exports domain statistics for the domain on port 9703 (officially reserved)
 2020-06-07 02:47:39 +02:00
kasenvr
1a46b28b71
Merge pull request #62 from HifiExperiments/blendshapes 
Support blendshapes on model entities
 2020-05-31 18:34:42 -04:00
kasenvr
8157be5b5a
Merge pull request #405 from kasenvr/v0.86.0-k2.1 
Merge K2.1 into Master
 2020-05-30 18:49:38 -04:00
motofckr9k
d406b81b47 Big rebrand 2020-05-22 20:35:27 +02:00
kasenvr
7996698c8f
Merge branch 'master' into fix/other-renamings 2020-05-18 15:10:32 -04:00
Kasen IO
430d748b29 Bump packet version size up. 2020-05-07 21:33:20 -04:00
HifiExperiments
405d557725
Merge branch 'master' into blendshapes 2020-05-07 13:38:59 -07:00
HifiExperiments
8017e30ab9
Merge branch 'master' into blendshapes 2020-05-07 13:27:22 -07:00
HifiExperiments
3bf690571c
Merge branch 'master' into zoneOcclusion 2020-05-07 13:13:20 -07:00
Heather Anderson
e29271d8ca rename variables from "is crash enabled" to "is crash monitor enabled" (suggested by Thijs Wenker <me@thoys.nl>) 
added a debug message giving the current state of the debug monitor switch (ignoring whether Crashpad support is compiled)
 2020-04-25 20:32:38 -07:00
Heather Anderson
9187a680cd
Apply suggestions from code review 
Adding suggested changes from ctrlaltdavid

Co-Authored-By: David Rowe <david@ctrlaltstudio.com>
 2020-04-10 17:10:41 -07:00
David Rowe
ffeb37e7aa Merge remote-tracking branch 'hifi/master' into merge-hifi-master 
# Conflicts:
#	CMakeLists.txt
#	README.md
#	cmake/externals/glad32es/CMakeLists.txt
#	cmake/externals/glad41/CMakeLists.txt
#	cmake/externals/glad45/CMakeLists.txt
#	cmake/externals/polyvox/CMakeLists.txt
#	cmake/externals/quazip/CMakeLists.txt
#	cmake/externals/vhacd/CMakeLists.txt
#	cmake/init.cmake
#	cmake/ports/hifi-deps/CONTROL
#	cmake/ports/sdl2/CONTROL
#	cmake/ports/sdl2/disable-hidapi-for-uwp.patch
#	cmake/ports/sdl2/enable-winrt-cmake.patch
#	cmake/ports/sdl2/fix-arm64-headers.patch
#	cmake/ports/sdl2/fix-x86-windows.patch
#	cmake/ports/sdl2/portfile.cmake
#	cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
#	cmake/ports/tbb/portfile.cmake
#	hifi_vcpkg.py
#	interface/src/avatar/MyAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
#	libraries/avatars/src/AvatarData.h
#	libraries/entities-renderer/src/RenderableEntityItem.h
#	libraries/entities/src/EntityItem.cpp
#	libraries/entities/src/EntityItem.h
#	libraries/fbx/src/GLTFSerializer.cpp
#	libraries/graphics-scripting/src/graphics-scripting/Forward.h
#	libraries/networking/src/AddressManager.cpp
#	libraries/networking/src/DomainHandler.h
#	libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
#	libraries/render-utils/src/HighlightEffect.cpp
#	libraries/render-utils/src/MeshPartPayload.cpp
#	libraries/render-utils/src/Model.cpp
#	libraries/render-utils/src/RenderShadowTask.cpp
#	libraries/script-engine/src/WebSocketClass.cpp
 2020-04-09 16:46:27 +12:00
Kasen IO
115c40bd54 Lots of renamings, more to come. 2020-04-07 04:56:02 -04:00
HifiExperiments
6eacc5c8c2 Merge remote-tracking branch 'upstream/kasen/core' into zoneOcclusion 2020-04-03 14:37:14 -07:00
HifiExperiments
c062cb75ae Merge remote-tracking branch 'upstream/kasen/core' into blendshapes 2020-04-03 14:35:21 -07:00
Heather Anderson
7cea4fc574 separate user activity logging from crash logging, allowing people to say "no" to tracking while still sending crashes 2020-04-03 02:38:53 -07:00
kasenvr
e6bf1ffb77
Merge pull request #175 from ctrlaltdavid/fix/server-logs-filling 
Fix server logs filling up with "/"s
 2020-03-03 23:53:50 -05:00
David Rowe
fae237ffa7 Fix server logs filling up with /s 2020-02-19 10:46:17 +13:00
David Rowe
166c7809a9 Fix missing "no connection" dialog for invalid serverless domain URLs 2020-02-07 10:09:37 +13:00
David Rowe
82a0308a64 Save the last visited domain URL 2020-02-07 10:08:51 +13:00
David Rowe
fa30866701 Remember serverless HTTP and HTTPS domains 2020-02-06 07:02:05 +13:00
David Rowe
46173439ed Enable serverless domains via HTTP and HTTPS 2020-02-01 12:46:28 +13:00
Marcus Llewellyn
6ac090dea5 Quick fix for the metaverse API 
We did have the dfault metaverse API as metaverse.projectathena.io, but that doesn't not yet exist, and it turns out we can't just do a redirect. So for now changing it to metaverse.highfidelity.com
 2020-01-14 20:33:39 -06:00
Marcus Llewellyn
e5dd23b922
Merge pull request #33 from kasenvr/feature/metaverse-url-switching 
Ability to change Metaverse API from setting
 2020-01-14 18:40:04 -06:00
HifiExperiments
bc319cb340 zone occlusion 2020-01-11 22:29:07 -08:00
HifiExperiments
ef8f085b47 support blendshapes on model entities 2020-01-05 02:37:44 -08:00
David Rowe
2dd981493e Update classes' JSDoc per @hideconstructor 2019-12-23 14:13:48 +13:00
Kasen IO
c34cd996df change Metaverse API from setting 2019-12-20 11:39:05 +01:00
Brad Hefta-Gaub
bdce8134fc
Merge pull request #16509 from makitsune/domain-server-ports 
Added environment variables to change domain server ports
 2019-12-16 15:15:49 -08:00
Maki
a7851c9205 Fixed type conversions for environmental domain ports 
Signed-off-by: Kasen IO <kasenvr@gmail.com>
 2019-12-12 23:09:18 -05:00
Maki
1ef45b703c Added environment variables to change domain server ports 
Signed-off-by: Kasen IO <kasenvr@gmail.com>
 2019-12-12 23:09:18 -05:00
David Rowe
204215c573 Typo 2019-12-10 07:49:37 +13:00
David Rowe
3a48a97a90 AddressManager JSDoc 2019-12-10 07:34:17 +13:00
Zach Fox
04fe2988f5 Working 2019-12-05 18:50:31 -08:00
Zach Fox
c96c684400 Initial path to fixing screenshare auth race condition 2019-12-05 15:47:43 -08:00
Howard Stearns
11aa2e829f
Merge pull request #16540 from SimonWalton-HiFi/screenshare-zone 
DEV-2700: Add screenshare property to zones and evaluate in avatar mixer
 2019-12-02 10:17:42 -08:00
Kasen IO
0b46c53df1 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 19:59:59 -05:00
David Rowe
fafb3dd30b MaterialCache JSDoc 2019-11-26 17:43:23 +13:00
David Rowe
5eb6e9dadd Add recently added properties to caches' JSDoc 2019-11-26 17:00:13 +13:00
Simon Walton
6e23924ed9 Add screenshare zone-property - WIP 2019-11-25 13:22:35 -08:00
Howard Stearns
854d84912e
Merge pull request #16511 from howard-stearns/fix-lookupurl-helper-regex 
fix handleUrl helper regex
 2019-11-21 11:38:47 -08:00
Maki
96a09a894a Fixed type conversions for environmental domain ports 2019-11-20 09:13:08 +00:00
Howard Stearns
2cc39a2f32 fix handleUrl helper regex 2019-11-19 10:51:20 -08:00
Maki
cd5ea20cca Added environment variables to change domain server ports 2019-11-19 12:35:06 +00:00
David Rowe
adaa061690 Replace "AvatarIsland" with "DomainName" in AddressManager JSDoc 2019-11-19 10:32:38 +13:00
Zach Fox
8aea0dd951 Merge in Howard's 'screenshare presence' open PR 2019-11-13 10:11:16 -08:00
Kalila R
fd7ac223b0 activitylogger still disabled but does not output to console 2019-11-11 20:08:03 -05:00
Anthony J. Thibault
389f5a1d33 ARKit Blendshape hookup work 2019-10-16 10:36:39 -07:00
Clement
3b21dfcd0a CR 2019-10-10 17:49:51 -07:00
Clement
390c7b14c9 Don't post account settings after pull 
Account settings would always get pushed after a pull even if they
hadn't changed
 2019-10-10 15:55:19 -07:00
Maia Hansen
6b5f90f641
Merge pull request #16315 from jherico/qt_5.13 
Qt 5.13 changes
 2019-10-09 15:04:07 -07:00
Brad Davis
06871a707e Fix byteswap 2019-10-08 16:11:48 -07:00
Brad Davis
960cab9994 Qt 5.13 warnings & fixes 2019-10-08 15:40:13 -07:00
Howard Stearns
9d17c32ff4
Merge pull request #16309 from SimonWalton-HiFi/assignment-client-logging-for-paging 
DEV-2329: Identify Alerting requirements for Assignment Client reliable operation
 2019-10-08 15:35:22 -07:00
David Rowe
f224832d27 Merge branch 'master' into DOC-111 2019-10-08 20:44:13 +13:00
Simon Walton
f73a7c0883 Modified AC logging for paging requirements 2019-10-07 17:35:14 -07:00
Shannon Romano
24dc4b19ae
Merge pull request #16285 from SimonWalton-HiFi/domain-server-logging-for-paging 
DEV-2292: Alerting requirements for domain-server failure cases
 2019-10-04 14:01:56 -07:00
Simon Walton
db14cdbd22 Tweak 'critical' status for some logging 2019-10-04 09:56:35 -07:00
Simon Walton
d5d1c08da0 Adjust some of the logging 2019-10-03 16:50:24 -07:00
Simon Walton
59b41e29f4 Call out DS DS logging critical for Lilypad 2019-10-03 12:15:45 -07:00
Roxanne Skelly
fb8a0e3aee handle urls in the form of <domain>:<port>/path 2019-10-02 16:40:27 -07:00
Roxanne Skelly
9af7b904ab CR related fixes 2019-10-01 17:04:07 -07:00
Roxanne Skelly
0589cb360a Merge branch 'master' of https://github.com/highfidelity/hifi into dev1836 2019-10-01 15:38:02 -07:00
Roxanne Skelly
d0cb489247 DEV-1836 - handle urls in the form 'hifi://<domain>:<port> 2019-10-01 15:34:39 -07:00
Sam Gateau
1e2cab52b9 FIx an error, bad copy paste leading to a bug 2019-09-30 12:55:04 -07:00
Sam Gateau
8c9cf7bddd Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-27 19:01:19 -07:00
Howard Stearns
f513b65e9d
Merge pull request #16256 from SimonWalton-HiFi/supress-repeated-socket-logging 
BUGZ-1543: Suppress repeated socket logging
 2019-09-27 12:45:17 -07:00
Simon Walton
93a1cbdcf9 Use direct initialization instead of copy initialization for atomics 2019-09-26 16:45:29 -07:00
Simon Walton
f17a1c17f3 Only print Qt event-queue size on change of error code 2019-09-26 15:46:11 -07:00
Simon Walton
85c9f4d95f Use the FCDEBUG mechanism to throttle udt::Socket log-spam 2019-09-26 12:10:59 -07:00
Sam Gateau
675dbc3f7f Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-26 12:06:09 -07:00
Sam Gateau
9d999baab2 FIrst pass to clean up before pushing a pr: 2019-09-26 11:59:01 -07:00
Simon Walton
bbf43050b1
Merge pull request #16244 from SimonWalton-HiFi/connection-class-ignored-unused 
BUGZ-1503: Don't move unused Connection class upon address change
 2019-09-26 11:42:50 -07:00
Sam Gateau
ba11c3e702 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-25 17:54:21 -07:00
Atlante45
ff3f26eeae Limit the amount of account settings pull retries 2019-09-25 14:55:44 -07:00
Simon Walton
6d7f711990 Remove typo that somehow got into a comment 2019-09-25 09:33:49 -07:00
Sam Gateau
0d9cd69d94 SImplifying Page.js, and adding a REsourceInspector 2019-09-24 18:10:57 -07:00
Clement
5067729c52 Add flag for account settings feature 2019-09-24 17:40:34 -07:00
Clement
96b58756b1 Add flag for account settings feature 2019-09-24 16:50:10 -07:00
Simon Walton
4f11e46b5e Don't move Connection class to changed address until it's used 2019-09-24 16:39:59 -07:00
Sam Gateau
69ccc47bda Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-23 18:59:20 -07:00
Sam Gateau
4480d56433 Rendering just the overlay layer and improving the resoruceCache inspector to sort 2019-09-20 19:00:03 -07:00
Clement
1924dad51b CR changes 2019-09-20 13:30:08 -07:00
Sam Gateau
ee5de175eb Better monitoring of the resource loading in flights 2019-09-19 16:56:55 -07:00
David Rowe
605d272392 Merge branch 'master' into DOC-111 2019-09-20 10:25:21 +12:00
Clement
282aa70db3 Sync settings on logout/shutdown 2019-09-19 13:45:34 -07:00
David Rowe
d5e08d19e3 Fix JSDoc for miscellaneous white space issues 2019-09-20 08:17:24 +12:00
Sam Gateau
a87db2636c SOme stuff workbetter 2019-09-18 18:25:42 -07:00
Clement
86196cfd62 Add account settings to the AccountManager 2019-09-17 18:48:14 -07:00
David Rowe
dff37a71eb Fix JSDoc markup HTML issues 2019-09-17 16:26:09 +12:00
Shannon Romano
36bc538354
Merge pull request #16181 from SimonWalton-HiFi/connection-addr-change-logic 
BUGZ-1432: Fix logic for address-change to address already being used
builds failing, now android is failing for nothing related to this PR
 2019-09-12 15:54:55 -07:00
Simon Walton
2d68cfa5e7 Use unique_lock::unlock() instead of unique_lock::release() 
... which actually has the opposite effect
 2019-09-12 12:04:24 -07:00
Shannon Romano
fa8c959699
Merge pull request #16133 from ctrlaltdavid/DOC-59 
DOC-59: Assets JSDoc
 2019-09-11 17:19:45 -07:00
Simon Walton
639beee6cb Fix logic for reliable service address-change when new add already used 2019-09-11 15:21:49 -07:00
Shannon Romano
65d0bb1342
Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc 
Kasen Plugin Infrastructure v½ Codename "Modkit Mini"
 2019-09-11 13:04:01 -07:00
Andrew Meadows
7a5cb0d555 fix typo 2019-09-06 17:23:38 -07:00
Andrew Meadows
e97d3df637 bump version number 2019-09-06 17:23:38 -07:00
humbletim
271fac4bca Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge 2019-09-05 09:46:21 -04:00
David Rowe
f384b79bf5 Merge branch 'master' into DOC-59 2019-09-04 15:47:23 +12:00
David Rowe
9457aed631 Tidying and polishing Assets JSDoc 2019-09-04 15:43:18 +12:00
David Rowe
8820d1d76b Assets API cache methods 2019-09-04 13:48:06 +12:00
Simon Walton
784903fe33 Use UTC with QDateTime rather than local time 2019-08-28 17:57:09 -07:00
Simon Walton
d9558e35c3 Fix typo in last commit; remove useless call of getGuessedLocalAddress; logging tweak 2019-08-23 13:19:31 -07:00