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

Cleanup z_collision_check 1 #1427

Merged
merged 27 commits into from
Jan 11, 2024
Merged

Cleanup z_collision_check 1 #1427

merged 27 commits into from
Jan 11, 2024

Commits on Nov 10, 2022

  1. Cleanup z_collision_check.c and structs

    @Dragorn421
    Dragorn421 committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    9062812 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2022

  1. Merge branch 'master' into cleanup_colchk_1

    @Dragorn421
    Dragorn421 committed Nov 14, 2022
    Configuration menu
    Copy the full SHA
    04123d2 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2022

  1. Revert other* names to master, split to other pr

    @Dragorn421
    Dragorn421 committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    353194c View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2022

  1. Merge branch 'master' into cleanup_colchk_1

    @Dragorn421
    Dragorn421 committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    fa8bf58 View commit details
    Browse the repository at this point in the history

  2. WIP/experimental: ColliderCylinderElement

    @Dragorn421
    Dragorn421 committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    cfc8c32 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2022

  1. Revert "WIP/experimental: ColliderCylinderElement" 

    This reverts commit cfc8c32.
    @Dragorn421
    Dragorn421 committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    44fc7be View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into cleanup_colchk_1

    @Dragorn421
    Dragorn421 committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    007786e View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2022

  1. ac/atHitInfo -> HitElem

    @Dragorn421
    Dragorn421 committed Dec 4, 2022
    Configuration menu
    Copy the full SHA
    d1a47b6 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2022

  1. Merge branch 'master' into cleanup_colchk_1

    @Dragorn421
    Dragorn421 committed Dec 8, 2022
    Configuration menu
    Copy the full SHA
    af4b465 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2022

  1. Merge branch 'master' into cleanup_colchk_1

    @Dragorn421
    Dragorn421 committed Dec 11, 2022
    Configuration menu
    Copy the full SHA
    551e8b2 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2022

  1. Merge branch 'master' into cleanup_colchk_1

    @Dragorn421
    Dragorn421 committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    80afa65 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2022

  1. Merge branch 'master' into cleanup_colchk_1

    @Dragorn421
    Dragorn421 committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    5065923 View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2022

  1. Merge branch 'master' into cleanup_colchk_1

    @Dragorn421
    Dragorn421 committed Dec 26, 2022
    Configuration menu
    Copy the full SHA
    d367214 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2022

  1. Merge branch 'master' into cleanup_colchk_1

    @Dragorn421
    Dragorn421 committed Dec 30, 2022
    Configuration menu
    Copy the full SHA
    1d3dd9d View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2023

  1. Merge branch 'master' into cleanup_colchk_1

    @Dragorn421
    Dragorn421 committed Jan 13, 2023
    Configuration menu
    Copy the full SHA
    a7c4ac6 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2023

  1. Merge branch 'master' into cleanup_colchk_1

    @Dragorn421
    Dragorn421 committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    8d32d9f View commit details
    Browse the repository at this point in the history

  2. rename some collider elements to "elem" (instead of item, info, hurtb… 

    …ox...)
    @Dragorn421
    Dragorn421 committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    cd5528a View commit details
    Browse the repository at this point in the history

  3. cut down on more "hitbox" usage

    @Dragorn421
    Dragorn421 committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    2528f33 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. Merge branch 'master' into cleanup_colchk_1

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

  2. name all ColliderElement* temps properly

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

Commits on Oct 15, 2023

  1. Merge branch 'main' into cleanup_colchk_1

    @Dragorn421
    Dragorn421 committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    a533b6e View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2024

  1. rearrange colcheck structs

    @fig02
    fig02 committed Jan 7, 2024
    Configuration menu
    Copy the full SHA
    0c86eab View commit details
    Browse the repository at this point in the history

  2. add collider shape name descriptions

    @fig02
    fig02 committed Jan 7, 2024
    Configuration menu
    Copy the full SHA
    72dd3b6 View commit details
    Browse the repository at this point in the history

  3. reword collider shape descriptions

    @fig02
    fig02 committed Jan 7, 2024
    Configuration menu
    Copy the full SHA
    d5d60bf View commit details
    Browse the repository at this point in the history

  4. jntsph first again

    @fig02
    fig02 committed Jan 7, 2024
    Configuration menu
    Copy the full SHA
    e2e2446 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #3 from fig02/colcheck_header 

    rearrange structs
    @Dragorn421
    Dragorn421 authored Jan 7, 2024
    Configuration menu
    Copy the full SHA
    9123617 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. merge main

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