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

701 version merge. #1264

Closed
wants to merge 72 commits into from
Closed

701 version merge. #1264

wants to merge 72 commits into from

Commits on May 19, 2023

  1. set keyframe

    @1445643474
    1445643474 committed May 19, 2023
    Configuration menu
    Copy the full SHA
    1eaeca2 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2023

  1. bugs about keyframes

    @1445643474
    1445643474 committed May 22, 2023
    Configuration menu
    Copy the full SHA
    ed8d9c2 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2023

  1. update keyframe

    @1445643474
    1445643474 committed May 23, 2023
    Configuration menu
    Copy the full SHA
    64d43f3 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2023

  1. fix bugs

    @1445643474
    1445643474 committed May 24, 2023
    Configuration menu
    Copy the full SHA
    e30f47c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:zenustech/zeno into keyframe

    @1445643474
    1445643474 committed May 24, 2023
    Configuration menu
    Copy the full SHA
    83c99ae View commit details
    Browse the repository at this point in the history

  3. fix bugs key frame

    @1445643474
    1445643474 committed May 24, 2023
    Configuration menu
    Copy the full SHA
    67f122f View commit details
    Browse the repository at this point in the history

Commits on May 25, 2023

  1. update timeline after keyframe changed

    @1445643474
    1445643474 committed May 25, 2023
    Configuration menu
    Copy the full SHA
    3e8a2d4 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2023

  1. keyframe curve lock x

    @1445643474
    1445643474 committed May 29, 2023
    Configuration menu
    Copy the full SHA
    4d21958 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2023

  1. the params of int/float/vect3f type can set formula

    @1445643474
    1445643474 committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    2d73276 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2023

  1. Merge branch 'kframe-formula' of github.com:zenustech/zeno into numer… 

    …ic_formula
    @1445643474
    1445643474 committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    b7a1055 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1135 from 1445643474/numeric_formula 

    kframe & formula
    @legobadman
    legobadman authored Jun 5, 2023
    Configuration menu
    Copy the full SHA
    368c4e8 View commit details
    Browse the repository at this point in the history

  3. update ver.

    @legobadman
    legobadman committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    7045fe2 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. fix bug about key frame after changing transform

    @1445643474
    1445643474 committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    43e42eb View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2023

  1. Merge branch 'master' of github.com:1445643474/zeno into kframe-formula

    @1445643474
    1445643474 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    5fd6d68 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2023

  1. Merge branch 'master' into kframe-formula

    @legobadman
    legobadman committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    34201fb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:zenustech/zeno into kframe-formula 

    # Conflicts:
#	ui/zenoedit/res/languages/zh.qm
#	ui/zenoedit/res/languages/zh.ts
#	ui/zenoio/writer/zsgwriter.cpp
    @1445643474
    1445643474 committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    cccb433 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'kframe-formula' of github.com:zenustech/zeno into kfram… 

    …e-formula

