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

ParticleSystem #415

Merged
merged 91 commits into from
Mar 4, 2024
Merged

ParticleSystem #415

merged 91 commits into from
Mar 4, 2024

Commits on Sep 14, 2023

  1. particleSystem and nodeTest

    @OVOAOVO
    OVOAOVO committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    613b047 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2023

  1. change init

    @OVOAOVO
    OVOAOVO committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    08da43d View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2023

  1. shader forgeted

    @OVOAOVO
    OVOAOVO committed Sep 16, 2023
    Configuration menu
    Copy the full SHA
    d710339 View commit details
    Browse the repository at this point in the history

  2. conflict

    @OVOAOVO
    OVOAOVO committed Sep 16, 2023
    Configuration menu
    Copy the full SHA
    640c22a View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. texture

    @OVOAOVO
    OVOAOVO committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    f228d98 View commit details
    Browse the repository at this point in the history

  2. texturec.exe change?

    @OVOAOVO
    OVOAOVO committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    3c4d799 View commit details
    Browse the repository at this point in the history

  3. untrack

    @OVOAOVO
    OVOAOVO committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    7dfbd94 View commit details
    Browse the repository at this point in the history

  4. conflict

    @OVOAOVO
    OVOAOVO committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    c7c0244 View commit details
    Browse the repository at this point in the history

  5. back AABB sor...

    @OVOAOVO
    OVOAOVO committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    6cbb342 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2023

  1. cancle link

    @OVOAOVO
    OVOAOVO committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    3ab4b93 View commit details
    Browse the repository at this point in the history

  2. emit pos

    @OVOAOVO
    OVOAOVO committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    8517b7a View commit details
    Browse the repository at this point in the history

  3. precision quadrilateral

    @OVOAOVO
    OVOAOVO committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    05d8e99 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2023

  1. bufferupdate judge and rotate

    @OVOAOVO
    OVOAOVO committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    78eff11 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/CatDogEngine/CatDogEngine

    @OVOAOVO
    OVOAOVO committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    6158453 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into particle_and_nodeTest

    @OVOAOVO
    OVOAOVO committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    96b5fd4 View commit details
    Browse the repository at this point in the history

  4. merge main

    @OVOAOVO
    OVOAOVO committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    a5ecd92 View commit details
    Browse the repository at this point in the history

  5. conflict

    @OVOAOVO
    OVOAOVO committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    0f9cd99 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2023

  1. chunk

    @OVOAOVO
    OVOAOVO committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    a280fef View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/CatDogEngine/CatDogEngine

    @OVOAOVO
    OVOAOVO committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    c64a299 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2023

  1. remove chunk

    @OVOAOVO
    OVOAOVO committed Oct 14, 2023
    Configuration menu
    Copy the full SHA
    edf2fef View commit details
    Browse the repository at this point in the history

  2. remove! chunk

    @OVOAOVO
    OVOAOVO committed Oct 14, 2023
    Configuration menu
    Copy the full SHA
    8a00b0c View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2023

  1. no actually value

    @OVOAOVO
    OVOAOVO committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    fce058e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/CatDogEngine/CatDogEngine

    @OVOAOVO
    OVOAOVO committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    72a4c84 View commit details
    Browse the repository at this point in the history

  3. conflict

    @OVOAOVO
    OVOAOVO committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    2677d33 View commit details
    Browse the repository at this point in the history

  4. test new lazy shader

    @OVOAOVO
    OVOAOVO committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    43de71b View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2023

  1. instancing

    @OVOAOVO
    OVOAOVO committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    b8854c4 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2023

  1. add color

    @OVOAOVO
    OVOAOVO committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    f7cac2d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into particle_and_nodeTest

    @OVOAOVO
    OVOAOVO committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    a08d819 View commit details
    Browse the repository at this point in the history

  3. fix branch

    @OVOAOVO
    OVOAOVO committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    c8e5d6a View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. num(bug) scale(bug) rotate

    @OVOAOVO
    OVOAOVO committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    5df948c View commit details
    Browse the repository at this point in the history

  2. reset branch

    @OVOAOVO
    OVOAOVO committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    bce5782 View commit details
    Browse the repository at this point in the history

  3. conflict fix

    @OVOAOVO
    OVOAOVO committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    b0cfccf View commit details
    Browse the repository at this point in the history

  4. rerun sdl2.dll test

    @OVOAOVO
    OVOAOVO committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    6f2b2a8 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. emitter fixed(without speed fix)

    @OVOAOVO
    OVOAOVO committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    682f53c View commit details
    Browse the repository at this point in the history

  2. merge shader

    @OVOAOVO
    OVOAOVO committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    00498f1 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. coding style fix

    @OVOAOVO
    OVOAOVO committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    c09a157 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. ParticlePool Rebuild

    @OVOAOVO
    OVOAOVO committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    c9c74a7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into particle_and_nodeTest

    @OVOAOVO
    OVOAOVO committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    f21e667 View commit details
    Browse the repository at this point in the history

  3. assetPipline Reback

    @OVOAOVO
    OVOAOVO committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    869730b View commit details
    Browse the repository at this point in the history

  4. Assetpipline Reback

    @OVOAOVO
    OVOAOVO committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    e7696f6 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. Runtime Verison

    @OVOAOVO
    OVOAOVO committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    3f35fa8 View commit details
    Browse the repository at this point in the history

  2. Creating multiple particles fixed

    @OVOAOVO
    OVOAOVO committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    912e264 View commit details
    Browse the repository at this point in the history

  3. branch test

    @OVOAOVO
    OVOAOVO committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    5683dc0 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2023

  1. add num option

    @OVOAOVO
    OVOAOVO committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    4b765da View commit details
    Browse the repository at this point in the history

  2. conflict

    @OVOAOVO
    OVOAOVO committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    4fbcc30 View commit details
    Browse the repository at this point in the history

  3. color picker reAdd

    @OVOAOVO
    OVOAOVO committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    671db31 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2023

  1. assetpipline update

    @OVOAOVO
    OVOAOVO committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    c7867f5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into particle_and_nodeTest

    @OVOAOVO
    OVOAOVO committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    a84d286 View commit details
    Browse the repository at this point in the history

  3. follow macros

    @OVOAOVO
    OVOAOVO committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    2390e16 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2023

  1. Merge branch 'main' into particle_and_nodeTest

    @OVOAOVO
    OVOAOVO committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    575279e View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2023

  1. add mesh

    @OVOAOVO
    OVOAOVO committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    015962a View commit details
    Browse the repository at this point in the history

  2. AssetPipeline index fixed

    @OVOAOVO
    OVOAOVO committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    38b9989 View commit details
    Browse the repository at this point in the history

  3. fixed ECworld particle id

    @OVOAOVO
    OVOAOVO committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    1aa7063 View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2023

  1. add scale

    @OVOAOVO
    OVOAOVO committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    81b0277 View commit details
    Browse the repository at this point in the history

  2. transform component fixd

    @OVOAOVO
    OVOAOVO committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    f57041e View commit details
    Browse the repository at this point in the history

  3. format fix

    @OVOAOVO
    OVOAOVO committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    6892173 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2024

  1. Type Fixed

    @OVOAOVO
    OVOAOVO committed Jan 2, 2024
    Configuration menu
    Copy the full SHA
    be3e8a5 View commit details
    Browse the repository at this point in the history

  2. Ribbon first

    @OVOAOVO
    OVOAOVO committed Jan 2, 2024
    Configuration menu
    Copy the full SHA
    c5e8226 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2024

  1. billboard

    @OVOAOVO
    OVOAOVO committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    bc2ee8f View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2024

  1. billboard fixed

    @OVOAOVO
    OVOAOVO committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    88046c5 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2024

  1. shader billboard(bug)

    @OVOAOVO
    OVOAOVO committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    4909296 View commit details
    Browse the repository at this point in the history

  2. Box Emitter Shape

    @OVOAOVO
    OVOAOVO committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    49f2825 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. base ForceField (need fix and update)

    @OVOAOVO
    OVOAOVO committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    1209206 View commit details
    Browse the repository at this point in the history

  2. confict fix

    @OVOAOVO
    OVOAOVO committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    3805e61 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2024

  1. assetpipline follow

    @OVOAOVO
    OVOAOVO committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    bcfdb25 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into particle_and_nodeTest

    @OVOAOVO
    OVOAOVO committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    a202866 View commit details
    Browse the repository at this point in the history

  3. asset pipline follow

    @OVOAOVO
    OVOAOVO committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    c36e9e1 View commit details
    Browse the repository at this point in the history

  4. assetpipline update

    @OVOAOVO
    OVOAOVO committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    f4e46f4 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. DeleteEmitterShapeRenderer

    @OVOAOVO
    OVOAOVO committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    5d7cc9a View commit details
    Browse the repository at this point in the history

  2. remove EmitterShapeRenderer.h

    @OVOAOVO
    OVOAOVO committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    728a4b8 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. dynamic vertex to vertex

    @OVOAOVO
    OVOAOVO committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    86e75e4 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2024

  1. texture reback

    @OVOAOVO
    OVOAOVO committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    d9e790f View commit details
    Browse the repository at this point in the history

  2. ImGuiUtil.hpp follow main

    @OVOAOVO
    OVOAOVO committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    22005b8 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2024

  1. Fixes #448 (#455) 

    Closes #448

