• 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 37
  • Labels
  • Forks
  • Snippets
  • Network
Merged
MR Merge Request !677 opened
2020-11-20 23:26:12 UTC by K'van @nsrr

Update Wormblight to check if target is summoner of source to decide healing

Update Wormblight to check if the target is the summoner of the source to determine healing, rather than checking for the 'worm' attribute granted by the Infestation sustain. Now the talent will only heal the summoner of the worms, as you would expect from the talent description, and will continue healing even if the sustain is no longer active.

Edited 2020-11-30 11:51:14 UTC
Request to merge nsrr:master 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 master
git checkout -b nsrr/t-engine4-master 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-master

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 7ca6947d. View details
CI build skipped for 7ca6947d. View details
CI build canceled for 7ca6947d. View details
CI build failed for 7ca6947d. View details
CI build running for 7ca6947d. View details
CI build pending for 7ca6947d. View details

Merged by DarkGod 2020-11-30 11:51:14 UTC

  • Discussion 0
  • Commits 1
  • Builds 0
  • Changes 1
  • DarkGod
    @darkgod commented 2020-11-30 11:51:14 UTC

    mentioned in commit 6307bf18

  • DarkGod
    @darkgod commented 2020-11-30 11:51:14 UTC

    Status changed to merged

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

Revert this merge request

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