Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix(ShaderLab): make UsePass directive compatible with all builtin shader names #1855

Merged
merged 10 commits into from
Nov 1, 2023

Conversation

Sway007
Copy link
Member

@Sway007 Sway007 commented Nov 1, 2023

Please check if the PR fulfills these requirements

  • The commit message follows our guidelines
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)

@Sway007 Sway007 added bug Something isn't working shader Shader related functions labels Nov 1, 2023
@Sway007 Sway007 self-assigned this Nov 1, 2023
@GuoLei1990 GuoLei1990 merged commit 7f41a82 into galacean:main Nov 1, 2023
4 of 5 checks passed
GuoLei1990 added a commit that referenced this pull request Nov 1, 2023
* main: (29 commits)
  Fix(ShaderLab): make `UsePass` directive compatible with all builtin shader names (#1855)
  feat: ParticleGenerator support simulationSpeed (#1854)
  fix: sprite destroy (#1852)
  "v1.1.0-beta.18"
  Fix quaternion to euler bug (#1851)
  Fix ColorOverLifetimeModule mode invalid bug (#1850)
  fix: no autoplay when set animatorController after enable (#1843)
  Fix material destoroy bug (#1847)
  Fix Sprite can't batch bug caused by material instance (#1830)
  "v1.1.0-beta.17"
  fix: glTF animation parse bug (#1845)
  fix: mesh decoder (#1844)
  "v1.1.0-beta.16"
  Fix blendShape crossFade bug (#1841)
  fix: ignore ambient in 2d template (#1836)
  "v1.1.0-beta.15"
  Fix blendShapeAnimation crossFade bug (#1840)
  fix: ignore case of asset url (#1809)
  `Shaderlab` remove editor properties (#1825)
  fix: ktx2 texture support (#1829)
  ...

# Conflicts:
#	packages/core/src/particle/ParticleRenderer.ts
zhuxudong added a commit to zhuxudong/engine that referenced this pull request Nov 7, 2023
* dev/1.2: (31 commits)
  Add sunSource (galacean#1823)
  Fix(ShaderLab): make `UsePass` directive compatible with all builtin shader names (galacean#1855)
  feat: ParticleGenerator support simulationSpeed (galacean#1854)
  fix: sprite destroy (galacean#1852)
  "v1.1.0-beta.18"
  Fix quaternion to euler bug (galacean#1851)
  Fix ColorOverLifetimeModule mode invalid bug (galacean#1850)
  fix: no autoplay when set animatorController after enable (galacean#1843)
  Refactor `glTFResource` (galacean#1831)
  Fix material destoroy bug (galacean#1847)
  Fix Sprite can't batch bug caused by material instance (galacean#1830)
  "v1.1.0-beta.17"
  fix: glTF animation parse bug (galacean#1845)
  fix: mesh decoder (galacean#1844)
  "v1.1.0-beta.16"
  Fix blendShape crossFade bug (galacean#1841)
  fix: ignore ambient in 2d template (galacean#1836)
  "v1.1.0-beta.15"
  Fix blendShapeAnimation crossFade bug (galacean#1840)
  fix: ignore case of asset url (galacean#1809)
  ...

# Conflicts:
#	packages/loader/src/gltf/parser/GLTFParserContext.ts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working shader Shader related functions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants