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.

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

Feature/minor update 1 #444

Open
wants to merge 15 commits into
base: master
Choose a base branch
from

Commits on Apr 17, 2022

  1. Added money editing options

    mimic2300 committed Apr 17, 2022
    Configuration menu
    Copy the full SHA
    773e575 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2022

  1. Configuration menu
    Copy the full SHA
    6167bae View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    666f571 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d1de2a3 View commit details
    Browse the repository at this point in the history
  4. merge

    mimic2300 committed Apr 18, 2022
    Configuration menu
    Copy the full SHA
    8017bb4 View commit details
    Browse the repository at this point in the history
  5. merge fix

    mimic2300 committed Apr 18, 2022
    Configuration menu
    Copy the full SHA
    9cf6ea2 View commit details
    Browse the repository at this point in the history
  6. merge fix

    mimic2300 committed Apr 18, 2022
    Configuration menu
    Copy the full SHA
    f94599b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    9db318d View commit details
    Browse the repository at this point in the history

Commits on May 8, 2022

  1. Merge branch 'master' of https://github.com/mimic2300/TQVaultAE into …

    …develop
    
    And conflict fix
    mimic2300 committed May 8, 2022
    Configuration menu
    Copy the full SHA
    595f3be View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2022

  1. merge from master

    mimic2300 committed Jun 12, 2022
    Configuration menu
    Copy the full SHA
    fd7fecf View commit details
    Browse the repository at this point in the history
  2. res fix

    mimic2300 committed Jun 12, 2022
    Configuration menu
    Copy the full SHA
    96181f1 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2023

  1. Merge branch 'master' into mimic2300_feature/minor_update_1

    # Conflicts:
    #	src/TQVaultAE.GUI/CharacterEditDialog.Designer.cs
    #	src/TQVaultAE.GUI/CharacterEditDialog.cs
    #	src/TQVaultAE.GUI/CharacterEditDialog.resx
    #	src/TQVaultAE.GUI/Components/SackPanel.cs
    #	src/TQVaultAE.Presentation/Resources.resx
    hguy committed Feb 18, 2023
    Configuration menu
    Copy the full SHA
    3dbe900 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2023

  1. Merge pull request #1 from hguy/mimic2300_feature/minor_update_1

    Mimic2300 feature/minor update 1
    mimic2300 authored Feb 19, 2023
    Configuration menu
    Copy the full SHA
    217a894 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1b9d277 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #2 from hguy/mimic2300_feature/minor_update_1

    Merge branch 'mimic2300:feature/item_seed_v2' into mimic2300_feature/…
    mimic2300 authored Feb 19, 2023
    Configuration menu
    Copy the full SHA
    f4d68dd View commit details
    Browse the repository at this point in the history