• This project
    • Loading...
  • Sign in

tome / Tales of MajEyal · Merge Requests

GitLab

  • Go to group
  • Project
  • Activity
  • Files
  • Commits
  • Builds 0
  • Graphs
  • Milestones
  • Merge Requests 57
  • Labels
  • Forks
  • Snippets
  • Network
Merged
MR Merge Request !721 opened
2021-05-21 21:08:19 UTC by Recaiden @Recaiden

Fallen bugfix

Dirges update mastery correctly. Prevent player from infinitely stacking Pestilence shield with enough action speed. Prevent exploit where you could increase and decrease talent mastery at the same time you learned Fallen prodigy.

Edited 2021-05-25 09:43:39 UTC
Request to merge Recaiden:fallen-bugfix into master
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://git.net-core.org/Recaiden/t-engine4.git fallen-bugfix
git checkout -b Recaiden/t-engine4-fallen-bugfix FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff Recaiden/t-engine4-fallen-bugfix

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines

Merged by DarkGod 2021-05-25 09:43:39 UTC

  • Discussion 0
  • Commits 4
  • Changes 6
  • Recaiden
    @Recaiden commented 2021-05-21 21:12:23 UTC

    Added 136 commits:

    • 7273ae51...9036e108 - 135 commits from branch tome:master
    • c9e3e302 - Merge branch 'master' into fallen-bugfix
  • DarkGod
    @darkgod commented 2021-05-25 09:43:37 UTC

    mentioned in commit c13b3b03

  • DarkGod
    @darkgod commented 2021-05-25 09:43:39 UTC

    Status changed to merged

  • Please register or login to post a comment
721 of 849
Prev Next
Assignee
No assignee
Assign to
No
Milestone
None
Assign milestone
0
Labels
None
Assign labels
  • View labels
2
2 participants
Reference: tome/t-engine4!721
×

Revert this merge request

Cancel
A new branch will be created in your fork and a new merge request will be started.