Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-11 16:03:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'refs/remotes/vircadia/master'

Browse source 
Conflicts:
	.github/workflows/pr_build.yml
This commit is contained in:
Julian Groß 2021-12-21 12:52:52 +01:00
commit 3bc9846ebf
10 changed files with 53 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/master_build.yml vendored
View file

@ -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

2
.github/workflows/pr_build.yml vendored
View file

@ -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

3
.gitmodules vendored
View file

@ -1,3 +0,0 @@
[submodule "vircadia-web"]
path = vircadia-web
url = ../vircadia-web.git

22
CMakeLists.txt
View file

@ -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()

2
scripts/communityScripts/explore/explore.html
View file

@ -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,

17
scripts/system/create/entityProperties/html/js/entityProperties.js
View file

@ -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 += "<input type='button' value = 'Add a Zone' id='zones-select-add-" + element.id + "' onClick='document.getElementById(";
zoneSelector += '"' + "zones-select-selector-list-panel-" + element.id + '"' + ").style.display = " + '"' + "block" + '"' + ";'>";
zoneSelector += "<div class = 'zoneSelectorListPanel' id='zones-select-selector-list-panel-" + element.id + "'>";
zoneSelector += "<div class='zoneSelectListHeader'>Select the Zone to add: </div>";
zoneSelector += "<div class='zoneSelectListHeader'>Select the Zone to add:";
zoneSelector += "<input type='button' id='zones-select-add-all-" + element.id + "' class='blue forceAlignRight' value = 'Add All Zones'";
zoneSelector += "onClick='addZoneToZonesSelection(" + '"' + element.id + '", "ALL"' + ");'>";
zoneSelector += "</div>";
zoneSelector += "<div class='zoneSelectList' id = 'zones-select-selector-list-" + element.id + "'>";
let i, name;
for (i = 0; i < zonesList.length; i++) {

21
scripts/system/create/entitySelectionTool/entitySelectionTool.js
View file

@ -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;
};

2
scripts/system/create/modules/brokenURLReport.js
View file

@ -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;
}

4
scripts/system/html/css/edit-style.css
View file

@ -2029,6 +2029,10 @@ div.zoneSelectListFooter {
text-align: right;
}
.forceAlignRight {
float: right;
}
#menuBackgroundOverlay{
background-color:transparent;
position:fixed;

1
vircadia-web

@ -1 +0,0 @@
Subproject commit 0afaa769d46683d461c9288aa31468f64cba0233