Skip to content

Commit 22bd86f

Browse files
Merge remote-tracking branch 'overte/master' into application
2 parents 7f4efaf + 27f4ce4 commit 22bd86f

File tree

100 files changed

+1225
-1250
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+1225
-1250
lines changed

.github/workflows/linux_server_build.yml

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,6 @@ jobs:
8282
arch: aarch64
8383
runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
8484

85-
- os: fedora-39
86-
image: docker.io/overte/overte-server-build:0.1.4-fedora-39-amd64
87-
arch: amd64
88-
runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
89-
90-
- os: fedora-39
91-
image: docker.io/overte/overte-server-build:0.1.4-fedora-39-aarch64
92-
arch: aarch64
93-
runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
94-
9585
- os: fedora-40
9686
image: docker.io/overte/overte-server-build:0.1.4-fedora-40-amd64
9787
arch: amd64
@@ -224,10 +214,6 @@ jobs:
224214
else # RPM
225215
if [ "${{ matrix.os }}" == "rockylinux-9" ]; then
226216
echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.el9.$INSTALLER_EXT" >> $GITHUB_ENV
227-
elif [ "${{ matrix.os }}" == "fedora-38" ]; then
228-
echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.fc38.$INSTALLER_EXT" >> $GITHUB_ENV
229-
elif [ "${{ matrix.os }}" == "fedora-39" ]; then
230-
echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.fc39.$INSTALLER_EXT" >> $GITHUB_ENV
231217
elif [ "${{ matrix.os }}" == "fedora-40" ]; then
232218
echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.fc40.$INSTALLER_EXT" >> $GITHUB_ENV
233219
else
@@ -266,7 +252,7 @@ jobs:
266252
267253
- name: Archive cmake logs
268254
if: always()
269-
uses: actions/upload-artifact@v3
255+
uses: actions/upload-artifact@v4
270256
with:
271257
name: cmake-logs-${{ matrix.os }}-${{ matrix.arch }}-${{ github.event.number }}.tar.xz
272258
path: cmake-logs-${{ matrix.os }}-${{ matrix.arch }}-${{ github.event.number }}.tar.xz

.github/workflows/master_build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
run: |
6666
6767
echo "UPLOAD_PREFIX=build/overte/master" >> $GITHUB_ENV
68-
echo ::set-output name=github_sha_short::`echo $GIT_COMMIT | cut -c1-7`
68+
echo "{github_sha_short}={`echo $GIT_COMMIT | cut -c1-7`}" >> $GITHUB_OUTPUT
6969
echo "JOB_NAME=build (${{matrix.os}}, ${{matrix.build_type}})" >> $GITHUB_ENV
7070
echo "APP_TARGET_NAME=$APP_NAME" >> $GITHUB_ENV
7171
# Linux build variables
@@ -82,7 +82,7 @@ jobs:
8282
echo "ZIP_ARGS=-r" >> $GITHUB_ENV
8383
echo "INSTALLER_EXT=dmg" >> $GITHUB_ENV
8484
echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV
85-
echo "::set-output name=symbols_archive::${BUILD_NUMBER}-${{ matrix.build_type }}-mac-symbols.zip"
85+
echo "symbols_archive=${BUILD_NUMBER}-${{ matrix.build_type }}-mac-symbols.zip" >> $GITHUB_ENV
8686
echo "APP_TARGET_NAME=Overte" >> $GITHUB_ENV
8787
fi
8888
# Windows build variables
@@ -91,7 +91,7 @@ jobs:
9191
echo "ZIP_COMMAND=7z" >> $GITHUB_ENV
9292
echo "ZIP_ARGS=a" >> $GITHUB_ENV
9393
echo "INSTALLER_EXT=exe" >> $GITHUB_ENV
94-
echo "CMAKE_EXTRA=-A x64" >> $GITHUB_ENV
94+
echo "CMAKE_EXTRA=-A x64 -DJSDOC_ENABLED:BOOL=TRUE" >> $GITHUB_ENV
9595
echo "SYMBOL_REGEX=\(exe\|dll\|pdb\)" >> $GITHUB_ENV
9696
echo "symbols_archive=${BUILD_NUMBER}-${{ matrix.build_type }}-win-symbols.zip" >> $GITHUB_ENV
9797
# echo "HF_PFX_PASSPHRASE=${{secrets.pfx_key}}" >> $GITHUB_ENV

