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

Backmerge 1.0.0 to development #2122

Merged
merged 18 commits into from
Sep 1, 2023
Merged

Backmerge 1.0.0 to development #2122

merged 18 commits into from
Sep 1, 2023

Commits on Aug 29, 2023

  1. Update Exp logic 

    - Set default Exp for former equipments to 0
- Add GetRealExp function to get real exp of all equipments
    @U-lis
    U-lis committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    2149406 View commit details
    Browse the repository at this point in the history

  2. Use GetRealExp function

    @U-lis
    U-lis committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    964d886 View commit details
    Browse the repository at this point in the history

  3. Add test cases to use old/new equipments

    @U-lis
    U-lis committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    6106db2 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2107 from planetarium/bugfix/initial-exp 

    Fix exp handling for former equipments
    @U-lis
    U-lis authored Aug 29, 2023
    Configuration menu
    Copy the full SHA
    0c3c2ef View commit details
    Browse the repository at this point in the history

  5. Merge branch 'release/0.5.3' into merge-release/0.5.3-into-release/1.0.0 

    # Conflicts:
#	Lib9c/ActionObsoleteConfig.cs
    @boscohyun
    boscohyun committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    a55526e View commit details
    Browse the repository at this point in the history

  6. fix trigger conditions of "main" workflow

    @boscohyun
    boscohyun committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    258d2f3 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #2111 from planetarium/merge-release/0.5.3-into-re… 

    …lease/1.0.0

merge release/0.5.3 into release/1.0.0
    @boscohyun
    boscohyun authored Aug 29, 2023
    Configuration menu
    Copy the full SHA
    1838668 View commit details
    Browse the repository at this point in the history

  8. Handle enhancement from level 0 to level 0 case

    @U-lis
    U-lis committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    23418aa View commit details
    Browse the repository at this point in the history

  9. Conventions

    @U-lis
    U-lis committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    445ab00 View commit details
    Browse the repository at this point in the history

  10. Update equipment model 

    - Get EquipmentItemSheet.Row by ID, not Grade and ItemSubType
    - It also needs ElementalType but ID can cover all conditions.
- Returns Exp field unconditionally. It has default value 0
    @U-lis
    U-lis committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    49b85be View commit details
    Browse the repository at this point in the history

  11. Update dummy data to make more test cases

    @U-lis
    U-lis committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    937e117 View commit details
    Browse the repository at this point in the history

  12. Add more tests: level 0 to 0 case

    @U-lis
    U-lis committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    6f8e024 View commit details
    Browse the repository at this point in the history

  13. Fix broken test: equipment always has exp

    @U-lis
    U-lis committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    f9cfca8 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #2114 from planetarium/bugfix/enhancement-exp 

    Handle enhancement of level 0 to 0 case
    @U-lis
    U-lis authored Aug 29, 2023
    Configuration menu
    Copy the full SHA
    83afbf5 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2023

  1. Serialize Exp field only when it has positive value

    @U-lis
    U-lis committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    728420c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2117 from planetarium/bugfix/equipment-serialize 

    Serialize Exp field only when it has positive value
    @U-lis
    U-lis authored Aug 31, 2023
    Configuration menu
    Copy the full SHA
    d55cbce View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2023

  1. Merge branch 'development' into release/1.0.0

    @U-lis
    U-lis committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    8d8c2c8 View commit details
    Browse the repository at this point in the history

  2. Fix broken test

    @U-lis
    U-lis committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    1a3e143 View commit details
    Browse the repository at this point in the history