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

Touch up collision events and add inventory #13

Merged
merged 7 commits into from Mar 20, 2024
Merged

Touch up collision events and add inventory #13

merged 7 commits into from Mar 20, 2024

Commits on Mar 17, 2024

  1. Handle collision from SDPhysicsEngine

    @Junyi00
    Junyi00 committed Mar 17, 2024
    Copy the full SHA
    b3a61ae View commit details
    Browse the repository at this point in the history

  2. feat: Update bit masks for collisions and contacts

    @Junyi00
    Junyi00 committed Mar 17, 2024
    Copy the full SHA
    36a0615 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2024

  1. Made the following changes 

    - Add PlayerMonsterContactEvent details
- Add Knockback physics effect to MonsterPlayer collisions
- Add inventory component and system
- Remove separation handler
    @HoJunHao2000
    HoJunHao2000 committed Mar 18, 2024
    Copy the full SHA
    31b36d0 View commit details
    Browse the repository at this point in the history

  2. merge main into branch

    @HoJunHao2000
    HoJunHao2000 committed Mar 18, 2024
    Copy the full SHA
    fac3a5e View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. Update handleCollision in GameEngine

    @HoJunHao2000
    HoJunHao2000 committed Mar 19, 2024
    Copy the full SHA
    7610733 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'add-remaining-events' into add-collision-events

    @HoJunHao2000
    HoJunHao2000 committed Mar 19, 2024
    Copy the full SHA
    bfa53ba View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. Made review changes

    @HoJunHao2000
    HoJunHao2000 committed Mar 20, 2024
    Copy the full SHA
    d982063 View commit details
    Browse the repository at this point in the history