• 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 24
  • Labels
  • Forks
  • Snippets
  • Network
Merged
MR Merge Request !697 opened
2020-12-28 22:20:45 UTC by K'van @nsrr

Misc1.7.3

Fix description of Harass Prey; damage reduction does not scale with Willpower. Re-assemble checks level instead of raw level for extra life. Wormblight heals friendlies with 'worm' attr, preserves Writhing One benefit, Reaver 'worm' attr is passsive instead part of the sustain. Wave of Power range is always an integer; prevents display/target discrepancies. 'Blight' eldritch eye from headless horror gains Drain, as Virulent Disease is now passive. Also removes the override on its talent cooldown reduction, as it no longer has an instant spell. Fix description of gale force torque; it hits all creatures, not just enemies.

Edited 2021-02-15 14:43:33 UTC
Request to merge nsrr:Misc1.7.3 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 Misc1.7.3
git checkout -b nsrr/t-engine4-Misc1.7.3 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-Misc1.7.3

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

Merged by DarkGod 2021-02-15 14:43:33 UTC

  • Discussion 0
  • Commits 26
  • Builds 0
  • Changes 24
  • K'van
    @nsrr commented 2020-12-30 22:31:25 UTC

    Added 1 commit:

    • 2bbe373f - Range for Wave of Power is now always an integer; prevents display/targeting discrepancies.
  • K'van
    @nsrr commented 2020-12-31 21:52:50 UTC

    Added 1 commit:

    • dfa6d1a9 - Fix description of Harass Prey; damage malus does not scale with Willpower.
  • K'van
    @nsrr commented 2020-12-31 22:13:46 UTC

    Added 1 commit:

    • 743089bf - 'Blight' eldritch eye from headless horror gains Drain, as Virulent Disease is n…
  • K'van
    @nsrr commented 2020-12-31 22:51:26 UTC

    Added 1 commit:

    • 1d847d70 - Fix description of gale force torque; it hits all creatures, not just enemies.
  • K'van
    @nsrr commented 2020-12-31 22:57:32 UTC

    Added 1 commit:

    • df48f319 - Fix typo in Life Lost Warning
  • K'van
    @nsrr commented 2020-12-31 23:02:18 UTC

    Added 1 commit:

    • f150cf87 - Fix typos in auto hotkey, quick melee attack target, and swap tinkers options.
  • K'van
    @nsrr commented 2020-12-31 23:07:34 UTC

    Added 1 commit:

    • 1d67c694 - Fix typo in Mirror Image description.
  • K'van
    @nsrr commented 2020-12-31 23:23:21 UTC

    Added 1 commit:

    • 2fe75606 - Fix 'mind' in place of 'darkness' in description of Nightmare.
  • K'van
    @nsrr commented 2020-12-31 23:30:32 UTC

    Added 1 commit:

    • 2dceaa6b - Fix typo in storm wyrm claw.
  • K'van
    @nsrr commented 2020-12-31 23:31:41 UTC

    Added 1 commit:

    • 758b8524 - Fix typo in storm wyrm claw.
  • K'van
    @nsrr commented 2020-12-31 23:34:20 UTC

    Added 1 commit:

    • 1564ef61 - Fix typo in second vault pop-up.
  • K'van
    @nsrr commented 2020-12-31 23:36:47 UTC

    Added 1 commit:

    • 47b10a9b - Fix typo in Frightening Presence.
  • K'van
    @nsrr commented 2020-12-31 23:39:26 UTC

    Added 1 commit:

    • 2b55de04 - Fix typo in Kroltar set complete text.
  • K'van
    @nsrr commented 2020-12-31 23:43:07 UTC

    Added 1 commit:

    • 1a64d99a - Fix typo in Glyphs(talent).
  • K'van
    @nsrr commented 2020-12-31 23:46:46 UTC

    Added 1 commit:

    • df3bb741 - Fix typo in Twist Fate.
  • K'van
    @nsrr commented 2020-12-31 23:48:50 UTC

    Added 1 commit:

    • fe61b091 - Fix typo in Spacetime Tuning.
  • K'van
    @nsrr commented 2020-12-31 23:52:47 UTC

    Added 1 commit:

    • 1b5d9e9b - Fixed Nightmare description to reflect that it deals darkness damage.
  • K'van
    @nsrr commented 2021-01-01 00:04:44 UTC

    Added 1 commit:

    • 0ff7bf9f - Fix killer message for clone.
  • K'van
    @nsrr commented 2021-01-01 00:06:26 UTC

    Added 1 commit:

    • c9ac3d30 - Fix killer message.
  • K'van
    @nsrr commented 2021-01-01 00:16:08 UTC

    Added 1 commit:

    • 354ce4f4 - Fix typo in Impending Doom.
  • K'van
    @nsrr commented 2021-01-01 00:22:53 UTC

    Added 1 commit:

    • 1510e7fa - Fix Waking Nightmare description to reflect that it deals darkness damage.
  • K'van
    @nsrr commented 2021-01-01 00:26:32 UTC

    Added 1 commit:

    • b2650b06 - Fix typo in Chant Radiant.
  • K'van
    @nsrr commented 2021-01-01 22:06:39 UTC

    Added 1 commit:

    • fd798a02 - Clarify Cornac cat point is only at birth (not also every 10 levels).
  • K'van
    @nsrr commented 2021-01-01 22:17:18 UTC

    Added 1 commit:

    • 38359359 - Update 'bone grab' desc to differentiate it from 'pinned'.
  • K'van
    @nsrr commented 2021-01-02 01:50:37 UTC

    Added 1 commit:

    • bbf7b872 - Update Taint:Devourer to use dispel framework.
  • DarkGod
    @darkgod commented 2021-02-15 14:43:33 UTC

    Status changed to merged

  • Please register or login to post a comment
697 of 698
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!697