From f11091cab470086d9f1309d0c5a747e654aaefa5 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 16 Jun 2020 12:25:28 +1200 Subject: [PATCH 01/24] Add Help > Tutorial menu item that goest to serverless tutorial --- interface/src/Application.cpp | 5 +++++ interface/src/Application.h | 1 + interface/src/Menu.cpp | 2 ++ 3 files changed, 8 insertions(+) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 85c2d4abe0..dd8ad75c06 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3858,6 +3858,11 @@ void Application::showHelp() { //InfoView::show(INFO_HELP_PATH, false, queryString.toString()); } +void Application::gotoTutorial() { + const QString TUTORIAL_ADDRESS = "file:///~/serverless/tutorial.json"; + DependencyManager::get()->handleLookupString(TUTORIAL_ADDRESS); +} + void Application::resizeEvent(QResizeEvent* event) { resizeGL(); } diff --git a/interface/src/Application.h b/interface/src/Application.h index 198f5ef7cf..e85fccf1f6 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -427,6 +427,7 @@ public slots: #endif static void showHelp(); + static void gotoTutorial(); void cycleCamera(); void cameraModeChanged(); diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index a3ef39f1e9..5ca2be510b 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -816,6 +816,8 @@ Menu::Menu() { addActionToQMenuAndActionHash(helpMenu, "Controls Reference", 0, qApp, SLOT(showHelp())); + addActionToQMenuAndActionHash(helpMenu, "Tutorial", 0, qApp, SLOT(gotoTutorial())); + helpMenu->addSeparator(); // Help > Release Notes From 9367ea9e7f64186ee33341c55bd4486f48cac524 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 16 Jun 2020 12:25:59 +1200 Subject: [PATCH 02/24] "file:///" is valid address in AddressManager.handleLookupString() JSDoc --- libraries/networking/src/AddressManager.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/networking/src/AddressManager.h b/libraries/networking/src/AddressManager.h index 8bdb777f96..148c4f8580 100644 --- a/libraries/networking/src/AddressManager.h +++ b/libraries/networking/src/AddressManager.h @@ -249,8 +249,9 @@ public slots: * Takes you to a specified metaverse address. * @function location.handleLookupString * @param {string} address - The address to go to: a "hifi://" address, an IP address (e.g., - * "127.0.0.1" or "localhost"), a domain name, a named path on a domain (starts with - * "/"), a position or position and orientation, or a user (starts with "@"). + * "127.0.0.1" or "localhost"), a file:/// address, a domain name, a named path + * on a domain (starts with "/"), a position or position and orientation, or a user (starts with + * "@"). * @param {boolean} [fromSuggestions=false] - Set to true if the address is obtained from the "Goto" dialog. * Helps ensure that user's location history is correctly maintained. */ From bc2c6a280ddb2bf4b46a2541baef6e83bfc03e72 Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Thu, 25 Jun 2020 19:31:46 +0200 Subject: [PATCH 03/24] Fix illegal instruction in libaudio.dylib on OSX This file gets included by AudioHRTF_avx512.cpp, which contains code that should only be getting executed on CPUs with the appropriate support. Unfortunately, when that file is compiled with -mavx512f, GCC also generates AVX instructions in the code that initializes the value of SQUARE_ROOT_OF_2, and this crashes on CPUs without AVX because it runs unconditionally. Avoid the issue entirely by just making it a constant so no code needs to be run. --- libraries/shared/src/NumericalConstants.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/shared/src/NumericalConstants.h b/libraries/shared/src/NumericalConstants.h index 8377c48960..b7fecfa1e4 100644 --- a/libraries/shared/src/NumericalConstants.h +++ b/libraries/shared/src/NumericalConstants.h @@ -28,8 +28,8 @@ const float ARCSECONDS_PER_ARCMINUTE = 60.0f; const float ARCSECONDS_PER_DEGREE = ARCMINUTES_PER_DEGREE * ARCSECONDS_PER_ARCMINUTE; const float EPSILON = 0.000001f; //smallish positive number - used as margin of error for some computations -const float SQUARE_ROOT_OF_2 = (float)sqrt(2.0f); -const float SQUARE_ROOT_OF_3 = (float)sqrt(3.0f); +const float SQUARE_ROOT_OF_2 = 1.414214f; +const float SQUARE_ROOT_OF_3 = 1.732051f; const float METERS_PER_DECIMETER = 0.1f; const float METERS_PER_CENTIMETER = 0.01f; const float METERS_PER_MILLIMETER = 0.001f; From 968fd2b72da7685061f93c3bedb6977cdb254ab9 Mon Sep 17 00:00:00 2001 From: Kasen IO Date: Fri, 26 Jun 2020 18:46:30 -0400 Subject: [PATCH 04/24] Move chat to correct folder. --- .../chat/FloofChat.html | 0 .../chat/FloofChat.js | 2 +- .../chat/FloofChat.qml | 0 .../chat/chat.png | Bin .../chat/css/FloofChat.css | 0 .../chat/css/materialize.css | 0 .../chat/js/materialize.min.js | 0 .../notificationCore/notificationCore.js | 0 scripts/defaultScripts.js | 4 ++-- 9 files changed, 3 insertions(+), 3 deletions(-) rename scripts/{communityModules => communityScripts}/chat/FloofChat.html (100%) rename scripts/{communityModules => communityScripts}/chat/FloofChat.js (99%) rename scripts/{communityModules => communityScripts}/chat/FloofChat.qml (100%) rename scripts/{communityModules => communityScripts}/chat/chat.png (100%) rename scripts/{communityModules => communityScripts}/chat/css/FloofChat.css (100%) rename scripts/{communityModules => communityScripts}/chat/css/materialize.css (100%) rename scripts/{communityModules => communityScripts}/chat/js/materialize.min.js (100%) rename scripts/{communityModules => communityScripts}/notificationCore/notificationCore.js (100%) diff --git a/scripts/communityModules/chat/FloofChat.html b/scripts/communityScripts/chat/FloofChat.html similarity index 100% rename from scripts/communityModules/chat/FloofChat.html rename to scripts/communityScripts/chat/FloofChat.html diff --git a/scripts/communityModules/chat/FloofChat.js b/scripts/communityScripts/chat/FloofChat.js similarity index 99% rename from scripts/communityModules/chat/FloofChat.js rename to scripts/communityScripts/chat/FloofChat.js index 92382c3199..f8afc67603 100644 --- a/scripts/communityModules/chat/FloofChat.js +++ b/scripts/communityScripts/chat/FloofChat.js @@ -80,7 +80,7 @@ function init() { setupHistoryWindow(false); chatBar = new OverlayWindow({ - source: Paths.defaultScripts + '/communityModules/chat/FloofChat.qml?' + Date.now(), + source: Paths.defaultScripts + '/communityScripts/chat/FloofChat.qml?' + Date.now(), width: 360, height: 180 }); diff --git a/scripts/communityModules/chat/FloofChat.qml b/scripts/communityScripts/chat/FloofChat.qml similarity index 100% rename from scripts/communityModules/chat/FloofChat.qml rename to scripts/communityScripts/chat/FloofChat.qml diff --git a/scripts/communityModules/chat/chat.png b/scripts/communityScripts/chat/chat.png similarity index 100% rename from scripts/communityModules/chat/chat.png rename to scripts/communityScripts/chat/chat.png diff --git a/scripts/communityModules/chat/css/FloofChat.css b/scripts/communityScripts/chat/css/FloofChat.css similarity index 100% rename from scripts/communityModules/chat/css/FloofChat.css rename to scripts/communityScripts/chat/css/FloofChat.css diff --git a/scripts/communityModules/chat/css/materialize.css b/scripts/communityScripts/chat/css/materialize.css similarity index 100% rename from scripts/communityModules/chat/css/materialize.css rename to scripts/communityScripts/chat/css/materialize.css diff --git a/scripts/communityModules/chat/js/materialize.min.js b/scripts/communityScripts/chat/js/materialize.min.js similarity index 100% rename from scripts/communityModules/chat/js/materialize.min.js rename to scripts/communityScripts/chat/js/materialize.min.js diff --git a/scripts/communityModules/notificationCore/notificationCore.js b/scripts/communityScripts/notificationCore/notificationCore.js similarity index 100% rename from scripts/communityModules/notificationCore/notificationCore.js rename to scripts/communityScripts/notificationCore/notificationCore.js diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js index 5e7e120bf3..4f0f8c7a0e 100644 --- a/scripts/defaultScripts.js +++ b/scripts/defaultScripts.js @@ -38,11 +38,11 @@ var DEFAULT_SCRIPTS_COMBINED = [ ]; var DEFAULT_SCRIPTS_SEPARATE = [ "system/controllers/controllerScripts.js", - "communityModules/notificationCore/notificationCore.js", + "communityScripts/notificationCore/notificationCore.js", "simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js", {"stable": "system/more/app-more.js", "beta": "https://cdn.vircadia.com/community-apps/more/app-more.js"}, {"stable": "communityScripts/explore/explore.js", "beta": "https://metaverse.vircadia.com/interim/d-goto/app/explore.js"}, - {"stable": "communityModules/chat/FloofChat.js", "beta": "https://content.fluffy.ws/scripts/chat/FloofChat.js"} + {"stable": "communityScripts/chat/FloofChat.js", "beta": "https://content.fluffy.ws/scripts/chat/FloofChat.js"} //"system/chat.js" ]; From 394c9e2175f36af12395376fe11c7205043599fd Mon Sep 17 00:00:00 2001 From: Kasen IO Date: Fri, 26 Jun 2020 21:48:58 -0400 Subject: [PATCH 05/24] Chat window resize, shrink text size and boxes, add date to timestamp. --- scripts/communityScripts/chat/FloofChat.html | 3 ++- scripts/communityScripts/chat/FloofChat.js | 23 +++++++++++-------- .../communityScripts/chat/css/FloofChat.css | 21 +++++++++-------- 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/scripts/communityScripts/chat/FloofChat.html b/scripts/communityScripts/chat/FloofChat.html index a1e84e132f..3f4e19685b 100644 --- a/scripts/communityScripts/chat/FloofChat.html +++ b/scripts/communityScripts/chat/FloofChat.html @@ -12,6 +12,7 @@ + @@ -191,7 +192,7 @@ } // else fall through to default default: - elContent = elContent.replace(this, "
" + this + ""); + elContent = elContent.replace(this, "
" + this + ""); break; } diff --git a/scripts/communityScripts/chat/FloofChat.js b/scripts/communityScripts/chat/FloofChat.js index f8afc67603..e492b04b1b 100644 --- a/scripts/communityScripts/chat/FloofChat.js +++ b/scripts/communityScripts/chat/FloofChat.js @@ -23,6 +23,9 @@ var SHIFT_KEY = 33554432; var FLOOF_CHAT_CHANNEL = "Chat"; var FLOOF_NOTIFICATION_CHANNEL = "Floof-Notif"; +var MAIN_CHAT_WINDOW_HEIGHT = 450; +var MAIN_CHAT_WINDOW_WIDTH = 750; + Script.scriptEnding.connect(function () { shutdown(); }); @@ -50,14 +53,14 @@ var visible = false; var historyVisible = false; var settingsRoot = "FloofChat"; -var athenaGotoUrl = "https://metaverse.projectathena.io/interim/d-goto/app/goto.json"; -var gotoJSONUrl = Settings.getValue(settingsRoot + "/gotoJSONUrl", athenaGotoUrl); +var vircadiaGotoUrl = "https://metaverse.vircadia.com/interim/d-goto/app/goto.json"; +var gotoJSONUrl = Settings.getValue(settingsRoot + "/gotoJSONUrl", vircadiaGotoUrl); var muted = Settings.getValue(settingsRoot + "/muted", {"Local": false, "Domain": false, "Grid": true}); var ws; var wsReady = false; -var WEB_SOCKET_URL = "ws://chat.projectathena.io:8880"; // WebSocket for Grid chat. +var WEB_SOCKET_URL = "ws://chat.vircadia.com:8880"; // WebSocket for Grid chat. var shutdownBool = false; var defaultColour = {red: 255, green: 255, blue: 255}; @@ -166,11 +169,11 @@ function setupHistoryWindow() { chatHistory = new OverlayWebWindow({ title: 'Chat', source: ROOT + "FloofChat.html?appUUID=" + appUUID + "&" + Date.now(), - width: 900, - height: 700, + width: MAIN_CHAT_WINDOW_WIDTH, + height: MAIN_CHAT_WINDOW_HEIGHT, visible: false }); - chatHistory.setPosition({x: 0, y: Window.innerHeight - 700}); + chatHistory.setPosition({x: 0, y: Window.innerHeight - MAIN_CHAT_WINDOW_HEIGHT}); chatHistory.webEventReceived.connect(onWebEventReceived); chatHistory.closed.connect(toggleChatHistory); } @@ -293,7 +296,7 @@ function onWebEventReceived(event) { colours[event.colourType] = event.colour; } if (event.cmd === "REDOCK") { - chatHistory.setPosition({x: 0, y: Window.innerHeight - 700}); + chatHistory.setPosition({x: 0, y: Window.innerHeight - MAIN_CHAT_WINDOW_HEIGHT}); } if (event.cmd === "GOTO") { gotoConfirm(event.url); @@ -464,14 +467,16 @@ function messageReceived(channel, message) { function time() { var d = new Date(); + var month = (d.getMonth()).toString(); + var day = (d.getDate()).toString(); var h = (d.getHours()).toString(); var m = (d.getMinutes()).toString(); var s = (d.getSeconds()).toString(); var h2 = ("0" + h).slice(-2); var m2 = ("0" + m).slice(-2); var s2 = ("0" + s).slice(-2); - s2 += (d.getMilliseconds() / 1000).toFixed(2).slice(1); - return h2 + ":" + m2 + ":" + s2; + // s2 += (d.getMilliseconds() / 1000).toFixed(2).slice(1); + return month + "/" + day + "-" + h2 + ":" + m2 + ":" + s2; } function addToLog(msg, dp, colour, tab) { diff --git a/scripts/communityScripts/chat/css/FloofChat.css b/scripts/communityScripts/chat/css/FloofChat.css index 476712ffbb..f9d4bb1187 100644 --- a/scripts/communityScripts/chat/css/FloofChat.css +++ b/scripts/communityScripts/chat/css/FloofChat.css @@ -69,9 +69,10 @@ body { } .ChatLog { - height: calc(100vh - 137px); - padding: 20px !important; - font-size: 20px; + height: calc(100vh - 127px); + padding: 10px !important; + font-size: 18px; + font-family: 'Roboto', sans-serif; color: white; background-color: black; overflow-x: hidden; @@ -80,7 +81,7 @@ body { } .ChatLogLine { - margin-bottom: 15px; + margin-bottom: 7px; } .ChatLogLineDisplayName { @@ -91,8 +92,8 @@ body { } .LogLogLine { - margin-bottom: 15px; - padding: 10px !important; + margin-bottom: 7px; + padding: 6px !important; } .LogLogLineMessage { @@ -102,14 +103,14 @@ body { .ChatInput { color: #252525; background: #252525; - height: 60px !important; + height: 45px !important; } .ChatInputText { - padding: 5px !important; - height: 50px !important; + padding: 5px 5px 5px 10px !important; + height: 35px !important; width: calc(100vw - 20px) !important; - font-size: 20px !important; + font-size: 18px !important; background-color: white !important; border-style: solid !important; border-color: #232323 !important; From dc5418748db1e372791d49a2be7f63d0770fb94c Mon Sep 17 00:00:00 2001 From: Kasen IO Date: Sat, 27 Jun 2020 00:43:39 -0400 Subject: [PATCH 06/24] Fix time and date formatting. --- scripts/communityScripts/chat/FloofChat.html | 10 +++++++--- scripts/communityScripts/chat/FloofChat.js | 7 ++++--- scripts/communityScripts/chat/css/FloofChat.css | 5 +++++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/scripts/communityScripts/chat/FloofChat.html b/scripts/communityScripts/chat/FloofChat.html index 3f4e19685b..b4a3f79978 100644 --- a/scripts/communityScripts/chat/FloofChat.html +++ b/scripts/communityScripts/chat/FloofChat.html @@ -323,7 +323,7 @@ location.reload(); } - function logMessage(userName, message, logScreen, colour) { + function logMessage(timestamp, userName, message, logScreen, colour) { var LogScreen = $("#" + logScreen); var $logLine = $('
') @@ -334,6 +334,10 @@ .addClass('z-depth-2') .data('chat-message', message).css("color", rgbToHex(colour)) .appendTo(LogScreen); + $('') + .addClass('LogLogLineTimestamp') + .text(timestamp).css("color", rgbToHex(colour)) + .appendTo($logLine); $('') .addClass('LogLogLineMessage') .text(userName + ": ").css("color", rgbToHex(colour)) @@ -431,11 +435,11 @@ var temp = cmd.data; if (temp.length === 1) { var temp2 = temp[0]; - logMessage("[" + temp2[0] + "] " + temp2[2], temp2[1], temp2[4], temp2[3]); + logMessage("[" + temp2[0] + "] ", temp2[2], temp2[1], temp2[4], temp2[3]); scrollChatLog(temp2[4]); } else if (temp.length > 1) { temp.forEach(function (msg) { - logMessage("[" + msg[0] + "] " + msg[2], msg[1], msg[4], msg[3]); + logMessage("[" + msg[0] + "] ", msg[2], msg[1], msg[4], msg[3]); scrollChatLog(msg[4]); }); } diff --git a/scripts/communityScripts/chat/FloofChat.js b/scripts/communityScripts/chat/FloofChat.js index e492b04b1b..5d7892e2dd 100644 --- a/scripts/communityScripts/chat/FloofChat.js +++ b/scripts/communityScripts/chat/FloofChat.js @@ -476,12 +476,13 @@ function time() { var m2 = ("0" + m).slice(-2); var s2 = ("0" + s).slice(-2); // s2 += (d.getMilliseconds() / 1000).toFixed(2).slice(1); - return month + "/" + day + "-" + h2 + ":" + m2 + ":" + s2; + return month + "/" + day + " - " + h2 + ":" + m2 + ":" + s2; } function addToLog(msg, dp, colour, tab) { - historyLog.push([time(), msg, dp, colour, tab]); - chatHistory.emitScriptEvent(JSON.stringify({type: "MSG", data: [[time(), msg, dp, colour, tab]]})); + var currentTimestamp = time(); + historyLog.push([currentTimestamp, msg, dp, colour, tab]); + chatHistory.emitScriptEvent(JSON.stringify({type: "MSG", data: [[currentTimestamp, msg, dp, colour, tab]]})); while (historyLog.length > chatHistoryLimit) { historyLog.shift(); } diff --git a/scripts/communityScripts/chat/css/FloofChat.css b/scripts/communityScripts/chat/css/FloofChat.css index f9d4bb1187..251d4834cf 100644 --- a/scripts/communityScripts/chat/css/FloofChat.css +++ b/scripts/communityScripts/chat/css/FloofChat.css @@ -100,6 +100,11 @@ body { /*font-style: italic;*/ } +.LogLogLineTimestamp { + font-weight: 300; + font-size: 16px; +} + .ChatInput { color: #252525; background: #252525; From 6c3340051eec480233da9c214fc4e32f7515285b Mon Sep 17 00:00:00 2001 From: Kasen IO Date: Sat, 27 Jun 2020 01:08:55 -0400 Subject: [PATCH 07/24] Add external URL launching. --- scripts/communityScripts/chat/FloofChat.html | 13 +++++++++---- scripts/communityScripts/chat/FloofChat.js | 3 +++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/communityScripts/chat/FloofChat.html b/scripts/communityScripts/chat/FloofChat.html index b4a3f79978..3f45651581 100644 --- a/scripts/communityScripts/chat/FloofChat.html +++ b/scripts/communityScripts/chat/FloofChat.html @@ -172,13 +172,13 @@ case ext == "JPG": case ext == "GIF": case ext == "JPEG": - elContent = elContent.replace(this, "

" + this + ""); + elContent = elContent.replace(this, "

" + this + "📲"); break; case ext == "iframe": elContent = elContent.replace(this, "
"); break; case ext == "webm": - elContent = elContent.replace(this, "

" + this + ""); + elContent = elContent.replace(this, "

" + this + "📲"); break; case protocol === "HIFI": case protocol === "hifi": @@ -187,13 +187,14 @@ case !!this.match(/(https?:\/\/)?(www\.)?(youtube\.com\/watch\?v=|youtu\.be\/)([^& \n<]+)(?:[^ \n<]+)?/g): var youtubeMatch = this.match(/^.*(youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/); if (youtubeMatch && youtubeMatch[2].length == 11) { - elContent = "

" + this + ""; + elContent = "

" + this + "📲"; break; } // else fall through to default default: - elContent = elContent.replace(this, "
" + this + ""); + elContent = elContent.replace(this, "
" + this + "📲"); break; + } }); @@ -285,6 +286,10 @@ function gotoURL(url) { emitWebEvent({type: "CMD", cmd: "URL", url: url}); } + + function gotoExternalURL(url) { + emitWebEvent({type: "CMD", cmd: "EXTERNALURL", url: url}); + } function gotoClipboard(url) { M.toast({html: 'Copied URL to Clipboard', classes: 'rounded pink white-text'}); diff --git a/scripts/communityScripts/chat/FloofChat.js b/scripts/communityScripts/chat/FloofChat.js index 5d7892e2dd..6dcbda8df2 100644 --- a/scripts/communityScripts/chat/FloofChat.js +++ b/scripts/communityScripts/chat/FloofChat.js @@ -310,6 +310,9 @@ function onWebEventReceived(event) { visible: true }); } + if (event.cmd === "EXTERNALURL") { + Window.openUrl(event.url); + } if (event.cmd === "COPY") { Window.copyToClipboard(event.url); } From 580d4826e935514c997a6feb0cc87a9ccb71fe2a Mon Sep 17 00:00:00 2001 From: Kasen IO Date: Sat, 27 Jun 2020 14:25:15 -0400 Subject: [PATCH 08/24] Fix line lengths. --- scripts/communityScripts/chat/FloofChat.html | 30 ++++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/scripts/communityScripts/chat/FloofChat.html b/scripts/communityScripts/chat/FloofChat.html index 3f45651581..7ca04491cb 100644 --- a/scripts/communityScripts/chat/FloofChat.html +++ b/scripts/communityScripts/chat/FloofChat.html @@ -172,13 +172,23 @@ case ext == "JPG": case ext == "GIF": case ext == "JPEG": - elContent = elContent.replace(this, "

" + this + "📲"); + elContent = elContent.replace(this, "

" + this + + "📲"); break; case ext == "iframe": - elContent = elContent.replace(this, "
"); + elContent = elContent.replace(this, "
"); break; case ext == "webm": - elContent = elContent.replace(this, "

" + this + "📲"); + elContent = elContent.replace(this, "

" + this + + "📲"); break; case protocol === "HIFI": case protocol === "hifi": @@ -187,12 +197,22 @@ case !!this.match(/(https?:\/\/)?(www\.)?(youtube\.com\/watch\?v=|youtu\.be\/)([^& \n<]+)(?:[^ \n<]+)?/g): var youtubeMatch = this.match(/^.*(youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/); if (youtubeMatch && youtubeMatch[2].length == 11) { - elContent = "

" + this + "📲"; + elContent = "

" + this + + "📲"; break; } // else fall through to default default: - elContent = elContent.replace(this, "
" + this + "📲"); + elContent = elContent.replace(this, "
" + this + + "📲"); break; } From a78bd7025f5bb41f9ce13f85141380bf9da5ae91 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sun, 28 Jun 2020 11:04:59 +1200 Subject: [PATCH 09/24] Improve wording of get/set privateUserData description --- .../resources/describe-settings.json | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json index 284dd344e7..3ae92651b8 100644 --- a/domain-server/resources/describe-settings.json +++ b/domain-server/resources/describe-settings.json @@ -247,7 +247,7 @@ "name": "standard_permissions", "type": "table", "label": "Domain-Wide User Permissions", - "help": "Indicate which types of users can have which domain-wide permissions.", + "help": "Indicate which types of users can have which domain-wide permissions.", "caption": "Standard Permissions", "can_add_new_rows": false, "groups": [ @@ -256,7 +256,7 @@ "span": 1 }, { - "label": "Permissions ?", + "label": "Permissions ?", "span": 11 } ], @@ -337,7 +337,7 @@ }, { "name": "id_can_get_and_set_private_user_data", - "label": "Can Get and Set Private User Data", + "label": "Get and Set Private User Data", "type": "checkbox", "editable": true, "default": false @@ -392,7 +392,7 @@ "span": 1 }, { - "label": "Permissions ?", + "label": "Permissions ?", "span": 11 } ], @@ -498,7 +498,7 @@ }, { "name": "id_can_get_and_set_private_user_data", - "label": "Can Get and Set Private User Data", + "label": "Get and Set Private User Data", "type": "checkbox", "editable": true, "default": false @@ -520,7 +520,7 @@ "span": 1 }, { - "label": "Permissions ?", + "label": "Permissions ?", "span": 11 } ], @@ -623,7 +623,7 @@ }, { "name": "id_can_get_and_set_private_user_data", - "label": "Can Get and Set Private User Data", + "label": "Get and Set Private User Data", "type": "checkbox", "editable": true, "default": false @@ -641,7 +641,7 @@ "span": 1 }, { - "label": "Permissions ?", + "label": "Permissions ?", "span": 11 } ], @@ -722,7 +722,7 @@ }, { "name": "id_can_get_and_set_private_user_data", - "label": "Can Get and Set Private User Data", + "label": "Get and Set Private User Data", "type": "checkbox", "editable": true, "default": false @@ -740,7 +740,7 @@ "span": 1 }, { - "label": "Permissions ?", + "label": "Permissions ?", "span": 11 } ], @@ -821,7 +821,7 @@ }, { "name": "id_can_get_and_set_private_user_data", - "label": "Can Get and Set Private User Data", + "label": "Get and Set Private User Data", "type": "checkbox", "editable": true, "default": false @@ -839,7 +839,7 @@ "span": 1 }, { - "label": "Permissions ?", + "label": "Permissions ?", "span": 11 } ], @@ -920,7 +920,7 @@ }, { "name": "id_can_get_and_set_private_user_data", - "label": "Can Get and Set Private User Data", + "label": "Get and Set Private User Data", "type": "checkbox", "editable": true, "default": false @@ -938,7 +938,7 @@ "span": 1 }, { - "label": "Permissions ?", + "label": "Permissions ?", "span": 11 } ], @@ -1019,7 +1019,7 @@ }, { "name": "id_can_get_and_set_private_user_data", - "label": "Can Get and Set Private User Data", + "label": "Get and Set Private User Data", "type": "checkbox", "editable": true, "default": false From baa24c311e45a40179d66f660d6d82bd412b2b3b Mon Sep 17 00:00:00 2001 From: Kasen IO Date: Mon, 29 Jun 2020 21:52:58 -0400 Subject: [PATCH 10/24] Add notification sound + muting system. --- scripts/communityScripts/chat/FloofChat.html | 41 ++++++++++++++++-- scripts/communityScripts/chat/FloofChat.js | 35 +++++++++++++++ .../communityScripts/chat/css/FloofChat.css | 14 ++++++ .../chat/resources/bubblepop.wav | Bin 0 -> 50220 bytes 4 files changed, 87 insertions(+), 3 deletions(-) create mode 100644 scripts/communityScripts/chat/resources/bubblepop.wav diff --git a/scripts/communityScripts/chat/FloofChat.html b/scripts/communityScripts/chat/FloofChat.html index 7ca04491cb..316e79d3e6 100644 --- a/scripts/communityScripts/chat/FloofChat.html +++ b/scripts/communityScripts/chat/FloofChat.html @@ -29,11 +29,19 @@
+ +
+ +
@@ -47,6 +55,7 @@