diff --git a/.github/workflows/master_build.yml b/.github/workflows/master_build.yml index ab18e5b093..1200e77754 100644 --- a/.github/workflows/master_build.yml +++ b/.github/workflows/master_build.yml @@ -122,7 +122,7 @@ jobs: sudo apt install -y ${{ matrix.apt-dependencies }} || exit 1 else # macOS echo "Downloading MacOSX10.12 SDK.." - curl --progress-bar -L -o macOS_SDK10.12.4.tar.xz "https://cloudflare-ipfs.com/ipfs/QmdNLMCUCw8hBTqinkc7ke88WgRb7M2mWQbccQPDsyaub8?filename=macOS_SDK10.12.4.tar.xz" || exit 1 + curl --progress-bar -L -o macOS_SDK10.12.4.tar.xz "https://cloudflare-ipfs.com/ipfs/QmTDLEYdo616YgZKSYC2mySSw8EKQWTz7CH8UyMupMBpzK?filename=macOS_SDK10.12.4.tar.xz" || exit 1 echo " done\n" echo "Extracting MacOSX10.12 SDK.." tar -xf macOS_SDK10.12.4.tar.xz || exit 1 diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index 824207dea8..87225ec15d 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -156,7 +156,7 @@ jobs: sudo apt install -y ${{ matrix.apt-dependencies }} || exit 1 else # macOS echo "Downloading MacOSX10.12 SDK.." - curl --progress-bar -L -o macOS_SDK10.12.4.tar.xz "https://data.moto9000.moe/vircadia_packages/macOS_SDK10.12.4.tar.xz" || exit 1 + curl --progress-bar -L -o macOS_SDK10.12.4.tar.xz "https://cloudflare-ipfs.com/ipfs/QmTDLEYdo616YgZKSYC2mySSw8EKQWTz7CH8UyMupMBpzK?filename=macOS_SDK10.12.4.tar.xz" || exit 1 echo " done\n" echo "Extracting MacOSX10.12 SDK.." tar -xf macOS_SDK10.12.4.tar.xz || exit 1 diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index c8cdef6d56..0000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "vircadia-web"] - path = vircadia-web - url = ../vircadia-web.git \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index aaafe2b3fc..587c2f870e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -349,11 +349,23 @@ GroupSources("scripts") GroupSources("unpublishedScripts") unset(JS_SRC) -file(GLOB_RECURSE WEB_APP_SRC vircadia-web/*.*) -list(FILTER WEB_APP_SRC EXCLUDE REGEX "vircadia-web/(dist|node_modules|public)/*" ) -add_custom_target(vircadia-web SOURCES ${WEB_APP_SRC}) -GroupSources("vircadia-web") -unset(WEB_APP_SRC) +# Include Vircadia Web app files if cloned into a subdirectory. +if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/vircadia-web") + file(GLOB_RECURSE WEB_APP_SRC vircadia-web/*.*) + list(FILTER WEB_APP_SRC EXCLUDE REGEX "vircadia-web/(dist|node_modules|public)/*" ) + add_custom_target(vircadia-web SOURCES ${WEB_APP_SRC}) + GroupSources("vircadia-web") + unset(WEB_APP_SRC) +endif() + +# Include Vircadia Web SDK files if cloned into a subdirectory. +if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/vircadia-web-sdk") + file(GLOB_RECURSE WEB_SDK_SRC vircadia-web-sdk/*.*) + list(FILTER WEB_SDK_SRC EXCLUDE REGEX "vircadia-web-sdk/(dist|node_modules|public)/*" ) + add_custom_target(vircadia-web-sdk SOURCES ${WEB_SDK_SRC}) + GroupSources("vircadia-web-sdk") + unset(WEB_SDK_SRC) +endif() set_packaging_parameters() diff --git a/scripts/communityScripts/explore/explore.html b/scripts/communityScripts/explore/explore.html index 51f2045915..b2a86f545b 100644 --- a/scripts/communityScripts/explore/explore.html +++ b/scripts/communityScripts/explore/explore.html @@ -326,7 +326,7 @@ if (placesData[i].domain.active && placesData[i].visibility == "open" && new Date(placesData[i].last_activity_update) > activeThresholdTime) { joinedData.push({ "index": joinedData.length, - "location": placesData[i].address, + "location": placesData[i].name, "name": placesData[i].name, "owner": placesData[i].managers[0], "userCount": placesData[i].current_attendance, diff --git a/scripts/system/create/entityProperties/html/js/entityProperties.js b/scripts/system/create/entityProperties/html/js/entityProperties.js index 5a20ae6f20..85c7b378da 100644 --- a/scripts/system/create/entityProperties/html/js/entityProperties.js +++ b/scripts/system/create/entityProperties/html/js/entityProperties.js @@ -3712,8 +3712,16 @@ function addZoneToZonesSelection(propertyId, id) { hiddenField.value = "[]"; } let selectedZones = JSON.parse(hiddenField.value); - if (!selectedZones.includes(id)) { - selectedZones.push(id); + if (id === "ALL") { + for (let i = 0; i < zonesList.length; i++) { + if (!selectedZones.includes(zonesList[i].id)) { + selectedZones.push(zonesList[i].id); + } + } + } else { + if (!selectedZones.includes(id)) { + selectedZones.push(id); + } } hiddenField.value = JSON.stringify(selectedZones); displaySelectedZones(propertyId, true); @@ -3813,7 +3821,10 @@ function setZonesSelectionData(element, isEditable) { zoneSelector += ""; zoneSelector += "
"; - zoneSelector += "
Select the Zone to add:
"; + zoneSelector += "
Select the Zone to add:"; + zoneSelector += ""; + zoneSelector += "
"; zoneSelector += "
"; let i, name; for (i = 0; i < zonesList.length; i++) { diff --git a/scripts/system/create/entitySelectionTool/entitySelectionTool.js b/scripts/system/create/entitySelectionTool/entitySelectionTool.js index f4d6117bd1..257d4fb407 100644 --- a/scripts/system/create/entitySelectionTool/entitySelectionTool.js +++ b/scripts/system/create/entitySelectionTool/entitySelectionTool.js @@ -343,6 +343,19 @@ SelectionManager = (function() { } var duplicateInterrupted = false; + for (var j = 0; j < entitiesToDuplicate.length; j++) { + var lockedEntities = Entities.getEntityProperties(entitiesToDuplicate[j], 'locked'); + if (lockedEntities.locked) { + duplicateInterrupted = true; + break; + } + } + if (duplicateInterrupted) { + audioFeedback.rejection(); + Window.notifyEditError("At least one of the selected entities or one of their children are locked."); + return []; + } + // duplicate entities from above and store their original to new entity mappings and children needing re-parenting for (var i = 0; i < entitiesToDuplicate.length; i++) { var originalEntityID = entitiesToDuplicate[i]; @@ -389,8 +402,6 @@ SelectionManager = (function() { duplicatedChildrenWithOldParents[newEntityID] = properties.parentID; } originalEntityToNewEntityID[originalEntityID] = newEntityID; - } else { - duplicateInterrupted = true; } } @@ -409,11 +420,7 @@ SelectionManager = (function() { } }); - if (duplicateInterrupted) { - audioFeedback.rejection(); - } else { - audioFeedback.confirmation(); - } + audioFeedback.confirmation(); return duplicatedEntityIDs; }; diff --git a/scripts/system/create/modules/brokenURLReport.js b/scripts/system/create/modules/brokenURLReport.js index c3a6eba8cd..c04612bb27 100644 --- a/scripts/system/create/modules/brokenURLReport.js +++ b/scripts/system/create/modules/brokenURLReport.js @@ -31,7 +31,7 @@ function brokenURLReportRequestUrlValidityCheck(no) { function brokenURLReportGetResponseStatus() { if (brokenURLReportHttpRequest.status === 0 || brokenURLReportHttpRequest.status > 299) { if (brokenURLReportHttpRequest.status === 0) { - brokenURLReportUrlList[brokenURLReportProcessedUrlNo].validity = "0 - URL not well-formed"; + brokenURLReportUrlList[brokenURLReportProcessedUrlNo].validity = "0 - Server not found"; } else { brokenURLReportUrlList[brokenURLReportProcessedUrlNo].validity = brokenURLReportHttpRequest.status + " - " + brokenURLReportHttpRequest.statusText; } diff --git a/scripts/system/html/css/edit-style.css b/scripts/system/html/css/edit-style.css index d912cd5d4c..62c58a5676 100644 --- a/scripts/system/html/css/edit-style.css +++ b/scripts/system/html/css/edit-style.css @@ -2029,6 +2029,10 @@ div.zoneSelectListFooter { text-align: right; } +.forceAlignRight { + float: right; +} + #menuBackgroundOverlay{ background-color:transparent; position:fixed; diff --git a/vircadia-web b/vircadia-web deleted file mode 160000 index 0afaa769d4..0000000000 --- a/vircadia-web +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0afaa769d46683d461c9288aa31468f64cba0233