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.

Sign up for GitHub

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

Jump to bottom

Merge dev/1.3 Updates into Main Branch #300

Merged
merged 39 commits into from
Aug 2, 2024
Merged

Merge dev/1.3 Updates into Main Branch #300

merged 39 commits into from
Aug 2, 2024

Commits on Jul 17, 2024

  1. Open shader core API by ShaderLab (galacean#274) 

    * feat: open shader core API by ShaderLab
    @zhuxudong
    zhuxudong authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    6ad0c26 View commit details
    Browse the repository at this point in the history

  2. "v1.3.0-alpha.0"

    @zhuxudong
    zhuxudong committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    7c1d332 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. chore: async engine

    @zhuxudong
    zhuxudong committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    f59fcbf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into dev/1.3 

    # Conflicts:
#	packages/auxiliary-lines/package.json
#	packages/controls/package.json
#	packages/custom-gltf-parser/package.json
#	packages/custom-material/package.json
#	packages/draco/package.json
#	packages/dynamic-bone/package.json
#	packages/framebuffer-picker/package.json
#	packages/galacean-engine-toolkit/package.json
#	packages/geometry-sketch/package.json
#	packages/gizmo/package.json
#	packages/input-logger/package.json
#	packages/lines/package.json
#	packages/navigation-gizmo/package.json
#	packages/outline/package.json
#	packages/shaderlab/package.json
#	packages/shaderlab/src/GSLPBRMaterial.ts
#	packages/shaderlab/src/shaders/color_vert.glsl
#	packages/skeleton-viewer/package.json
#	packages/stats/package.json
#	packages/tween/package.json
#	packages/way-point/package.json
    @zhuxudong
    zhuxudong committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    ddf6714 View commit details
    Browse the repository at this point in the history

  3. "v1.3.0-alpha.1"

    @zhuxudong
    zhuxudong committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    76a402f View commit details
    Browse the repository at this point in the history

  4. "v1.3.0-alpha.2"

    @zhuxudong
    zhuxudong committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    362198c View commit details
    Browse the repository at this point in the history

  5. refactor: transmiss Varyings to light model

    @zhuxudong
    zhuxudong committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    22e0e1f View commit details
    Browse the repository at this point in the history

  6. "v1.3.0-alpha.3"

    @zhuxudong
    zhuxudong committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    1e2f0db View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. refactor: add ReflectionLobe.glsl

    @zhuxudong
    zhuxudong committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    789f960 View commit details
    Browse the repository at this point in the history

  2. "v1.3.0-alpha.4"

    @zhuxudong
    zhuxudong committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    50df072 View commit details
    Browse the repository at this point in the history

  3. Enhancement Shader API (galacean#286) 

    * refactor: Split Indirect LightProbe.glsl
    @GuoLei1990
    GuoLei1990 authored Jul 19, 2024
    Configuration menu
    Copy the full SHA
    73523df View commit details
    Browse the repository at this point in the history

  4. Add advanced Shader (galacean#280) 

    * feat: digtal humen shader

* feat: add thin flim shader
    @hhhhkrx
    hhhhkrx authored Jul 19, 2024
    Configuration menu
    Copy the full SHA
    31f4bf1 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. refactor: fix f0 (galacean#287)

    @hhhhkrx
    hhhhkrx authored Jul 22, 2024
    Configuration menu
    Copy the full SHA
    e8eaeb6 View commit details
    Browse the repository at this point in the history

  2. "v1.3.0-alpha.5"

    @JujieX
    JujieX committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    f5ccc24 View commit details
    Browse the repository at this point in the history

  3. chore: rename

    @zhuxudong
    zhuxudong committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    643fa46 View commit details
    Browse the repository at this point in the history

  4. fix: merge engine version error

    @zhuxudong
    zhuxudong committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    c6b717f View commit details
    Browse the repository at this point in the history

  5. fix: flipY grid shader when context.flipProjection === true

    @zhuxudong
    zhuxudong committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    94b15d6 View commit details
    Browse the repository at this point in the history

  6. chore: add comment

    @zhuxudong
    zhuxudong committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    7c5d485 View commit details
    Browse the repository at this point in the history

  7. Fix eye bug (galacean#289) 

    * refactor: fix eye bug
    @hhhhkrx
    hhhhkrx authored Jul 22, 2024
    Configuration menu
    Copy the full SHA
    511e27f View commit details
    Browse the repository at this point in the history

  8. fix: ignore post-processing when framebuffer-picking

    @zhuxudong
    zhuxudong committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    bb6f122 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. perf: reset internal RT and useless pass when pick

    @zhuxudong
    zhuxudong committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    f22310d View commit details
    Browse the repository at this point in the history

  2. Merge pull request galacean#288 from zhuxudong/fix/flipY-grid 

    fix: FlipY grid shader when `context.flipProjection === true`
    @JujieX
    JujieX authored Jul 23, 2024
    Configuration menu
    Copy the full SHA
    27f097f View commit details
    Browse the repository at this point in the history

  3. Merge pull request galacean#290 from zhuxudong/fix/framebuffer-picker… 

    …-ignore-postprocess

fix: ignore post-processing when framebuffer-picking
    @JujieX
    JujieX authored Jul 23, 2024
    Configuration menu
    Copy the full SHA
    f48e86a View commit details
    Browse the repository at this point in the history

  4. feat: upgrade engine version

    @JujieX
    JujieX committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    ab26a6e View commit details
    Browse the repository at this point in the history

  5. Merge branch 'dev/1.3' of github.com:galacean/runtime-toolkit into de… 

    …v/1.3
    @JujieX
    JujieX committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    6f3abcf View commit details
    Browse the repository at this point in the history

  6. "v1.3.0-alpha.6"

    @JujieX
    JujieX committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    05d61d9 View commit details
    Browse the repository at this point in the history

  7. "v1.3.0-beta.0"

    @zhuxudong
    zhuxudong committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    15aa16c View commit details
    Browse the repository at this point in the history

  8. fix: mini program rollup error

    @JujieX
    JujieX committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    3da9ce8 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'dev/1.3' of github.com:galacean/engine-toolkit into dev… 

    …/1.3
    @JujieX
    JujieX committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    38bcc92 View commit details
    Browse the repository at this point in the history

  10. feat: add XR

    @cptbtptpbcptdtptp
    cptbtptpbcptdtptp committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    a9b0f22 View commit details
    Browse the repository at this point in the history

  11. feat: udpate code

    @cptbtptpbcptdtptp
    cptbtptpbcptdtptp committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    397bd7a View commit details
    Browse the repository at this point in the history

  12. Merge pull request galacean#291 from cptbtptpbcptdtptp/feat/AddXR 

    Add XR Tool for Galacean Editor
    @gz65555
    gz65555 authored Jul 23, 2024
    Configuration menu
    Copy the full SHA
    3682198 View commit details
    Browse the repository at this point in the history

  13. feat: update code (galacean#292)

    @cptbtptpbcptdtptp
    cptbtptpbcptdtptp authored Jul 23, 2024
    Configuration menu
    Copy the full SHA
    d78f731 View commit details
    Browse the repository at this point in the history

  14. "v1.3.0-beta.1"

    @JujieX
    JujieX committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    16fcb63 View commit details
    Browse the repository at this point in the history

  15. Fix makeNormalizedSG (galacean#293) 

    * refactor: fix makeNormalizedSG
    @hhhhkrx
    hhhhkrx authored Jul 23, 2024
    Configuration menu
    Copy the full SHA
    e2acac5 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. Fix SSS Shader light leakage (galacean#297) 

    * fix: SSS Shader light leakage
    @hhhhkrx
    hhhhkrx authored Jul 24, 2024
    Configuration menu
    Copy the full SHA
    5e1c58b View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. Merge branch 'main' of github.com:galacean/engine-toolkit into dev/1.3

    @JujieX
    JujieX committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    41dcab1 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. "v1.3.0-beta.2"

    @JujieX
    JujieX committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    38dede1 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. Merge branch 'main' into feat/upgradeBranch

    @JujieX
    JujieX authored Aug 2, 2024
    Configuration menu
    Copy the full SHA
    1ede3e9 View commit details
    Browse the repository at this point in the history