• 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 43
  • Labels
  • Forks
  • Snippets
  • Network
Open
MR Merge Request !815 opened
2021-10-29 03:24:17 UTC by yutio888 @yutio888

miscs for celetial tree

  1. fix Weapon of Light not correctly triggered when Gravitic Effulgence is active
  2. Flash of the Blade now gives shield before attack, to prevent the strange death by melee retaliation
  3. fix some global variables
  4. Damage Shield now have a new function "extend", used by Weapon of Light, Bathe in Light and Dirge of Pestilence to strengthen the existing shield, and now they share the same limit of 20 times, but will not instantly break upon exceeding the limit. The added shield is also influenced by your current shield amplifier.
  5. Corona immediately stops firing bolt at low energy
  6. Totality now use talentCooldownFilter instead of alterTalentCoolingdown (to prevent synergy with fixed-cooldown talents)
Edited 2021-10-29 08:39:27 UTC
Check out branch Download as
  • Email Patches
  • Plain Diff
Request to merge yutio888:miscs into master (66 commits behind)
×

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/yutio888/t-engine4.git miscs
git checkout -b yutio888/t-engine4-miscs 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 yutio888/t-engine4-miscs

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

Ready to be merged automatically

Ask someone with write access to this repository to merge this request.

  • Discussion 0
  • Commits 3
  • Builds 0
  • Changes 10
  • yutio888
    @yutio888 commented 2021-10-29 07:23:36 UTC

    Added 1 commit:

    • 58bce933 - adjust damage shield on_merge and extend
  • yutio888
    @yutio888 commented 2021-10-29 08:39:27 UTC

    Added 1 commit:

    • bc24e5ec - fix
  • Please register or login to post a comment
815 of 846
Prev Next
Assignee
No assignee
Assign to
No
Milestone
None
Assign milestone
0
Labels
None
Assign labels
  • View labels
1
1 participant
Reference: tome/t-engine4!815