.github/workflows/master_deploy_apidocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
jsdoc root.js -r api-mainpage.md -c config.json -d output
3232
3333
- name: Deploy API-docs
34-
uses: SamKirkland/[email protected].4
34+
uses: SamKirkland/[email protected].5
3535
with:
3636
server: www531.your-server.de
3737
protocol: ftps

.github/workflows/master_deploy_doxygen.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
doxygen Doxyfile
3030
3131
- name: Deploy Doxygen
32-
uses: SamKirkland/[email protected].4
32+
uses: SamKirkland/[email protected].5
3333
with:
3434
server: www531.your-server.de
3535
protocol: ftps

.github/workflows/pr_build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ jobs:
6464
runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
6565
arch: amd64
6666
build_type: full
67-
apt-dependencies: pkg-config libxext-dev libdouble-conversion-dev libpcre2-16-0 libpulse0 libharfbuzz-dev libnss3 libnspr4 libxdamage1 libasound2 # add missing dependencies to docker image when convenient
68-
image: docker.io/overte/overte-full-build:0.1.1-ubuntu-20.04-amd64
67+
# apt-dependencies: # add missing dependencies to docker image when convenient
68+
image: docker.io/overte/overte-full-build:0.1.2-ubuntu-20.04-amd64
6969
# Android builds are currently failing
7070
#- os: ubuntu-18.04
7171
# build_type: android
@@ -75,7 +75,7 @@ jobs:
7575
runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
7676
arch: aarch64
7777
build_type: full
78-
image: docker.io/overte/overte-full-build:0.1.1-ubuntu-22.04-aarch64
78+
image: docker.io/overte/overte-full-build:0.1.2-ubuntu-22.04-aarch64
7979
fail-fast: false
8080
runs-on: ${{matrix.runner}}
8181
container: ${{matrix.image}}
@@ -137,9 +137,9 @@ jobs:
137137
echo "PYTHON_EXEC=python" >> $GITHUB_ENV
138138
echo "INSTALLER_EXT=exe" >> $GITHUB_ENV
139139
if [ "${{ matrix.build_type }}" = "full" ]; then
140-
echo "CMAKE_EXTRA=-A x64" >> $GITHUB_ENV
140+
echo "CMAKE_EXTRA=-A x64 -DJSDOC_ENABLED:BOOL=TRUE" >> $GITHUB_ENV
141141
else
142-
echo "CMAKE_EXTRA=-A x64 -DCLIENT_ONLY=1" >> $GITHUB_ENV
142+
echo "CMAKE_EXTRA=-A x64 -DJSDOC_ENABLED:BOOL=TRUE -DCLIENT_ONLY=1" >> $GITHUB_ENV
143143
fi
144144
fi
145145
# Android + Quest build variables
@@ -244,7 +244,7 @@ jobs:
244244
245245
- name: Archive cmake logs
246246
if: always()
247-
uses: actions/upload-artifact@v3
247+
uses: actions/upload-artifact@v4
248248
with:
249249
name: cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz
250250
path: ./cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz

.github/workflows/release_build.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ jobs:
5656
echo "UPLOAD_PREFIX=build/overte/release/" >> $GITHUB_ENV
5757
fi
5858
59-
echo ::set-output name=github_sha_short::`echo $GIT_COMMIT | cut -c1-7`
6059
echo "JOB_NAME=${{matrix.os}}, ${{matrix.build_type}}" >> $GITHUB_ENV
6160
echo "APP_TARGET_NAME=$APP_NAME" >> $GITHUB_ENV
6261
@@ -101,7 +100,7 @@ jobs:
101100
- name: Configure CMake
102101
working-directory: ${{runner.workspace}}/build
103102
shell: bash
104-
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DVCPKG_BUILD_TYPE=release -DCLIENT_ONLY:BOOLEAN=$CLIENT_ONLY -DBYPASS_SIGNING:BOOLEAN=TRUE $CMAKE_EXTRA
103+
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DVCPKG_BUILD_TYPE=release -DJSDOC_ENABLED:BOOL=TRUE -DCLIENT_ONLY:BOOLEAN=$CLIENT_ONLY -DBYPASS_SIGNING:BOOLEAN=TRUE $CMAKE_EXTRA
105104

