Skip to content

SLua PV <- 26.3 merge#6016

Merged
marchcat merged 146 commits into
project/lua_editorfrom
marchcat/slua-26.3
Jul 17, 2026
Merged

SLua PV <- 26.3 merge#6016
marchcat merged 146 commits into
project/lua_editorfrom
marchcat/slua-26.3

Conversation

@marchcat

Copy link
Copy Markdown
Contributor

Keeping the PV up to date.

akleshchev and others added 30 commits March 2, 2026 17:37
This happens because on mac watchdog quits at the end of frame. And events get handled outside the frame. The might be other cases that need similar handling.
It's needed for initWindow()
According to logs multiple files are missing/failed to parse, inform user about the need to reinstall
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 6 to 7.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v6...v7)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 7 to 8.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](actions/download-artifact@v7...v8)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-version: '8'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…ablend0

FIX - PBR materials with alpha mode BLEND and alpha value of 0 are not highlighted
…tion, only the most recently created one should progress
…r why this was needed have been resolved in previous commits)
marchcat and others added 3 commits July 16, 2026 19:22
# Conflicts:
#	.github/workflows/build.yaml
#	autobuild.xml
#	indra/llcommon/llsys.cpp
#	indra/llrender/llimagegl.cpp
#	indra/llrender/llimagegl.h
#	indra/newview/CMakeLists.txt
#	indra/newview/featuretable.txt
#	indra/newview/featuretable_linux.txt
#	indra/newview/featuretable_mac.txt
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoiceclient.cpp
#	indra/newview/llvoicevivox.cpp
#	indra/newview/viewer_manifest.py
@github-actions

Copy link
Copy Markdown


Thank you for your submission, we really appreciate it. Like many open-source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution. You can sign the CLA by just posting a Pull Request Comment same as the below format.


I have read the CLA Document and I hereby sign the CLA


11 out of 12 committers have signed the CLA.
✅ (akleshchev)[https://github.com/akleshchev]
✅ (marchcat)[https://github.com/marchcat]
✅ (Geenz)[https://github.com/Geenz]
✅ (trish-sl)[https://github.com/trish-sl]
✅ (KittyBarnett)[https://github.com/KittyBarnett]
✅ (maxim-productengine)[https://github.com/maxim-productengine]
✅ (Hecklezz)[https://github.com/Hecklezz]
✅ (brad-linden)[https://github.com/brad-linden]
✅ (DarlCat)[https://github.com/DarlCat]
✅ (cosmic-linden)[https://github.com/cosmic-linden]
✅ (roxanneskelly)[https://github.com/roxanneskelly]
❌ @Copilot
You can retrigger this bot by commenting recheck in this Pull Request. Posted by the CLA Assistant Lite bot.

@marchcat

Copy link
Copy Markdown
Contributor Author

That’s correct. The action uses the workflow file from the target branch, so it should pass after the merge.

@marchcat
marchcat requested review from akleshchev and maxim-productengine and removed request for akleshchev July 17, 2026 07:12
@marchcat
marchcat marked this pull request as ready for review July 17, 2026 07:12
@marchcat
marchcat merged commit 8a22869 into project/lua_editor Jul 17, 2026
26 of 28 checks passed
@marchcat
marchcat deleted the marchcat/slua-26.3 branch July 17, 2026 09:57
@github-actions github-actions Bot locked and limited conversation to collaborators Jul 17, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.