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

DrawNodeEx/DrawNodeExTest update #1914

Merged
merged 59 commits into from
May 22, 2024
Merged

DrawNodeEx/DrawNodeExTest update #1914

merged 59 commits into from
May 22, 2024

Commits on Dec 30, 2023

  1. Fix issue #1546 of UILayout(#1549) and small performance boost

    @aismann
    aismann committed Dec 30, 2023
    Configuration menu
    Copy the full SHA
    66ee110 View commit details
    Browse the repository at this point in the history

  2. add test

    @aismann
    aismann committed Dec 30, 2023
    Configuration menu
    Copy the full SHA
    aad2280 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2023

  1. Merge branch 'dev' of https://github.com/aismann/axmol into dev

    @aismann
    aismann committed Dec 31, 2023
    Configuration menu
    Copy the full SHA
    6127ff4 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2024

  1. Merge branch 'dev' of https://github.com/aismann/axmol into dev

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

  2. Merge branch 'dev' of https://github.com/aismann/axmol into dev

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

  3. Update DrawPrimitivesTest.cpp (Smaller tester code)

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

Commits on Jan 3, 2024

  1. Merge branch 'dev' of https://github.com/aismann/axmol into dev

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

Commits on Jan 4, 2024

  1. Merge branch 'dev' of https://github.com/aismann/axmol into dev

    @aismann
    aismann committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    5201e4f View commit details
    Browse the repository at this point in the history

  2. Update DrawNodeEx.h 

    AX_EX_DLL
    @aismann
    aismann committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    8fff9fb View commit details
    Browse the repository at this point in the history

  3. Update AXLinkHelpers.cmake

    @aismann
    aismann committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    5a65ad4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'axmolengine:dev' into dev

    @aismann
    aismann authored Jan 4, 2024
    Configuration menu
    Copy the full SHA
    29199fa View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2024

  1. Merge branch 'axmolengine:dev' into dev

    @aismann
    aismann authored Jan 5, 2024
    Configuration menu
    Copy the full SHA
    93f1bfa View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2024

  1. Merge branch 'dev' of https://github.com/aismann/axmol into dev

    @aismann
    aismann committed Jan 21, 2024
    Configuration menu
    Copy the full SHA
    d917585 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. Merge branch 'dev' of https://github.com/aismann/axmol into dev

    @aismann
    aismann committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    645193e View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2024

  1. Merge branch 'dev' of https://github.com/aismann/axmol into dev

    @aismann
    aismann committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    9a20a39 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/2.1' into dev

    @aismann
    aismann committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    f9b4ca6 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. Update Console.cpp (removed the '\n' which creates an second (empty) … 

    …line)
    @aismann
    aismann authored Mar 15, 2024
    Configuration menu
    Copy the full SHA
    ad3767a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'axmolengine:dev' into dev

    @aismann
    aismann authored Mar 15, 2024
    Configuration menu
    Copy the full SHA
    f8b772f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of https://github.com/aismann/axmol into dev

    @aismann
    aismann committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    03cfb8c View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. Merge branch 'dev' of https://github.com/aismann/axmol into dev

    @aismann
    aismann committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    d3573d9 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2024

  1. Merge branch 'dev' of https://github.com/aismann/axmol into dev

    @aismann
    aismann committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    fa40de8 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2024

  1. Merge branch 'dev' of https://github.com/aismann/axmol into dev

    @aismann
    aismann committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    14e7fb6 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2024

  1. Merge branch 'dev' of https://github.com/aismann/axmol into dev

    @aismann
    aismann committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    bf54b54 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. Merge branch 'axmolengine:dev' into dev

    @aismann
    aismann authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    bfb43d9 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2024

  1. Merge branch 'axmolengine:dev' into dev

    @aismann
    aismann authored May 5, 2024
    Configuration menu
    Copy the full SHA
    54249d7 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. Merge branch 'axmolengine:dev' into dev

    @aismann
    aismann authored May 7, 2024
    Configuration menu
    Copy the full SHA
    c0f5e8e View commit details
    Browse the repository at this point in the history

  2. segment stuff

    @aismann
    aismann committed May 7, 2024
    Configuration menu
    Copy the full SHA
    cda1307 View commit details
    Browse the repository at this point in the history

  3. .

    @aismann
    aismann committed May 7, 2024
    Configuration menu
    Copy the full SHA
    588f091 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. add some more tests

    @aismann
    aismann committed May 8, 2024
    Configuration menu
    Copy the full SHA
    6068474 View commit details
    Browse the repository at this point in the history

  2. Issue 1888

    @aismann
    aismann committed May 8, 2024
    Configuration menu
    Copy the full SHA
    c1f3a0b View commit details
    Browse the repository at this point in the history

  3. .

    @aismann
    aismann committed May 8, 2024
    Configuration menu
    Copy the full SHA
    6e38249 View commit details
    Browse the repository at this point in the history

  4. add all DrawNode cocos2dx

    @aismann
    aismann committed May 8, 2024
    Configuration menu
    Copy the full SHA
    ac10db1 View commit details
    Browse the repository at this point in the history

  5. .

    @aismann
    aismann committed May 8, 2024
    Configuration menu
    Copy the full SHA
    bcdf6ed View commit details
    Browse the repository at this point in the history

  6. .

    @aismann
    aismann committed May 8, 2024
    Configuration menu
    Copy the full SHA
    56595bc View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. .

    @aismann
    aismann committed May 13, 2024
    Configuration menu
    Copy the full SHA
    b10e733 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'axmolengine:dev' into dev

    @aismann
    aismann authored May 13, 2024
    Configuration menu
    Copy the full SHA
    2e78576 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' into DrawNodeEx_Tester

    @aismann
    aismann committed May 13, 2024
    Configuration menu
    Copy the full SHA
    5f600d2 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. add feature for drawing in correct order

    @aismann
    aismann committed May 16, 2024
    Configuration menu
    Copy the full SHA
    36ef5e7 View commit details
    Browse the repository at this point in the history

  2. .

    @aismann
    aismann committed May 16, 2024
    Configuration menu
    Copy the full SHA
    a77e4f0 View commit details
    Browse the repository at this point in the history

  3. Update DrawNodeEx.cpp

    @aismann
    aismann committed May 16, 2024
    Configuration menu
    Copy the full SHA
    55d7ae6 View commit details
    Browse the repository at this point in the history

  4. .

    @aismann
    aismann committed May 16, 2024
    Configuration menu
    Copy the full SHA
    f891cd2 View commit details
    Browse the repository at this point in the history

  5. Update DrawNodeEx.cpp

    @aismann
    aismann committed May 16, 2024
    Configuration menu
    Copy the full SHA
    87562fd View commit details
    Browse the repository at this point in the history

  6. DRAWNODE_TRIANGLE_ONLY

    @aismann
    aismann committed May 16, 2024
    Configuration menu
    Copy the full SHA
    62d7e17 View commit details
    Browse the repository at this point in the history

  7. DRAWNODE_DRAW_LINE_POINT

    @aismann
    aismann committed May 16, 2024
    Configuration menu
    Copy the full SHA
    b94a695 View commit details
    Browse the repository at this point in the history

  8. .

    @aismann
    aismann committed May 16, 2024
    Configuration menu
    Copy the full SHA
    96ea980 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'axmolengine:dev' into dev

    @aismann
    aismann authored May 16, 2024
    Configuration menu
    Copy the full SHA
    8ab29e4 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'dev' into DrawNodeEx_Tester

    @aismann
    aismann committed May 16, 2024
    Configuration menu
    Copy the full SHA
    e96476d View commit details
    Browse the repository at this point in the history

  11. Update DrawNodeExTest.cpp

    @aismann
    aismann committed May 16, 2024
    Configuration menu
    Copy the full SHA
    58a76b4 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. Merge branch 'axmolengine:dev' into dev

    @aismann
    aismann authored May 17, 2024
    Configuration menu
    Copy the full SHA
    ea46c35 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into DrawNodeEx_Tester

    @aismann
    aismann committed May 17, 2024
    Configuration menu
    Copy the full SHA
    8443939 View commit details
    Browse the repository at this point in the history

  3. Update DrawNodeExTest.cpp

    @aismann
    aismann committed May 17, 2024
    Configuration menu
    Copy the full SHA
    def4c74 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. .

    @aismann
    aismann committed May 21, 2024
    Configuration menu
    Copy the full SHA
    1795e81 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/dev' into DrawNodeEx_Tester

    @aismann
    aismann committed May 21, 2024
    Configuration menu
    Copy the full SHA
    03e99ff View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/dev' into DrawNodeEx_Tester

    @aismann
    aismann committed May 21, 2024
    Configuration menu
    Copy the full SHA
    e23e273 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. Merge remote-tracking branch 'upstream/dev' into DrawNodeEx_Tester

    @aismann
    aismann committed May 22, 2024
    Configuration menu
    Copy the full SHA
    af41774 View commit details
    Browse the repository at this point in the history

  2. .

    @aismann
    aismann committed May 22, 2024
    Configuration menu
    Copy the full SHA
    cc42bb3 View commit details
    Browse the repository at this point in the history

  3. Add round brackets

    @aismann
    aismann committed May 22, 2024
    Configuration menu
    Copy the full SHA
    4cfc920 View commit details
    Browse the repository at this point in the history

  4. commendet this both lines (check it in next version)

    @aismann
    aismann committed May 22, 2024
    Configuration menu
    Copy the full SHA
    1ad13df View commit details
    Browse the repository at this point in the history

  5. .

    @aismann
    aismann committed May 22, 2024
    Configuration menu
    Copy the full SHA
    1553f96 View commit details
    Browse the repository at this point in the history