106105
- name: Build application
107106
working-directory: ${{runner.workspace}}/build

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ local.properties
5151
!.vscode/tasks.json
5252
!.vscode/launch.json
5353
!.vscode/extensions.json
54+
.cache
5455
# Workspace
5556
*.code-workspace
5657

CHANGELOG.md

Lines changed: 78 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,84 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1212
This project does **not** adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
1313

1414

15-
<!-- ## [2024.09.1] Unreleased -->
15+
## [2024.11.1] 2024.11.23
1616

17-
## [2024.07.1] 2023.07.12
17+
### Fixes
18+
- Hard code link colors in Armored Chat (PR1083)
19+
- ArmoredChat: Alleviate scrolling issue (PR1106)
20+
- Armored Chat: Change the 'open in new window' character (PR1084)
21+
- Fix mouselook ignoring setting. (PR1081)
22+
- Fix controllerScripts uncaught exception. (PR1086)
23+
- Fix wireshark dissector (PR1088)
24+
- Create App: Material Assistant: Add Mtoon, Shader_simple, missing PBR properties and bug fixes. (PR1091)
25+
- Fix login failure handling and improve logging. (PR1093)
26+
- add a setting to workaround the GLES colorspace conversion issue (PR1105)
27+
- Improve model load priority (PR1085)
28+
- fix accidentally clearing url fields when you don't have view permission (PR1138)
29+
- Avatar App: Fixed lingering references to now deleted QML element (PR1155)
30+
- Fix selfie mode movement (PR1127)
31+
- Fix Create App not honoring menu bar actions (PR1123)
32+
- Fix Uuid.NULL behavior (PR1168)
33+
- Rebuild fonts with full charset (NOT -allglyphs) (PR1172)
34+
- fix web entities not accepting keyboard focus (PR1187)
35+
- Fix stutter when an object is fading (PR1185)
36+
- fix density max typo (PR1195)
37+
- Fix ArmoredChat quick_message qml dialog colors on light theme systems (PR1196)
38+
- Fix missing properties in Script API (PR1215)
39+
- Fix ArmoredChat scrolling (PR1210)
40+
- Force enable JSDoc to get scripting console autocomplete working on Windows (PR1219)
41+
- Fix lack of entityHostType property (PR1224)
42+
- Fix access-after-delete on leaving domain with entity scripts (PR1230)
43+
- fix fade out not working in forward rendering (PR1234)
44+
- Fix access-after-delete during entity script engine cleanup (PR1236)
45+
- Fix script-related crashes on exiting a domain (PR1251)
46+
- Update privacy policy link (PR1237)
47+
48+
### Changes
49+
- Replace Floofchat with ArmoredChat (PR961)
50+
- MouseLook.js refactor (PR1004)
51+
- Custom shader fallbacks (PR1058)
52+
- Update outdated language (PR1102)
53+
- Automated entity property serialization (PR1098)
54+
- Create app: highlight avatar entities (PR1152)
55+
- Update Avatar App icons (PR1141)
56+
- Place App: Weekly promoted place (PR1153)
57+
- Change minimum angular velocity to a lower one (PR1171)
58+
- Places App: Persisted Maturity Filter and Default value for Newbies. (PR1164)
59+
60+
### Additions
61+
- Mirrors + Portals (PR721)
62+
- Entity tags (PR748)
63+
- Web Entity wantsKeyboardFocus (PR814)
64+
- Audio Zone Properties (PR847)
65+
- Ability to smooth model animations (PR889)
66+
- GPU Particles (PR884)
67+
- Unlit Shapes (PR1041)
68+
- Ambient Light Color (PR1043)
69+
- Dump protocol data (PR1087)
70+
- Sound Entities (PR894)
71+
- Zone properties for tonemapping and ambient occlusion (PR1050)
72+
- Add bloom, haze, AO, and procedural shaders to Graphics settings (PR1053)
73+
- Create App: Revolutionary "Paste" Url buttons for the "Create Model", "Create Material" and "Create Voxels" UI (PR1094)
74+
- Text verticalAlignment, send entity property enums as uint8_t, fix text recalculating too often, fix textSize (PR1111)
75+
- Create app: Grab and Equip (PR1160)
76+
- Create App: Add "Paste" button for NewSoundDialog QML (PR1202)
77+
- Added sounds to all incoming chat messages (PR1250)
78+
79+
### Removals
80+
- Remove (deprecated) attachments (PR1069)
81+
- Remove unused onFirstRun.js (PR1089)
82+
- Remove Google Poly (PR1137)
83+
- Remove hifi screenshare (PR1165)
84+
85+
### Build System
86+
- Add CLion-style build directories to .gitignore (PR1135)
87+
88+
### Security
89+
- Sanitize notificationCore text to prevent XSS (PR1078)
90+
91+
92+
## [2024.07.1] 2024.07.12
1893