Assuming I got this issue right, Submitting for review
    @t0xxxic
    t0xxxic authored Jan 23, 2024
    Configuration menu
    Copy the full SHA
    ca005ee View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. new billboard(bug)

    @OVOAOVO
    OVOAOVO committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    b130697 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. Billboard fixed

    @OVOAOVO
    OVOAOVO committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    0c6c90e View commit details
    Browse the repository at this point in the history

  2. update AssetPipeline

    @OVOAOVO
    OVOAOVO committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    d02d4a4 View commit details
    Browse the repository at this point in the history

  3. merged main

    @OVOAOVO
    OVOAOVO committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    c953111 View commit details
    Browse the repository at this point in the history

  4. conflict fix

    @OVOAOVO
    OVOAOVO committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    6399646 View commit details
    Browse the repository at this point in the history

  5. force field range

    @OVOAOVO
    OVOAOVO committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    6696528 View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2024

  1. add uber shader(.vs not support) 

    add Catmull-Rom Spline Util
    @OVOAOVO
    OVOAOVO committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    65e43e4 View commit details
    Browse the repository at this point in the history

  2. update Assetpipline

    @OVOAOVO
    OVOAOVO committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    9cf0121 View commit details
    Browse the repository at this point in the history

  3. merge main

    @OVOAOVO
    OVOAOVO committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    5b501e6 View commit details
    Browse the repository at this point in the history

  4. conflict fixed

    @OVOAOVO
    OVOAOVO committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    2f1fc90 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. add random control

    @OVOAOVO
    OVOAOVO committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    8651b1d View commit details
    Browse the repository at this point in the history

  2. EC World fixed

    @OVOAOVO
    OVOAOVO committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    88e3e9c View commit details
    Browse the repository at this point in the history

  3. fixed style

    @OVOAOVO
    OVOAOVO committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    bf8fffa View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2024

  1. Merge https://github.com/CatDogEngine/CatDogEngine into particle_and_… 

    …nodeTest
    @T-rvw
    T-rvw committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    0c79af7 View commit details
    Browse the repository at this point in the history

  2. refine

    @T-rvw
    T-rvw committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    77a546c View commit details
    Browse the repository at this point in the history

  3. revert texturec

    @T-rvw
    T-rvw committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    8d88402 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. Use MeshUtils.hpp to vb ib

    @OVOAOVO
    OVOAOVO committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    ef9e901 View commit details
    Browse the repository at this point in the history