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

Option to allow progressive items to give all the upgrades at once #2108

Open
wants to merge 46 commits into
base: Dev
Choose a base branch
from
Open

Option to allow progressive items to give all the upgrades at once #2108

wants to merge 46 commits into from
+15,907 −15,535

Commits on Oct 5, 2023

  1. logic for upgrading bow

    @AngheloAlf
    AngheloAlf committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    de6b3bb View commit details
    Browse the repository at this point in the history

  2. wire up the guy

    @AngheloAlf
    AngheloAlf committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    c49f09c View commit details
    Browse the repository at this point in the history

  3. build files

    @AngheloAlf
    AngheloAlf committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    d8f5845 View commit details
    Browse the repository at this point in the history

  4. stuff

    @AngheloAlf
    AngheloAlf committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    88fd7fa View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. autogenerated stuff

    @AngheloAlf
    AngheloAlf committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    553c1bc View commit details
    Browse the repository at this point in the history

  2. bow seems to work

    @AngheloAlf
    AngheloAlf committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    007ed82 View commit details
    Browse the repository at this point in the history

  3. macro cleanup

    @AngheloAlf
    AngheloAlf committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    622d603 View commit details
    Browse the repository at this point in the history

  4. checks for most progressive items

    @AngheloAlf
    AngheloAlf committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    3b65fde View commit details
    Browse the repository at this point in the history

  5. magic upgradeful

    @AngheloAlf
    AngheloAlf committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    5d6bd3e View commit details
    Browse the repository at this point in the history

  6. whoops

    @AngheloAlf
    AngheloAlf committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    6461238 View commit details
    Browse the repository at this point in the history

  7. testing

    @AngheloAlf
    AngheloAlf committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    d4a3fe3 View commit details
    Browse the repository at this point in the history

  8. upgradeful bow

    @AngheloAlf
    AngheloAlf committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    00d5b4d View commit details
    Browse the repository at this point in the history

  9. fix bombbag and slingshot

    @AngheloAlf
    AngheloAlf committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    8f5c2c7 View commit details
    Browse the repository at this point in the history

  10. Various fixes

    @AngheloAlf
    AngheloAlf committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    0544e6e View commit details
    Browse the repository at this point in the history

  11. tooltip

    @AngheloAlf
    AngheloAlf committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    824a699 View commit details
    Browse the repository at this point in the history

  12. cleanups

    @AngheloAlf
    AngheloAlf committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    5c38195 View commit details
    Browse the repository at this point in the history

  13. Change UPGRADEFUL_ITEM_FLAGS to uint16_t

    @AngheloAlf
    AngheloAlf committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    9e363f7 View commit details
    Browse the repository at this point in the history

  14. Wording

    @AngheloAlf
    AngheloAlf committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    002f573 View commit details
    Browse the repository at this point in the history

  15. CI

    @AngheloAlf
    AngheloAlf committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    356f9ea View commit details
    Browse the repository at this point in the history

  16. tooltip

    @AngheloAlf
    AngheloAlf committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    6d94b46 View commit details
    Browse the repository at this point in the history

  17. Add all the upgradeful items to item_table.c and ItemList.py

    @AngheloAlf
    AngheloAlf committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    3f7c926 View commit details
    Browse the repository at this point in the history

  18. Rename to Max Upgrade

    @AngheloAlf
    AngheloAlf committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    21b2812 View commit details
    Browse the repository at this point in the history

  19. Add Max Upgrade items to ItemPool

    @AngheloAlf
    AngheloAlf committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    7eee920 View commit details
    Browse the repository at this point in the history

  20. Better ItemPool.py Implementation

    @Cuphat
    Cuphat committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    f1407b9 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2023

  1. hint list placeholders

    @AngheloAlf
    AngheloAlf committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    4041518 View commit details
    Browse the repository at this point in the history

  2. hints

    @AngheloAlf
    AngheloAlf committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    5c60da3 View commit details
    Browse the repository at this point in the history

  3. change plando file

    @AngheloAlf
    AngheloAlf committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    c5bd519 View commit details
    Browse the repository at this point in the history

  4. Properly give Adult's Wallet or Tycoon's Wallet depending if shopsani… 

    …ty is enabled or not
    @AngheloAlf
    AngheloAlf committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    9610848 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2023

  1. Remove UPGRADEFUL_ITEM_FLAGS

    @AngheloAlf
    AngheloAlf committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    06d4170 View commit details
    Browse the repository at this point in the history

  2. more explanation on the tooltip

    @AngheloAlf
    AngheloAlf committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    1d3c4d4 View commit details
    Browse the repository at this point in the history

  3. Remove symbols and use raw addresses instead

    @AngheloAlf
    AngheloAlf committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    4adcc38 View commit details
    Browse the repository at this point in the history

  4. Move to Other Misc

    @AngheloAlf
    AngheloAlf committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    a4e4d9c View commit details
    Browse the repository at this point in the history

  5. remove unused stuff

    @AngheloAlf
    AngheloAlf committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    b9c18f0 View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2023

  1. Merge remote-tracking branch 'upstream/Dev' into upgradeful_item_2

    @AngheloAlf
    AngheloAlf committed Dec 25, 2023
    Configuration menu
    Copy the full SHA
    45502bf View commit details
    Browse the repository at this point in the history

  2. update build files

    @AngheloAlf
    AngheloAlf committed Dec 25, 2023
    Configuration menu
    Copy the full SHA
    ef08c80 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. Move index to 0x011B

    @AngheloAlf
    AngheloAlf committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    9961082 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. Merge remote-tracking branch 'upstream/Dev' into upgradeful_item_2

    @AngheloAlf
    AngheloAlf committed May 17, 2024
    Configuration menu
    Copy the full SHA
    9f1191d View commit details
    Browse the repository at this point in the history

  2. rerun build

    @AngheloAlf
    AngheloAlf committed May 17, 2024
    Configuration menu
    Copy the full SHA
    7e816f9 View commit details
    Browse the repository at this point in the history

  3. Update SettingsList.py 

    Co-authored-by: Fenhl <[email protected]>
    @AngheloAlf @fenhl
    AngheloAlf and fenhl authored May 17, 2024
    Configuration menu
    Copy the full SHA
    211f4f8 View commit details
    Browse the repository at this point in the history

  4. Update Patches.py 

    Co-authored-by: Fenhl <[email protected]>
    @AngheloAlf @fenhl
    AngheloAlf and fenhl authored May 17, 2024
    Configuration menu
    Copy the full SHA
    c4dc491 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2024

  1. Merge remote-tracking branch 'upstream/Dev' into upgradeful_item_2

    @AngheloAlf
    AngheloAlf committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    2c4a263 View commit details
    Browse the repository at this point in the history

  2. generated files

    @AngheloAlf
    AngheloAlf committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    57d7a47 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. Merge remote-tracking branch 'upstream/Dev' into upgradeful_item_2

    @AngheloAlf
    AngheloAlf committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    111c7c2 View commit details
    Browse the repository at this point in the history

  2. Update stuff

    @AngheloAlf
    AngheloAlf committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    5cf21fa View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. generated files

    @AngheloAlf
    AngheloAlf committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    6254814 View commit details
    Browse the repository at this point in the history

  2. presets?

    @AngheloAlf
    AngheloAlf committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    0d6d936 View commit details
    Browse the repository at this point in the history