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

Fix object picking up animation, fix object remove from map and fix restoration of the object type for the tile #8949

Merged
merged 37 commits into from
Jul 21, 2024
Merged

Fix object picking up animation, fix object remove from map and fix restoration of the object type for the tile #8949

merged 37 commits into from
Jul 21, 2024

Commits on Jul 10, 2024

  1. Fix artifact picking up animation when it is set to the bottom layer … 

    …addon
    @Districh-ru
    Districh-ru committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    1f4fa83 View commit details
    Browse the repository at this point in the history

  2. Make IWYU happy

    @Districh-ru
    Districh-ru committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    bb3a940 View commit details
    Browse the repository at this point in the history

  3. Use the same get UID approach for all objects fade out animation

    @Districh-ru
    Districh-ru committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    174fde4 View commit details
    Browse the repository at this point in the history

  4. Fix incorrect included header

    @Districh-ru
    Districh-ru committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    6e7eb52 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. Reduce code duplication

    @Districh-ru
    Districh-ru committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    65a27c9 View commit details
    Browse the repository at this point in the history

  2. Restore object type after action object pick up

    @Districh-ru
    Districh-ru committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    adef3d4 View commit details
    Browse the repository at this point in the history

  3. Fix jail upper tiles restoration after remove

    @Districh-ru
    Districh-ru committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    d5911f3 View commit details
    Browse the repository at this point in the history

  4. Also check the bottom layer when removing the action object (campaign… 

    … map 'good4')
    @Districh-ru
    Districh-ru committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    9ea10fe View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2024

  1. Rename: setAsEmpty() -> updateObjectType()

    @Districh-ru
    Districh-ru committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    ab6c643 View commit details
    Browse the repository at this point in the history

  2. Remove updateEmpty() method. Use its code in the only place where i… 

    …t is used
    @Districh-ru
    Districh-ru committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    ba65a24 View commit details
    Browse the repository at this point in the history

  3. Remove invalid assertion - monsters can be recruited from other objec… 

    …ts, e.g. MP2::OBJ_GENIE_LAMP
    @Districh-ru
    Districh-ru committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    c8e9065 View commit details
    Browse the repository at this point in the history

  4. Fix radar update after removing an object.

    @Districh-ru
    Districh-ru committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    8766745 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2024

  1. Merge branch 'master' into pr/8949

    @ihhub
    ihhub committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    0ade01f View commit details
    Browse the repository at this point in the history

  2. Expand the comment

    @ihhub
    ihhub committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    45b1e6f View commit details
    Browse the repository at this point in the history

  3. Update logic

    @ihhub
    ihhub committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    dbb09ff View commit details
    Browse the repository at this point in the history

  4. Update logic

    @ihhub
    ihhub committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    30d8f30 View commit details
    Browse the repository at this point in the history

  5. Rename function to reflect what it does

    @ihhub
    ihhub committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    1717be4 View commit details
    Browse the repository at this point in the history

  6. Add an extra check

    @ihhub
    ihhub committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    ffa303d View commit details
    Browse the repository at this point in the history

  7. Update logic

    @ihhub
    ihhub committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    680b6a7 View commit details
    Browse the repository at this point in the history

  8. Add extra boat directions to properly get object type by boat ICN id … 

    …and index
    @Districh-ru
    Districh-ru committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    23a532e View commit details
    Browse the repository at this point in the history

  9. Update logic

    @ihhub
    ihhub committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    3b1d772 View commit details
    Browse the repository at this point in the history

  10. Remove a comment

    @ihhub
    ihhub committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    4cd3a6d View commit details
    Browse the repository at this point in the history

  11. Remove unused variable

    @ihhub
    ihhub committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    b982293 View commit details
    Browse the repository at this point in the history

  12. Add a TODO comment

    @ihhub
    ihhub committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    eadfc19 View commit details
    Browse the repository at this point in the history

  13. Use revert indexing for objects

    @ihhub
    ihhub committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    fbcc0e7 View commit details
    Browse the repository at this point in the history

  14. Add an assertion

    @ihhub
    ihhub committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    d1f3266 View commit details
    Browse the repository at this point in the history

  15. Update logic

    @ihhub
    ihhub committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    ee886a0 View commit details
    Browse the repository at this point in the history

  16. Add const

    @ihhub
    ihhub committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    5429369 View commit details
    Browse the repository at this point in the history

  17. Minot speed-up in removeObjectFromMapByUID()

    @Districh-ru
    Districh-ru committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    f66bb3a View commit details
    Browse the repository at this point in the history

  18. Combine scoutTileOnRadar() with runActionObjectFadeOutAnumation()

    @Districh-ru
    Districh-ru committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    97e2d52 View commit details
    Browse the repository at this point in the history

  19. Make sure to set interactive action object type first

    @ihhub
    ihhub committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    f0e31ed View commit details
    Browse the repository at this point in the history

  20. Fix logic

    @ihhub
    ihhub committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    9904e80 View commit details
    Browse the repository at this point in the history

  21. Fix the condition

    @ihhub
    ihhub committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    eacd614 View commit details
    Browse the repository at this point in the history

  22. Update logic

    @Districh-ru
    Districh-ru committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    ca44335 View commit details
    Browse the repository at this point in the history

  23. Revert "Update logic" 

    This reverts commit ca44335.
    @Districh-ru
    Districh-ru committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    1e56bde View commit details
    Browse the repository at this point in the history

  24. Address comments

    @Districh-ru
    Districh-ru committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    5395477 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2024

  1. Merge branch 'master' into fix-artifact-pickup

    @Districh-ru
    Districh-ru authored Jul 20, 2024
    Configuration menu
    Copy the full SHA
    4efee5f View commit details
    Browse the repository at this point in the history