From 281b9f983120a75552b2aa59d874cd25385033fb Mon Sep 17 00:00:00 2001 From: ksuprynowicz Date: Sat, 26 Feb 2022 11:46:37 +0100 Subject: [PATCH 1/2] Fixed ICE server hostname and some other links --- libraries/networking/src/NetworkingConstants.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/networking/src/NetworkingConstants.h b/libraries/networking/src/NetworkingConstants.h index 0f11ccfd25..e920da1cf5 100644 --- a/libraries/networking/src/NetworkingConstants.h +++ b/libraries/networking/src/NetworkingConstants.h @@ -60,23 +60,23 @@ namespace NetworkingConstants { const QString VIRCADIA_CONTENT_CDN_URL = "https://cdn-1.vircadia.com/us-e-1/"; #if USE_STABLE_GLOBAL_SERVICES - const QString ICE_SERVER_DEFAULT_HOSTNAME = "ice.overte.org:7337"; + const QString ICE_SERVER_DEFAULT_HOSTNAME = "ice.overte.org"; const QString STUN_SERVER_DEFAULT_HOSTNAME = "stun1.l.google.com"; const unsigned short STUN_SERVER_DEFAULT_PORT = 19302; #else - const QString ICE_SERVER_DEFAULT_HOSTNAME = "ice.overte.org:7337"; + const QString ICE_SERVER_DEFAULT_HOSTNAME = "ice.overte.org"; const QString STUN_SERVER_DEFAULT_HOSTNAME = "stun2.l.google.com"; const unsigned short STUN_SERVER_DEFAULT_PORT = 19302; #endif - const QUrl HELP_COMMUNITY_URL{ "https://vircadia.com/#community" }; - const QUrl HELP_DOCS_URL{ "https://docs.vircadia.com" }; - const QUrl HELP_FORUM_URL{ "https://forum.vircadia.com" }; - const QUrl HELP_SCRIPTING_REFERENCE_URL{ "https://apidocs.vircadia.dev/" }; - const QUrl HELP_RELEASE_NOTES_URL{ "https://docs.vircadia.com/release-notes.html" }; - const QUrl HELP_BUG_REPORT_URL{ "https://github.com/vircadia/vircadia/issues" }; + const QUrl HELP_COMMUNITY_URL{ "https://overte.org" }; + const QUrl HELP_DOCS_URL{ "https://docs.overte.org" }; + const QUrl HELP_FORUM_URL{ "https://overte.org" }; + const QUrl HELP_SCRIPTING_REFERENCE_URL{ "https://apidocs.overte.org/" }; + const QUrl HELP_RELEASE_NOTES_URL{ "https://docs.overte.org/en/latest/release-notes.html" }; + const QUrl HELP_BUG_REPORT_URL{ "https://github.com/overte-org/overte/issues" }; const QString DEFAULT_VIRCADIA_ADDRESS = "file:///~/serverless/tutorial.json"; const QString DEFAULT_HOME_ADDRESS = "file:///~/serverless/tutorial.json"; From 36db95354121a48d828a32e45b5e7c685af2a9b5 Mon Sep 17 00:00:00 2001 From: ksuprynowicz Date: Sun, 6 Mar 2022 23:45:19 +0100 Subject: [PATCH 2/2] Change line endings File gets continously flagged as changed --- .../serverless/Models/logo_overte_white-color-emissive.fst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/resources/serverless/Models/logo_overte_white-color-emissive.fst b/interface/resources/serverless/Models/logo_overte_white-color-emissive.fst index 9449aa3e1b..3047f93d8a 100644 --- a/interface/resources/serverless/Models/logo_overte_white-color-emissive.fst +++ b/interface/resources/serverless/Models/logo_overte_white-color-emissive.fst @@ -1,3 +1,3 @@ -name = LOGO-OVERTE -filename = qrc:///serverless/Models/logo_overte.fbx -materialMap = [{"mat::MAIN": {"materials":[{ "name": "MAIN", "albedo": [1.0 ,1.0 ,1.0], "roughness": 0.5, "metallic": 0.01, "emissive": [1.55, 1.55, 1.55], "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}, {"mat::SECONDARY": {"materials":[{ "name": "SECONDARY", "albedo": [0.3843, 0.39213, 0.8901], "roughness": 0.5, "metallic": 0.01, "emissive": [0.6988, 0.5611, 2.6047], "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}] +name = LOGO-OVERTE +filename = qrc:///serverless/Models/logo_overte.fbx +materialMap = [{"mat::MAIN": {"materials":[{ "name": "MAIN", "albedo": [1.0 ,1.0 ,1.0], "roughness": 0.5, "metallic": 0.01, "emissive": [1.55, 1.55, 1.55], "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}, {"mat::SECONDARY": {"materials":[{ "name": "SECONDARY", "albedo": [0.3843, 0.39213, 0.8901], "roughness": 0.5, "metallic": 0.01, "emissive": [0.6988, 0.5611, 2.6047], "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]