Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 13:49:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
84610 commits 76 branches 59 tags 1.2 GiB
Commit graph

2249 commits

Author SHA1 Message Date
Kalila L
bc1ffa8a8d Merge branch 'master' into fix/update-api-docs 2020-09-19 23:46:13 -04:00
Kalila L
f6ec13704b Copyright header updates. 2020-09-18 16:31:57 -04:00
Kalila L
1fad06b112 Update further. 2020-09-16 23:06:02 -04:00
Kalila L
23bf8388f1 Fix metaverse URL retrieval and comment out updatePlaceNameLink until we have our own functionality. 2020-09-16 21:37:48 -04:00
kasenvr
699425254d
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-09-16 19:59:44 -04:00
kasenvr
66f953d957
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-09-16 19:59:07 -04:00
Kalila L
c5a618be8f Fix indent...? 2020-09-15 21:09:39 -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
dcbf8c7663 Agnostify language "High Fidelity" -> "Metaverse" and implement dynamic retrieval of URL for metaverse. 2020-09-15 01:31:24 -04:00
Kalila L
7a033f93da Add HTTP route to get metaverse info. 2020-09-15 00:54:52 -04:00
Kalila L
40219e6ff9 Merge branch 'master' into fix/domain-threading-defaults 2020-09-02 05:41:28 -04:00
kasenvr
e4a80a9931
Merge pull request #465 from kasenvr/feature/domain-metadata-exporter 
Domain Metadata Exporter
 2020-08-31 18:08:37 -04:00