# Conflicts:
#	ui/zenoio/writer/zsgwriter.cpp
    @1445643474
    1445643474 committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    64733ad View commit details
    Browse the repository at this point in the history

  4. resolve merge conflicts

    @1445643474
    1445643474 committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    258958e View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1158 from 1445643474/kframe-formula 

    fix bug about key frame and merge master
    @legobadman
    legobadman authored Jun 9, 2023
    Configuration menu
    Copy the full SHA
    15f5b64 View commit details
    Browse the repository at this point in the history

  6. update ver

    @legobadman
    legobadman committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    040a69b View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. update nodes backgroud after setting key frames

    @1445643474
    1445643474 committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    5f45426 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. clear key frames

    @1445643474
    1445643474 committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    41a3e9d View commit details
    Browse the repository at this point in the history

  2. the params of string type spport zfxcode

    @1445643474
    1445643474 committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    370a265 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'kframe-formula' of github.com:zenustech/zeno into kfram… 

    …e-formula
    @1445643474
    1445643474 committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    396d513 View commit details
    Browse the repository at this point in the history

  4. update languages/zh.qm

    @1445643474
    1445643474 committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    99633bc View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. Merge pull request #1170 from 1445643474/kframe-formula 

    update nodes backgroud after setting key frames
    @legobadman
    legobadman authored Jun 14, 2023
    Configuration menu
    Copy the full SHA
    7e557e0 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. File organization

    @1445643474
    1445643474 committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    1b14057 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1207 from 1445643474/kframe-formula 

    File organization
    @legobadman
    legobadman authored Jun 20, 2023
    Configuration menu
    Copy the full SHA
    f3ae119 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. Merge branch 'master' into kframe-formula

    @legobadman
    legobadman committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    fe6a4fa View commit details
    Browse the repository at this point in the history

  2. Revert "File organization" 

    This reverts commit 1b14057.
    @1445643474
    1445643474 committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    c7ebad1 View commit details
    Browse the repository at this point in the history

  3. bugs fixed

    @1445643474
    1445643474 committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    cc7f8d5 View commit details
    Browse the repository at this point in the history

  4. fix bugs about keyframe

    @1445643474
    1445643474 committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    cc54b5c View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2023

  1. bugs about keyframes

    @1445643474
    1445643474 committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    8c85291 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2023

  1. bug about keyframe connections

    @1445643474
    1445643474 committed Jun 24, 2023
    Configuration menu
    Copy the full SHA
    d741616 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2023

  1. Merge pull request #1215 from 1445643474/kframe-formula 

    Kframe update
    @legobadman
    legobadman authored Jun 25, 2023
    Configuration menu
    Copy the full SHA
    eab7659 View commit details
    Browse the repository at this point in the history

  2. [font] why archbate remove this?

    @legobadman
    legobadman committed Jun 25, 2023
    Configuration menu
    Copy the full SHA
    54f3c8e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:zenustech/zeno into kframe-formula

    @1445643474
    1445643474 committed Jun 25, 2023
    Configuration menu
    Copy the full SHA
    804c40f View commit details
    Browse the repository at this point in the history

  4. update ver

    @legobadman
    legobadman committed Jun 25, 2023
    Configuration menu
    Copy the full SHA
    6ee1c8b View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2023

  1. auto show logs when error log is inserted

    @1445643474
    1445643474 committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    20800c4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'kframe-formula' of github.com:zenustech/zeno into kfram… 

    …e-formula
    @1445643474
    1445643474 committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    69f9243 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1217 from 1445643474/kframe-formula 

    Kframe formula
    @legobadman
    legobadman authored Jun 26, 2023
    Configuration menu
    Copy the full SHA
    c975605 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. bugs about seting keyframe value

    @1445643474
    1445643474 committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    0e210d9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1221 from 1445643474/kframe-formula 

    bugs about seting keyframe value
    @legobadman
    legobadman authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    ed32f13 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. Merge branch 'master' into kframe-formula

    @legobadman
    legobadman committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    1e341f5 View commit details
    Browse the repository at this point in the history

  2. update version to 629

    @legobadman
    legobadman committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    49bd0ae View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2023

  1. update version to 701

    @legobadman
    legobadman committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    53dc4f5 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2023

  1. [dev] impl FormatString to support variadic.

    @legobadman
    legobadman committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    7176fb7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into kframe-formula

    @legobadman
    legobadman committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    0440a44 View commit details
    Browse the repository at this point in the history

  3. update zh.qm

    @legobadman
    legobadman committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    9526fb8 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. Merge branch 'master' into kframe-formula

    @legobadman
    legobadman committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    87a2418 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. simplify link lines

    @1445643474
    1445643474 committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    feb2fb1 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. copy link label & skip to src node

    @1445643474
    1445643474 committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    90de45b View commit details
    Browse the repository at this point in the history

  2. merge error

    @1445643474
    1445643474 committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    2c2a95b View commit details
    Browse the repository at this point in the history

  3. fix bug about fork nodes

    @1445643474
    1445643474 committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    24868da View commit details
    Browse the repository at this point in the history

  4. fix bug about creating subgraph link label

    @1445643474
    1445643474 committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    a98f869 View commit details
    Browse the repository at this point in the history

  5. fix bug about selecting links

    @1445643474
    1445643474 committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    cc83cbf View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1275 from 1445643474/kframe-formula 

    create link label
    @legobadman
    legobadman authored Jul 13, 2023
    Configuration menu
    Copy the full SHA
    457439e View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2023

  1. foucus on src node

    @1445643474
    1445643474 committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    fb44365 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1280 from 1445643474/kframe-formula 

    foucus on src node
    @legobadman
    legobadman authored Jul 14, 2023
    Configuration menu
    Copy the full SHA
    a8d238b View commit details
    Browse the repository at this point in the history

  3. [dev] link label optim.

    @legobadman
    legobadman committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    14a2459 View commit details
    Browse the repository at this point in the history

  4. source node transfer to destination node

    @1445643474
    1445643474 committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    bd5d47e View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1282 from 1445643474/kframe-formula 

    source node transfer to destination node
    @legobadman
    legobadman authored Jul 14, 2023
    Configuration menu
    Copy the full SHA
    53f6ce7 View commit details
    Browse the repository at this point in the history

  6. socket clicked signal.

    @legobadman
    legobadman committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    0482300 View commit details
    Browse the repository at this point in the history

  7. slip

    @legobadman
    legobadman committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    cf96084 View commit details
    Browse the repository at this point in the history

  8. bug about copy link label

    @1445643474
    1445643474 committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    6c7822e View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. Merge pull request #1292 from 1445643474/kframe-formula 

    bug about copy link label
    @legobadman
    legobadman authored Jul 17, 2023
    Configuration menu
    Copy the full SHA
    8373633 View commit details
    Browse the repository at this point in the history

  2. node menu searching issue

    @1445643474
    1445643474 committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    67d2088 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. Merge pull request #1295 from 1445643474/kframe-formula 

    node menu searching issue
    @legobadman
    legobadman authored Jul 19, 2023
    Configuration menu
    Copy the full SHA
    335450e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into kframe-formula

    @legobadman
    legobadman committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    d12e9f1 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. fix bug about adjusting subgraph params order

    @1445643474
    1445643474 committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    d3fd68e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1299 from 1445643474/kframe-formula 

    fix bug about adjusting subgraph params order
    @legobadman
    legobadman authored Jul 20, 2023
    Configuration menu
    Copy the full SHA
    a4b2197 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2023

  1. Merge branch 'master' into kframe-formula

    @legobadman
    legobadman committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    1a12817 View commit details
    Browse the repository at this point in the history