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

Adventure mode actor collisions (update of #1037) #1232

Open
wants to merge 26 commits into
base: develop
Choose a base branch
from
Open

Adventure mode actor collisions (update of #1037) #1232

wants to merge 26 commits into from

Commits on Jan 28, 2022

  1. Add basic support for solid actor collision

    @um3k
    um3k committed Jan 28, 2022
    Configuration menu
    Copy the full SHA
    0f4df4a View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2022

  1. Merge branch 'chrismaltby:develop' into platformer-actor-collision

    @um3k
    um3k authored Jan 31, 2022
    Configuration menu
    Copy the full SHA
    4ca9670 View commit details
    Browse the repository at this point in the history

  2. Add IDE support for solid collision

    @um3k
    um3k committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    28260b5 View commit details
    Browse the repository at this point in the history

  3. Revert "Add IDE support for solid collision" 

    This reverts commit 28260b5.
    @um3k
    um3k committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    8a7c1f3 View commit details
    Browse the repository at this point in the history

  4. Pare down to just IDE changes

    @um3k
    um3k committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    5ff56b3 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2022

  1. Merge branch 'chrismaltby:develop' into platformer-actor-collision

    @um3k
    um3k authored Feb 1, 2022
    Configuration menu
    Copy the full SHA
    71e960e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'platformer-actor-collision' of https://github.com/um3k/… 

    …gb-studio into platformer-actor-collision
    @um3k
    um3k committed Feb 1, 2022
    Configuration menu
    Copy the full SHA
    0782bc8 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2022

  1. Solid Collision Improvements

    @um3k
    um3k committed Feb 6, 2022
    Configuration menu
    Copy the full SHA
    294bfdb View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2022

  1. Solid Collision Refactor

    @um3k
    um3k committed Feb 8, 2022
    Configuration menu
    Copy the full SHA
    d0c690c View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2022

  1. Merge branch 'chrismaltby:develop' into platformer-actor-collision

    @um3k
    um3k authored Feb 9, 2022
    Configuration menu
    Copy the full SHA
    a27448b View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2022

  1. Added solid actor collisions to adventure mode

    @um3k
    um3k committed Feb 17, 2022
    Configuration menu
    Copy the full SHA
    fcb3515 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2022

  1. Fix moving actor collision bug

    @um3k
    um3k committed Feb 19, 2022
    Configuration menu
    Copy the full SHA
    031017d View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2022

  1. Tweaking and optimization

    @um3k
    um3k committed Feb 21, 2022
    Configuration menu
    Copy the full SHA
    f1a01cd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'platformer-actor-collision' into develop

    @um3k
    um3k authored Feb 21, 2022
    Configuration menu
    Copy the full SHA
    41a977b View commit details
    Browse the repository at this point in the history

  3. Merge pull request chrismaltby#3 from um3k/develop 

    Pull from upstream
    @um3k
    um3k authored Feb 21, 2022
    Configuration menu
    Copy the full SHA
    61cf9af View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2022

  1. Fixing merge conflicts properly and implementing Chris' + 3 and > 6 s… 

    …uggestion
    @jessemillar
    jessemillar committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    e89f1d4 View commit details
    Browse the repository at this point in the history

  2. Adding comments for readability as I debug

    @jessemillar
    jessemillar committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    fc5db26 View commit details
    Browse the repository at this point in the history

  3. Much better but still has a bug when you fiddle around the corners

    @jessemillar
    jessemillar committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    5ad2b20 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2022

  1. Pushing the optimization that I commented out

    @jessemillar
    jessemillar committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    7b6ec63 View commit details
    Browse the repository at this point in the history

  2. Removing an accidental addition that broke the build

    @jessemillar
    jessemillar committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    c376d19 View commit details
    Browse the repository at this point in the history

  3. Tentatively-working test

    @jessemillar
    jessemillar committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    af1d602 View commit details
    Browse the repository at this point in the history

  4. Working but doesn't handle if you somehow get inside the solid object

    @jessemillar
    jessemillar committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    5f99685 View commit details
    Browse the repository at this point in the history

  5. Working?

    @jessemillar
    jessemillar committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    0c43cbc View commit details
    Browse the repository at this point in the history

  6. Merging back into my fork's develop to hopefully fix some weird branc… 

    …h issues
    @jessemillar
    jessemillar committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    4bb6323 View commit details
    Browse the repository at this point in the history

  7. Updating comments and removing platform changes

    @jessemillar
    jessemillar committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    dad80ec View commit details
    Browse the repository at this point in the history

  8. Removing a leftover platform file from the other PR

    @jessemillar
    jessemillar committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    be54499 View commit details
    Browse the repository at this point in the history