1994
### Fixes
2095
- Fix more warnings (PR1007)
@@ -57,7 +132,7 @@ This project does **not** adhere to [Semantic Versioning](https://semver.org/spe
57132
- Remove remnants of RELEASE_NAME. (PR1077)
58133

59134

60-
## [2024.06.1] 2023.06.24
135+
## [2024.06.1] 2024.06.24
61136

62137
### Fixes
63138
- Fix QNetworkRequest::FollowRedirectsAttribute deprecated warning (PR711)
@@ -306,9 +381,6 @@ This project does **not** adhere to [Semantic Versioning](https://semver.org/spe
306381
- Added a setting to disable snapshot notifications (PR189)
307382
- Added a setting to switch between screenshot formats (PR134)
308383

309-
### Removals
310-
-
311-
312384
### Build system
313385
- Fixed "may be used uninitialized" warning for blendtime (PR269)
314386
- Updated SPIRV-Cross to sdk-1.3.231.1 (PR271)

assignment-client/src/scripts/EntityScriptServer.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,7 @@ void EntityScriptServer::addingEntity(const EntityItemID& entityID) {
567567

568568
void EntityScriptServer::deletingEntity(const EntityItemID& entityID) {
569569
if (_entityViewer.getTree() && !_shuttingDown && _entitiesScriptManager) {
570+
// TODO: Check if this is running on script engine thread, otherwise lambda capturing script engine pointer is needed
570571
_entitiesScriptManager->unloadEntityScript(entityID, true);
571572
}
572573
}
@@ -584,6 +585,7 @@ void EntityScriptServer::checkAndCallPreload(const EntityItemID& entityID, bool
584585
EntityScriptDetails details;
585586
bool isRunning = _entitiesScriptManager->getEntityScriptDetails(entityID, details);
586587
if (entity && (forceRedownload || !isRunning || details.scriptText != entity->getServerScripts())) {
588+
// TODO: Check if this is running on script engine thread, otherwise lambda capturing script engine pointer is needed
587589
if (isRunning) {
588590
_entitiesScriptManager->unloadEntityScript(entityID, true);
589591
}

hifi_qt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def __init__(self, args):
157157
u_major = int( distro.major_version() or '0' )
158158
if distro.id() == 'ubuntu' or distro.id() == 'linuxmint':
159159
if (distro.id() == 'ubuntu' and u_major == 20) or distro.id() == 'linuxmint' and u_major == 20:
160-
self.qtUrl = self.assets_url + '/dependencies/qt5/qt5-install-5.15.14-2024.06.17-kde_570f5b2105df1ea052bec0d6dbf8a00137274371-ubuntu-20.04-amd64.tar.xz'
160+
self.qtUrl = self.assets_url + '/dependencies/qt5/qt5-install-5.15.16-2024.12.14-kde_32be154325bfba3ad2ba8bf75dad702f3588e8d3-ubuntu-20.04-amd64.tar.xz'
161161
elif (distro.id() == 'ubuntu' and u_major > 20) or (distro.id() == 'linuxmint' and u_major > 20):
162162
self.__no_qt_package_error()
163163
else:

0 commit comments

Comments
 (0)