Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: unwize/TXEngine
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: unwize/TXEngine
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dev_guy
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 20 commits
  • 6 files changed
  • 2 contributors

Commits on Sep 21, 2021

  1. Added Meditate to AbilitiesJSON

    @GuyDarel
    GuyDarel committed Sep 21, 2021
    Configuration menu
    Copy the full SHA
    e56d65b View commit details
    Browse the repository at this point in the history

  2. Added Meditate to AbilitiesJSON

    @GuyDarel
    GuyDarel committed Sep 21, 2021
    Configuration menu
    Copy the full SHA
    4a9a416 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/dev_guy' into dev_guy

    @GuyDarel
    GuyDarel committed Sep 21, 2021
    Configuration menu
    Copy the full SHA
    04ea8a6 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/master' into dev_guy 

    # Conflicts:
#	resources/abilities.json
#	resources/rooms.json
#	src/main/java/txengine/systems/event/events/FlagEvent.java
#	src/main/java/txengine/systems/flag/FlagManager.java
    @GuyDarel
    GuyDarel committed Sep 21, 2021
    Configuration menu
    Copy the full SHA
    77ca984 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2021

  1. Added Meditate and Accelerate to AbilitiesJSON

    @GuyDarel
    GuyDarel committed Sep 22, 2021
    Configuration menu
    Copy the full SHA
    6a094fc View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into dev_guy

    @GuyDarel
    GuyDarel committed Sep 22, 2021
    Configuration menu
    Copy the full SHA
    a861211 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2021

  1. Merge remote-tracking branch 'origin/master' into dev_guy

    @GuyDarel
    GuyDarel committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    02e8edb View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2021

  1. Update Modified

    @GuyDarel
    GuyDarel committed Sep 26, 2021
    Configuration menu
    Copy the full SHA
    c6ee2f3 View commit details
    Browse the repository at this point in the history

  2. Added EquipEffect

    @GuyDarel
    GuyDarel committed Sep 26, 2021
    Configuration menu
    Copy the full SHA
    d8d9d35 View commit details
    Browse the repository at this point in the history

  3. Fixed unequip logic

    @unwize
    unwize authored Sep 26, 2021
    Configuration menu
    Copy the full SHA
    f36b61c View commit details
    Browse the repository at this point in the history

  4. Untouched compatability issue

    @GuyDarel
    GuyDarel committed Sep 26, 2021
    Configuration menu
    Copy the full SHA
    290e834 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/SlappedWithSilence/TXEngine… 

    … into dev_guy

� Conflicts:
�	resources/abilities.json
�	src/main/java/txengine/systems/combat/combatEffect/combatEffects/AddPhaseEffect.java
    @GuyDarel
    GuyDarel committed Sep 26, 2021
    Configuration menu
    Copy the full SHA
    0b4c9f0 View commit details
    Browse the repository at this point in the history

  6. Merge

    @GuyDarel
    GuyDarel committed Sep 26, 2021
    Configuration menu
    Copy the full SHA
    5468b00 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/SlappedWithSilence/TXEngine… 

    … into dev_guy
    @GuyDarel
    GuyDarel committed Sep 26, 2021
    Configuration menu
    Copy the full SHA
    5bc7bf7 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2021

  1. Config

    @GuyDarel
    GuyDarel committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    97923fa View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into dev_guy

    @GuyDarel
    GuyDarel committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    25dc86b View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2021

  1. Config

    @GuyDarel
    GuyDarel committed Sep 28, 2021
    Configuration menu
    Copy the full SHA
    94c44d9 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into dev_guy

    @GuyDarel
    GuyDarel committed Sep 28, 2021
    Configuration menu
    Copy the full SHA
    80a0c1a View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2021

  1. Added Conversation and (Bugged) Items Default

    @GuyDarel
    GuyDarel committed Oct 4, 2021
    Configuration menu
    Copy the full SHA
    4a97c14 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2021

  1. Added Conversation and Items Default

    @GuyDarel
    GuyDarel committed Oct 5, 2021
    Configuration menu
    Copy the full SHA
    874b867 View commit details
    Browse the repository at this point in the history
Loading