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

Adapt DrawNodeEx to the changes on: Move color types to math/Color.h axmolengine#1741 #1760

Merged
merged 21 commits into from
Mar 21, 2024
Merged

Adapt DrawNodeEx to the changes on: Move color types to math/Color.h axmolengine#1741 #1760

merged 21 commits into from
Mar 21, 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 21, 2024

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

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

  2. Update DrawNodeEx.cpp 

    Reson:  Move color types to math/Color.h #1741
    @aismann
    aismann committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    a669b4c View commit details
    Browse the repository at this point in the history