• 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 54
  • Labels
  • Forks
  • Snippets
  • Network
Merged
MR Merge Request !760 opened
2021-07-02 23:04:33 UTC by K'van @nsrr

Allow Waters of Life to bypass is_heal test

Allow Waters of Life to bypass is_heal test because it prevents poison/disease from hurting you, even if 0 heal mod stops any healing.

Edited 2021-07-27 13:24:32 UTC
Request to merge nsrr:waters-life-ignore-heal-test 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/nsrr/t-engine4.git waters-life-ignore-heal-test
git checkout -b nsrr/t-engine4-waters-life-ignore-heal-test 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 nsrr/t-engine4-waters-life-ignore-heal-test

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

CI build passed for ca115e27. View details
CI build skipped for ca115e27. View details
CI build canceled for ca115e27. View details
CI build failed for ca115e27. View details
CI build running for ca115e27. View details
CI build pending for ca115e27. View details

Merged by DarkGod 2021-07-27 13:24:31 UTC

  • Discussion 0
  • Commits 1
  • Builds 0
  • Changes 1
  • DarkGod
    @darkgod commented 2021-07-27 13:24:29 UTC

    mentioned in commit f50b3248

  • DarkGod
    @darkgod commented 2021-07-27 13:24:32 UTC

    Status changed to merged

  • Please register or login to post a comment
760 of 868
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!760
×

Revert this merge request

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