Dale Glass
baa0fd34f4 Fix unsigned warnings 2020-08-27 19:48:27 +02:00
Kalila L
a513bba8c6 Update the domain-wizard to include threading options. 2020-08-24 22:52:18 -04:00
Kalila L
58bbab6b42 Merge remote-tracking branch 'origin/feature/domain-metadata-exporter' into fix/domain-threading-defaults 2020-08-24 19:43:26 -04:00
Kalila L
ab685838b0 Merge branch 'master' into fix/domain-threading-defaults 2020-08-24 19:43:04 -04:00
ArcadeFever
404e18296a changed url for AC script examples from HiFi to Vircadia github 2020-08-23 12:33:13 -07:00
Kalila L
ebecbcc7f7 Update JSON structure for metadata. 2020-08-21 22:00:06 -04:00
Kalila L
a24b8f0fc6 Missed a spot, was wiping thumbnail string and replacing with an array. 2020-08-21 14:08:50 -04:00
Kalila L
c81365f4f0 Update description for Prometheus exporter. 2020-08-21 13:47:59 -04:00
Kalila L
a079afbb73 Update metadata exporting. 2020-08-21 13:40:38 -04:00
Kasen IO
b7e4362553 Make empty values no longer null, add name property, rename "Hosts" -> "Managers" 2020-08-19 00:01:47 -04:00
Kasen IO
c70a041490 Merge branch 'master' into feature/domain-metadata-exporter 2020-08-18 21:35:51 -04: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
81c402ab9c Code review 2020-08-06 21:40:36 +12:00
David Rowe
8f0b33b54d Miscellaneous tidying 2020-08-06 00:04:22 +12:00
David Rowe
13edfde89c Fix server settings 2020-08-05 23:46:15 +12:00
kasenvr
4d3ca2fdc5
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-08-05 02:31:10 -04:00
Kasen IO
448cdcb31f Update domain's describe-settings for clarity. 2020-08-05 00:23:55 -04:00
David Rowe
dfef1fb5bb Remove unused domain server setting 2020-08-04 22:03:08 +12:00
David Rowe
6f9b47c07d Distinguish domain groups with a leading "@" 2020-08-04 21:31:13 +12:00
David Rowe
60048162c0 Use WordPress user roles as domain groups 2020-08-04 21:00:09 +12:00
David Rowe
bc56eb5ac7 Update to work with WordPress plugin 2020-08-04 17:12:31 +12:00
David Rowe
7da91d9557 Misc. tidying 2020-08-04 09:15:05 +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
0b42ef5748 Regularize domain username case 2020-08-03 13:21:20 +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
dfbad4efc0 Use "enable domain authentication" server setting 2020-08-02 21:22:59 +12:00
David Rowe
fdb4a5605a Tidy processing user connect request 2020-08-02 20:54:09 +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
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
af34536a09 Further complete the loop. 2020-07-30 00:34:02 -04:00
David Rowe
7c8993b34f Add TODO 2020-07-29 10:03:44 +12:00
David Rowe
d5e189422f Support blacklisting per domain groups 2020-07-29 08:08:08 +12:00
David Rowe
94908fd1a7 Add support for group lists in domain server 2020-07-28 22:05:40 +12:00
David Rowe
429b4ceefa Flesh out domain groups code 2020-07-28 21:23:55 +12:00
Kasen IO
294646a141 Add OAuth2 to domain settings. 2020-07-27 23:04:59 -04: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
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
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
kasenvr
eef1e3b93e
Update index.html 2020-07-21 01:30:56 -04:00
Kasen IO
e8d9fe852e Adjust lines for length. 2020-07-21 00:49:14 -04:00
kasenvr
1c545dffca
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-07-20 14:25:52 -04:00
Kasen IO
1ea78c6ab5 Enable automatic avatar and audio mixer threading defaults 2020-07-17 05:22:59 -04:00
Kasen IO
4b1e82fc0b Move user agent to networking constants. 2020-07-08 14:18:24 -04:00
Kasen IO
f1d731da11 Add users to the export. 2020-06-30 00:25:27 -04:00
Kasen IO
6129981459 Merge branch 'master' into feature/domain-metadata-exporter 2020-06-29 23:26:14 -04:00
David Rowe
a78bd7025f Improve wording of get/set privateUserData description 2020-06-28 11:04:59 +12:00
motofckr9k
7b34872b81 Replace domain-server favicon 2020-06-21 03:59:33 +02: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
Kasen IO
f712fc7735 Export to JSON, JSON formatting. 2020-06-18 16:43:59 -04:00
HifiExperiments
1da1dd20c3 try to fix crash 2020-06-17 20:18:05 -07:00
HifiExperiments
8052259489 get domainmetadata stuff compiling 2020-06-17 17:47:50 -07:00
Kasen IO
19ff5bfd4f uno error. 2020-06-16 00:53:06 -04:00
Kasen IO
269f0ac600 Latest condition. 2020-06-15 23:49:54 -04:00
Kasen IO
7c264e7d85 First pass at adding domain metadata exporter. 2020-06-15 22:51:51 -04: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
Dale Glass
fd59665e63 Add missing Prometheus stats to type map 2020-06-11 22:23:27 +02:00
Dale Glass
b2a5e7fdd1 Additional review fixes 2020-06-08 17:53:27 +02:00
Dale Glass
172ae45420 Another variable renaming 2020-06-07 02:47:39 +02:00
Dale Glass
45f1640b5a Remove useless code 2020-06-07 02:47:39 +02:00
Dale Glass
c0a0d39ce5 More style fixes 2020-06-07 02:47:39 +02:00
Dale Glass
9e478ba458 More variable renaming 2020-06-07 02:47:39 +02:00
Dale Glass
01b0317348 Add missing gauges 2020-06-07 02:47:39 +02:00
Dale Glass
303f10dada Review fixes 2020-06-07 02:47:39 +02:00
Dale Glass
da5e4d3cfc Review fixes 2020-06-07 02:47:39 +02:00
Dale Glass
bc40bc5e52 Update stats backlist for the exporter 2020-06-07 02:47:39 +02:00
Dale Glass
443d769eac Make it possible to turn the Prometheus exporter on and off 
The settings are available from the domain settings page.
 2020-06-07 02:47:39 +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
7996698c8f
Merge branch 'master' into fix/other-renamings 2020-05-18 15:10:32 -04:00
Kasen IO
335f0c86dd Reduce scope of PR. 2020-05-17 22:13:57 -04: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
Thijs Wenker
dcb575a178
Merge pull request #86 from MarcusLlewellyn/opus-plugin 
Add support for the Opus audio plugin.
 2020-01-31 01:04:47 +01:00
Dale Glass
e396747377 Add Opus to list of codecs 2020-01-09 16:43:12 +01:00
Kasen IO
c34cd996df change Metaverse API from setting 2019-12-20 11:39:05 +01:00
Zach Fox
2b7d66c710 Slight optimization; comments 2019-12-06 10:32:45 -08:00
Zach Fox
c96c684400 Initial path to fixing screenshare auth race condition 2019-12-05 15:47:43 -08:00
Howard Stearns
323007eb2c ignore anonymous screenshare zone entry 2019-11-26 12:11:38 -08:00