• 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 60
  • Labels
  • Forks
  • Snippets
  • Network
Merged
MR Merge Request !771 opened
2021-07-25 07:10:22 UTC by yutio888 @yutio888

Miscs

  1. Bring back the fix: The duration of an existing effect will not be reduced by setting a new effect with a shorter duration (controlled by on_merge for some effects).
  2. Living lightning correctly works with Range Amplification Device
  3. Stormshield rune's block number and threshold should be an integer
  4. Randart bows & slings should not have base damage
Edited 2021-07-27 13:35:09 UTC
Request to merge yutio888:174-miscs 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/yutio888/t-engine4.git 174-miscs
git checkout -b yutio888/t-engine4-174-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-174-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 330d1da9. View details
CI build skipped for 330d1da9. View details
CI build canceled for 330d1da9. View details
CI build failed for 330d1da9. View details
CI build running for 330d1da9. View details
CI build pending for 330d1da9. View details

Merged by DarkGod 2021-07-27 13:35:09 UTC

  • Discussion 0
  • Commits 5
  • Builds 0
  • Changes 4
  • DarkGod
    @darkgod commented 2021-07-27 13:35:09 UTC

    mentioned in commit 0e82ff63

  • DarkGod
    @darkgod commented 2021-07-27 13:35:09 UTC

    Status changed to merged

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

Revert this merge request

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