diff --git a/.github/workflows/linux_server_build.yml b/.github/workflows/linux_server_build.yml index 7279014c5b..8cf2d46169 100644 --- a/.github/workflows/linux_server_build.yml +++ b/.github/workflows/linux_server_build.yml @@ -238,7 +238,7 @@ jobs: fi - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: false fetch-depth: 1 @@ -305,7 +305,7 @@ jobs: df -h - name: Upload artifact to GitHub - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.ARTIFACT_PATTERN }} path: pkg-scripts/${{ env.ARTIFACT_PATTERN }} diff --git a/.github/workflows/master_build.yml b/.github/workflows/master_build.yml index 466789bb9c..265adde87c 100644 --- a/.github/workflows/master_build.yml +++ b/.github/workflows/master_build.yml @@ -122,7 +122,7 @@ jobs: rm -rf ~/overte-files rm -rf ~/.cache - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 with: submodules: false fetch-depth: 1 diff --git a/.github/workflows/master_deploy_apidocs.yml b/.github/workflows/master_deploy_apidocs.yml index e8d21f9d97..79d4533b40 100644 --- a/.github/workflows/master_deploy_apidocs.yml +++ b/.github/workflows/master_deploy_apidocs.yml @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Overte e.V. +# Copyright 2022-2024 Overte e.V. # SPDX-License-Identifier: Apache-2.0 name: Master API-docs CI Build and Deploy @@ -14,7 +14,7 @@ jobs: name: Build and deploy API-docs steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install dependencies working-directory: tools/jsdoc diff --git a/.github/workflows/master_deploy_doxygen.yml b/.github/workflows/master_deploy_doxygen.yml index ea99e265bb..9a12a165a8 100644 --- a/.github/workflows/master_deploy_doxygen.yml +++ b/.github/workflows/master_deploy_doxygen.yml @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Overte e.V. +# Copyright 2022-2024 Overte e.V. # SPDX-License-Identifier: Apache-2.0 name: Master Doxygen CI Build and Deploy @@ -14,7 +14,7 @@ jobs: name: Build and deploy Doxygen documentation steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install dependencies run: | diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index 6503ed4cb9..2bd3b629c4 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -172,7 +172,7 @@ jobs: rm -rf ~/overte-files rm -rf ~/.cache - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: false fetch-depth: 1 @@ -342,7 +342,7 @@ jobs: - name: Upload Artifact if: startsWith(matrix.os, 'Windows') || startsWith(matrix.os, 'macOS') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.ARTIFACT_PATTERN }} path: ./build/${{ env.ARTIFACT_PATTERN }} diff --git a/hifi_qt.py b/hifi_qt.py index bb8afa3523..ad5401aaf3 100644 --- a/hifi_qt.py +++ b/hifi_qt.py @@ -170,9 +170,7 @@ endif() if distro.id() == 'ubuntu': u_major = int( distro.major_version() ) - if u_major == 18: - self.qtUrl = 'http://motofckr9k.ddns.net/vircadia_packages/qt5-install-5.15.2-ubuntu-18.04-aarch64_test.tar.xz' - elif u_major == 20: + if u_major == 20: self.qtUrl = self.assets_url + '/dependencies/qt5/qt5-install-5.15.9-2023.05.21-kde_fb3ec282151b1ee281a24f0545a40ac6438537c2-ubuntu-20.04-aarch64.tar.xz' elif u_major > 20: self.__no_qt_package_error() @@ -182,9 +180,7 @@ endif() elif distro.id() == 'debian': u_major = int( distro.major_version() ) - if u_major == 10: - self.qtUrl = 'https://data.moto9000.moe/vircadia_packages/qt5-install-5.15.2-debian-10-aarch64.tar.xz' - elif u_major > 10: + if u_major > 10: self.__no_qt_package_error() else: self.__unsupported_error() diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js index c3b432cea4..1cbadadb67 100644 --- a/scripts/defaultScripts.js +++ b/scripts/defaultScripts.js @@ -47,7 +47,7 @@ var DEFAULT_SCRIPTS_SEPARATE = [ "communityScripts/notificationCore/notificationCore.js", "simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js", {"stable": "system/more/app-more.js", "beta": "https://more.overte.org/more/app-more.js"}, - {"stable": "communityScripts/chat/FloofChat.js", "beta": "https://content.fluffy.ws/scripts/chat/FloofChat.js"} + "communityScripts/chat/FloofChat.js", //"system/chat.js" ]; diff --git a/tools/nitpick/AppDataHighFidelity/Interface.json b/tools/nitpick/AppDataHighFidelity/Interface.json index bf3519fcb6..1c8ccad6e7 100644 --- a/tools/nitpick/AppDataHighFidelity/Interface.json +++ b/tools/nitpick/AppDataHighFidelity/Interface.json @@ -38,7 +38,7 @@ "Avatar/animGraphURL": "", "Avatar/attachmentData/size": 0, "Avatar/avatarEntityData/size": 0, - "Avatar/collisionSoundURL": "https://cdn-1.vircadia.com/eu-c-1/vircadia-public/sounds/Collisions-otherorganic/Body_Hits_Impact.wav", + "Avatar/collisionSoundURL": "", "Avatar/displayName": "", "Avatar/dominantHand": "right", "Avatar/flyingHMD": false,